diff --git a/.gitignore b/.gitignore index 5b26e539..2514e8cb 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,12 @@ DSWeb/ocr_temp_files/* /OfficeHelper/bin/Debug/OfficeHelper.dll /JsonHelper/bin/Debug/JsonHelper.pdb /JsonHelper/bin/Debug/JsonHelper.dll +/DSWeb.Job.Common/obj/Release/DSWeb.Job.Common.csproj.AssemblyReference.cache +/DSWebComponent/bin/Release/DSWebComponent.dll +/DSWebComponent/bin/Release/DSWebComponent.pdb +/HcDBUtility/bin/Release/JsonHelper.dll +/HcDBUtility/bin/Release/JsonHelper.pdb +/JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.AssemblyReference.cache +/Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.AssemblyReference.cache +/JsonHelper/bin/Release/JsonHelper.dll +/JsonHelper/bin/Release/JsonHelper.pdb diff --git a/DSWeb.Job.Common/obj/Release/DSWeb.Job.Common.csproj.AssemblyReference.cache b/DSWeb.Job.Common/obj/Release/DSWeb.Job.Common.csproj.AssemblyReference.cache deleted file mode 100644 index 07af5e5f..00000000 Binary files a/DSWeb.Job.Common/obj/Release/DSWeb.Job.Common.csproj.AssemblyReference.cache and /dev/null differ diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index 9e8e15ab..dcede1e2 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -35,6 +35,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL { public class MsOpSeaeDAL:IGetTotalCount { + //const string 业务状态子句 = + /// + //",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"; + /// + + const string 业务状态查询子句 = "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO and status not in('操作确认','待截VGM','已截VGM','未截VGM','紧急截VGM','待舱单','已舱单','未舱单','紧急舱单','待补料','已补料','未补料','紧急补料') ORDER BY COMPTIME DESC,INPUTTIME DESC)"; + + //",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS" + const string 业务状态子句 = ",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO and status not in('操作确认','待截VGM','已截VGM','未截VGM','紧急截VGM','待舱单','已舱单','未舱单','紧急舱单','待补料','已补料','未补料','紧急补料') ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"; + #region 查询 static public List GetDataList ( string strCondition, string userid, string usercode, string companyid, string sort = null, string load = null ) { @@ -86,7 +96,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); //strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); + strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); @@ -133,7 +144,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (!string.IsNullOrEmpty(sortstring)) { if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0) - strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)")); + strSql.Append(" order by " + sortstring.Replace("OPSTATUS", 业务状态查询子句)); else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0) strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(OP_SEAE.BSNO) ")); else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0) @@ -190,7 +201,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (!string.IsNullOrEmpty(sortstring)) { if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0) - strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)")); + strSql.Append(" order by " + sortstring.Replace("OPSTATUS", 业务状态查询子句)); else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0) strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(OP_SEAE.BSNO) ")); else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0) @@ -236,7 +247,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + + strSql.Append(业务状态子句); + strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); @@ -481,7 +494,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (!string.IsNullOrEmpty(sortstring)) { if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0) - strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)")); + strSql.Append(" order by " + sortstring.Replace("OPSTATUS",业务状态查询子句)); else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0) strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(B.BSNO) ")); else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0) @@ -526,7 +539,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS "); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=B.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); @@ -640,7 +653,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (!string.IsNullOrEmpty(sortstring)) { if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0) - strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)")); + strSql.Append(" order by " + sortstring.Replace("OPSTATUS", 业务状态查询子句)); else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0) strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(OP_SEAE.BSNO) ")); else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0) @@ -684,7 +697,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); @@ -790,7 +803,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,A.REASON EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE A.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); strSql.Append(",'' as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,B.ISGAIQIAN,B.WARNCOUNT"); @@ -911,7 +924,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,A.REASON EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE A.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); strSql.Append(",'' as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,B.ISGAIQIAN,B.WARNCOUNT"); @@ -1001,7 +1014,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); @@ -1150,7 +1163,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS "); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=B.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); @@ -1226,7 +1239,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS "); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=B.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); @@ -1697,7 +1710,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (!string.IsNullOrEmpty(sortstring)) { if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0) - strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)")); + strSql.Append(" order by " + sortstring.Replace("OPSTATUS", 业务状态查询子句)); else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0) strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(OP_SEAE.BSNO) ")); else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0) @@ -1743,7 +1756,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); - strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); + strSql.Append(业务状态子句); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); @@ -2492,7 +2505,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); } - var blUpBL = "update op_seae_billmanage set VESSEL='" + headData.VESSEL + "',VOYNO='" + headData.VOYNO + "',ETD='" + headData.ETD + "',PORTLOADID='" + headData.PORTLOADID + "',PORTLOAD='" + headData.PORTLOAD + "' where BSNO='" + headData.BSNO + "'"; + var blUpBL = "update op_seae_billmanage set VESSEL='" + headData.VESSEL + "',VOYNO='" + headData.VOYNO + "',ETD='" + headData.ETD + "',PORTLOADID='" + headData.PORTLOADID.Replace("'","''") + "',PORTLOAD='" + headData.PORTLOAD.Replace("'", "''") + "' where BSNO='" + headData.BSNO + "'"; bool blBL = T_ALL_DA.GetExecuteSqlCommand(blUpBL); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpStatus/MsOpStatusNewDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpStatus/MsOpStatusNewDAL.cs index 952b6418..1791bd3c 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpStatus/MsOpStatusNewDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpStatus/MsOpStatusNewDAL.cs @@ -38,10 +38,10 @@ namespace DSWeb.Areas.MvcShipping.DAL //更新状态树 sb.Append("update Op_StatusMain set "); - sb.Append("ChuanGongSi = '" + OpSeaeModel.ChuanGongSi+ "',"); - sb.Append("ChuanMingHangCi = '" + OpSeaeModel.ChuanMingHangCi + "',"); - sb.Append("ShiFaGang = '" + OpSeaeModel.ShiFaGang + "',"); - sb.Append("MuDiGang = '" + OpSeaeModel.MuDiGang + "',"); + sb.Append("ChuanGongSi = '" + OpSeaeModel.ChuanGongSi.Replace("'", "''") + "',"); + sb.Append("ChuanMingHangCi = '" + OpSeaeModel.ChuanMingHangCi.Replace("'", "''") + "',"); + sb.Append("ShiFaGang = '" + OpSeaeModel.ShiFaGang.Replace("'", "''") + "',"); + sb.Append("MuDiGang = '" + OpSeaeModel.MuDiGang.Replace("'", "''") + "',"); sb.Append("MBLNO = '" + OpSeaeModel.MBLNO + "',"); sb.Append("XiangXingXiangLiang = '" + OpSeaeModel.XiangXingXiangLiang.Replace("'","''") + "',"); sb.Append("ETD = '" + OpSeaeModel.ETD + "',"); @@ -59,10 +59,10 @@ namespace DSWeb.Areas.MvcShipping.DAL sb.Append("values ("); sb.Append("'"+Guid.NewGuid()+"',"); sb.Append("'" + OpSeaeModel.BSNO + "',"); - sb.Append("'" + OpSeaeModel.ChuanGongSi + "',"); - sb.Append("'" + OpSeaeModel.ChuanMingHangCi + "',"); - sb.Append("'" + OpSeaeModel.ShiFaGang + "',"); - sb.Append("'" + OpSeaeModel.MuDiGang + "',"); + sb.Append("'" + OpSeaeModel.ChuanGongSi.Replace("'", "''") + "',"); + sb.Append("'" + OpSeaeModel.ChuanMingHangCi.Replace("'", "''") + "',"); + sb.Append("'" + OpSeaeModel.ShiFaGang.Replace("'", "''") + "',"); + sb.Append("'" + OpSeaeModel.MuDiGang.Replace("'", "''") + "',"); sb.Append("'" + OpSeaeModel.MBLNO + "',"); sb.Append("'" + OpSeaeModel.XiangXingXiangLiang.Replace("'", "''") + "',"); diff --git a/DSWebComponent/bin/Release/DSWebComponent.dll b/DSWebComponent/bin/Release/DSWebComponent.dll deleted file mode 100644 index 5950e0d0..00000000 Binary files a/DSWebComponent/bin/Release/DSWebComponent.dll and /dev/null differ diff --git a/DSWebComponent/bin/Release/DSWebComponent.pdb b/DSWebComponent/bin/Release/DSWebComponent.pdb deleted file mode 100644 index c1c04151..00000000 Binary files a/DSWebComponent/bin/Release/DSWebComponent.pdb and /dev/null differ diff --git a/HcDBUtility/bin/Release/JsonHelper.dll b/HcDBUtility/bin/Release/JsonHelper.dll deleted file mode 100644 index 0fa1f717..00000000 Binary files a/HcDBUtility/bin/Release/JsonHelper.dll and /dev/null differ diff --git a/HcDBUtility/bin/Release/JsonHelper.pdb b/HcDBUtility/bin/Release/JsonHelper.pdb deleted file mode 100644 index 49592a69..00000000 Binary files a/HcDBUtility/bin/Release/JsonHelper.pdb and /dev/null differ diff --git a/JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.AssemblyReference.cache b/JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.AssemblyReference.cache deleted file mode 100644 index 717a4854..00000000 Binary files a/JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.AssemblyReference.cache b/Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.AssemblyReference.cache deleted file mode 100644 index 0dd22f08..00000000 Binary files a/Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.AssemblyReference.cache and /dev/null differ diff --git a/JsonHelper/bin/Release/JsonHelper.dll b/JsonHelper/bin/Release/JsonHelper.dll deleted file mode 100644 index 0fa1f717..00000000 Binary files a/JsonHelper/bin/Release/JsonHelper.dll and /dev/null differ diff --git a/JsonHelper/bin/Release/JsonHelper.pdb b/JsonHelper/bin/Release/JsonHelper.pdb deleted file mode 100644 index 49592a69..00000000 Binary files a/JsonHelper/bin/Release/JsonHelper.pdb and /dev/null differ