From 815d0d62d0430a7c6d7be29de14c0eb3b570bebb Mon Sep 17 00:00:00 2001 From: hanxuntao Date: Thu, 4 Jul 2024 14:18:12 +0800 Subject: [PATCH] 1 --- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7460 -> 2428 bytes .../Chfee_invoiceapplicationController.cs | 15 + .../Chfee_payapplicationController.cs | 6 +- .../Chfee_PayapplicationDAL.cs | 2 +- .../Viewsjs/Chfee_Audit/Chfee_AuditBL.js | 2 +- .../Controllers/MsOpCtnApplyController.cs | 8 +- .../DAL/MsOpCtnApply/MsOpCtnApplyDAL.cs | 15 +- .../DAL/MsOpCtnBsCard/MsOpCtnBsCardDAL.cs | 394 ++++++++++++-- .../MsOpCtnBsCard/MsOpCtnBsCardFeeIndex2.js | 4 + .../MsOpCtnBsCard/MsOpCtnInsuranceEdit.js | 2 +- .../Controllers/MsChFeeController.cs | 3 + .../Controllers/MsOpSeaeController.cs | 20 +- .../Controllers/MsOpSeaiController.cs | 19 +- .../Controllers/MsRptNoTotalController.cs | 491 ++++++++++++++++-- .../MvcShipping/DAL/MsChFee/MsChFeeDAL.cs | 1 + .../MsCodeFeeSetList/MsCodeFeeSetListEdit.js | 1 + .../Viewsjs/MsOpSeae/MsOpSeaeIndex.js | 4 - DSWeb/DSWeb.csproj.user | 2 +- .../PublishProfiles/配置文件1.pubxml | 8 +- .../PublishProfiles/配置文件1.pubxml.user | 50 +- DSWebComponent/bin/Debug/DSWebComponent.dll | Bin 8192 -> 8192 bytes DSWebComponent/bin/Debug/DSWebComponent.pdb | Bin 22016 -> 22016 bytes DSWebComponent/bin/Release/DSWebComponent.dll | Bin 8192 -> 8192 bytes DSWebComponent/bin/Release/DSWebComponent.pdb | Bin 19968 -> 19968 bytes DSWebComponent/obj/Debug/DSWebComponent.dll | Bin 8192 -> 8192 bytes DSWebComponent/obj/Debug/DSWebComponent.pdb | Bin 22016 -> 22016 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6425 -> 1479 bytes DSWebComponent/obj/Release/DSWebComponent.dll | Bin 8192 -> 8192 bytes DSWebComponent/obj/Release/DSWebComponent.pdb | Bin 19968 -> 19968 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 1874 -> 1818 bytes HcDBUtility/bin/Debug/HcDBUtility.dll | Bin 45056 -> 45056 bytes HcDBUtility/bin/Debug/HcDBUtility.pdb | Bin 132608 -> 132608 bytes HcDBUtility/bin/Debug/JsonHelper.dll | Bin 35840 -> 35840 bytes HcDBUtility/bin/Debug/JsonHelper.pdb | Bin 77312 -> 77312 bytes HcDBUtility/bin/Release/HcDBUtility.dll | Bin 39936 -> 39936 bytes HcDBUtility/bin/Release/HcDBUtility.pdb | Bin 116224 -> 116224 bytes HcDBUtility/bin/Release/JsonHelper.dll | Bin 32768 -> 32768 bytes HcDBUtility/bin/Release/JsonHelper.pdb | Bin 67072 -> 67072 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7079 -> 2190 bytes HcDBUtility/obj/Debug/HcDBUtility.dll | Bin 45056 -> 45056 bytes HcDBUtility/obj/Debug/HcDBUtility.pdb | Bin 132608 -> 132608 bytes HcDBUtility/obj/Release/HcDBUtility.dll | Bin 39936 -> 39936 bytes HcDBUtility/obj/Release/HcDBUtility.pdb | Bin 116224 -> 116224 bytes JsonHelper/bin/Debug/JsonHelper.dll | Bin 35840 -> 35840 bytes JsonHelper/bin/Debug/JsonHelper.pdb | Bin 77312 -> 77312 bytes JsonHelper/bin/Release/JsonHelper.dll | Bin 32768 -> 32768 bytes JsonHelper/bin/Release/JsonHelper.pdb | Bin 67072 -> 67072 bytes JsonHelper/obj/Debug/JsonHelper.dll | Bin 35840 -> 35840 bytes JsonHelper/obj/Debug/JsonHelper.pdb | Bin 77312 -> 77312 bytes JsonHelper/obj/Release/JsonHelper.dll | Bin 32768 -> 32768 bytes JsonHelper/obj/Release/JsonHelper.pdb | Bin 67072 -> 67072 bytes OfficeHelper/bin/Debug/OfficeHelper.dll | Bin 4608 -> 4608 bytes OfficeHelper/bin/Debug/OfficeHelper.pdb | Bin 17920 -> 17920 bytes OfficeHelper/bin/Release/OfficeHelper.dll | Bin 4608 -> 4608 bytes OfficeHelper/bin/Release/OfficeHelper.pdb | Bin 17920 -> 17920 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6318 -> 1377 bytes OfficeHelper/obj/Debug/OfficeHelper.dll | Bin 4608 -> 4608 bytes OfficeHelper/obj/Debug/OfficeHelper.pdb | Bin 17920 -> 17920 bytes OfficeHelper/obj/Release/OfficeHelper.dll | Bin 4608 -> 4608 bytes OfficeHelper/obj/Release/OfficeHelper.pdb | Bin 17920 -> 17920 bytes WebSqlHelper/bin/Debug/WebSqlHelper.dll | Bin 54272 -> 54272 bytes WebSqlHelper/bin/Debug/WebSqlHelper.pdb | Bin 110080 -> 110080 bytes WebSqlHelper/bin/Release/WebSqlHelper.dll | Bin 50176 -> 50176 bytes WebSqlHelper/bin/Release/WebSqlHelper.pdb | Bin 97792 -> 97792 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6723 -> 1793 bytes WebSqlHelper/obj/Debug/WebSqlHelper.dll | Bin 54272 -> 54272 bytes WebSqlHelper/obj/Debug/WebSqlHelper.pdb | Bin 110080 -> 110080 bytes WebSqlHelper/obj/Release/WebSqlHelper.dll | Bin 50176 -> 50176 bytes WebSqlHelper/obj/Release/WebSqlHelper.pdb | Bin 97792 -> 97792 bytes 69 files changed, 928 insertions(+), 119 deletions(-) diff --git a/DSWeb.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DSWeb.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 900a8fa7663b6fdd511ae21c2e366efcdc24fcb4..218913d0daa323f65f28318d1984fb9a57231d74 100644 GIT binary patch literal 2428 zcmcgu&u`N(6fRKhfW)O2&`v#YU{YnRTem?a4y8#~5DimPZ3v9OO7!Dqv`1!KWO13qX<8;Qhf)P+pLgQk2)1(?Rk zAL|(JHwSLRn=}M91!WWB?*Nd>q=6BVIyoZs!#v<4g5zcyy(H}>y-+eiYSj);L04bQ zU!ES&K8!$th@jfi8nR)^LDL?Ol+u5-^1-dt5&5V(-@TY=c^~nKATzW0Gr{ee!uK`p{+fNTqXq_azQ;9-X=8X^bg|r zv?H<{e%~N_pm`z&JcB-HnNEvL7QGIC30O3ShZv)a`hIq>XF4omF}CLYJAJrziN!*- jeQk?au}jrrH&k(|Z0F0F=ILX6!zOrmTz|FRZTS2Nx$RRf literal 7460 zcmeHMTT>f16t=l+Fu63QX)dHmoi=Tg)X~`3h9uKG5Nrrda4E|`XD~zLUD+t?N{*xr zxRl@0U(o4KY|mNjHTU$vJCg@5_*g!Y&P_+V-_a(LiA3UGxbPdVD?>osCGIGxWy6p) zt^?}XCUChVbJF*vSS(kvnKh;~m*Qo3 zCSKNag+{3{)5z!DQjQkrD5`vRj;2=u_gvJsC=64wwXSHZ#S~egYEiTTqwm1vJJj>! zE^}wKW`5mkSN04OXqCPSqvxb(@a8=C*iDBDm%G%k?nvb7yN$r}<`wnXu2ehSu2oux zz8lB-=B4L?zxR>3N>!7YXqp|=H8WKZq95|6kcyRAgF+}4g*ISc&$>gwPc9yGDDH6R zEq=C$d#CtEXJtI_Q=1cJmbqe%k%}{Yz2zFJY(|x{y-dxvzTP~+xZF~*0TDv4CKPLO zZB)BAAq9>Zh9R5;K}UmeM9a++T}x8%9i|?f%`S7@@@N|so}Ac8w7Z8Bmz8vw)>6%a z_1u6@kaC?V%v}kD;Xdn3IVtHdO8R!7*$Qhg#RQ0&SJDTe??KWv)#Zj^v4*T+%St4M zfes~;Neeze6GMNE+HGx^59tZ(>ljQpvcLpW+#zovSnu*18y5_L9kE8efGtz5-c3bA zZKJqoW;4Ear1E&Zx5tYAdyCD?(2`S{&Oa{{S?<~M&Fn>Xe5R(x5r@tGhV?TSmrM>) zG>$Bac2gX}Kl7aG^9C9uXdF2-NYH*gI5(4sgHyvm##1BM97O_fAd$KR1ir?Qq>zjw zxeR37x&ky|T?O)Lf2D(*Uf2Mncd25v2<+BKwXzyv$n3`=DP_9=v;#IPdk5Avkn>yR zMXmg6b-{jJsV>aa%J6Tmvw8=M*JS;Dt<35{6Q~AkxeEAag=y)1jKFRW>=1`K+bs13 z+IStv$is($GJF{h7$l4Du&{KN61k5?j9Jo^=CSKn6h+gN_SMP0{GFiBZtW}DUxChz*tQ%Q!Jh8M>oC(k?Z{vX@Br+ranTggTn8D z@So2Y?#X5mEF*a`Me@1O&?y4n9X3k14-%SlFKPgCn^5ay!qO-6Xz$td<64v%nNIRS zd2l32qc|K-*BY*VZy1@gx2bA{=6(apwqj7$#l)eK3@E9dACoHEHGs&mc>P67LGln0 zQaG}RCkJ4Z9)Qf!DVfK1TAho|POAn|1kx_Q3C;Nyrv4d&&rt>8x1?agEJ>Gnq)ZK+ z6+%J@7SkG!I7Ja0e^CT z_3U%=_JLJ^{(h8>MUZoKe}(QM-p6zG1FHnAPZU=@jGM+H5o=&;8b}-~V$FcyjTn}C mo;uWpLM9!Sp`heaxW2gfcn$wOxLJMbRo&ob6}>{)y!;=^w5l!u diff --git a/DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs b/DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs index 5460878..db51b63 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_invoiceapplicationController.cs @@ -18,6 +18,7 @@ using DSWeb.MvcShipping.Models.MsSysBillNoSet; using DSWeb.MvcShipping.DAL.MsSysParamSet; using System.Data; using DSWeb.MvcShipping.DAL.MsCodeGoodInv; +using System.Web; namespace DSWeb.Areas.Account.Controllers @@ -525,6 +526,13 @@ namespace DSWeb.Areas.Account.Controllers public ContentResult Delete(string data) { var headData = JsonConvert.Deserialize(data); + + var head = ChinvoiceapplicationDAL.GetData(" GID='"+headData.GID+"'"); + if (!string.IsNullOrEmpty(head.INVOICENOREF)) { + var jsonRespose2 = new JsonResponse { Success = false, Message = "发票申请已生成发票,请刷新！" }; + return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; + } + var dataList = ChinvoiceapplicationDAL.GetBodyList("BILLNO='" + headData.BILLNO + "'"); DBResult result = ChinvoiceapplicationDAL.DelFeeDo(dataList,headData.GID); @@ -549,6 +557,13 @@ namespace DSWeb.Areas.Account.Controllers DBResult result = new DBResult(); foreach (var headData in headList) { + var head = ChinvoiceapplicationDAL.GetData(" GID='" + headData.GID + "'"); + if (!string.IsNullOrEmpty(head.INVOICENOREF)) + { + var jsonRespose2 = new JsonResponse { Success = false, Message = "发票申请已生成发票,请刷新！" }; + return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; + } + var dataList = ChinvoiceapplicationDAL.GetBodyList("BILLNO='" + headData.BILLNO + "'"); result = ChinvoiceapplicationDAL.DelFeeDo(dataList, headData.GID); diff --git a/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs b/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs index f04d4d4..6759ce6 100644 --- a/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs +++ b/DSWeb/Areas/Account/Controllers/Chfee_payapplicationController.cs @@ -319,7 +319,7 @@ namespace DSWeb.Areas.Account.Controllers { var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT AND AMOUNT<>ORDERAMOUNT) and BSNO='" + bodyList[0].BSNO + "'"); - var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE OR AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + bodyList[0].CustomerName + "'"); + var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE AND AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + bodyList[0].CustomerName + "'"); var errstr = ""; if (BLCOUNT != "0") errstr = errstr + "此票存在未结算的应收费用"; if (BLCOUNT2 != "0") errstr = errstr + ",此客户有未提交的应收费用"; @@ -379,7 +379,7 @@ namespace DSWeb.Areas.Account.Controllers if (MBLNOSTR != "") MBLNOSTR = ",注意：主提单号 " + MBLNOSTR + " 业务应收费用中存在未结算的费用！"; - var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE OR AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + billcust + "'"); + var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE AND AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + billcust + "'"); if (BLCOUNT2 != "0") MBLNOSTR = MBLNOSTR + ",此客户有未提交的应收费用"; @@ -423,7 +423,7 @@ namespace DSWeb.Areas.Account.Controllers if (MBLNOSTR != "") MBLNOSTR = ",注意：主提单号 " + MBLNOSTR + " 业务应收费用中存在未审核的费用！"; - var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE OR AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + billcust + "'"); + var BLCOUNT2 = T_ALL_DA.GetStrSQL("BLCOUNT", "select COUNT(*) BLCOUNT from ch_fee where FEETYPE=1 and (AMOUNT<>SETTLEMENT and (AMOUNT<>ORDERINVOICE AND AMOUNT<>ORDERAMOUNT) ) and CUSTOMERNAME='" + billcust + "'"); if (BLCOUNT2 != "0") MBLNOSTR = MBLNOSTR + ",此客户有未提交的应收费用"; result.Message = "添加成功" + MBLNOSTR; diff --git a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs index c828127..950a92e 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs @@ -789,7 +789,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.CUSTOMNO,(CASE b.BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF"); strSql.Append(",(CASE b.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,b.CUSTOMERNAME,b.BLISSUESTATUS,b.CNTRTOTAL"); strSql.Append(",b.VESSEL,b.VOYNO,b.CARRIER,b.ETD,b.ETA,b.PORTLOAD,b.ENTERP,(select [NAME] FROM company where GID=B.SALECORPID) BSSALECORP"); - strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,b.GOODSNAME"); + strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.BSSOURCE,B.BSSOURCEDETAIL,B.OPTYPE,b.PARENTID,CASE WHEN isnull(f.BSGOODSNAME,'')='' THEN b.GOODSNAME ELSE f.BSGOODSNAME END GOODSNAME"); strSql.Append(",b.DOC,b.SALE,(select top 1 INVNO from ch_fee_invoicehexiao where BILLNO IN (SELECT BILLNO FROM ch_fee_do_invoice WHERE FEEID=c.FEEID)) INVOICENO "); strSql.Append(",(select TOP 1 BLSTATUS from op_blissuelist WHERE GID IN (SELECT LINKGID FROM op_blissuelist_Detail WHERE BSNO=B.PARENTID)) TFBLSTATUS"); strSql.Append(",(select TOP 1 SPREMARK from v_op_blissuelist_Detail WHERE BSNO=B.PARENTID) TFREMARK"); diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js index 36c7eae..a176be9 100644 --- a/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js +++ b/DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js @@ -4329,7 +4329,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, { var bodyAddDatas = []; for (var i = 0; i < records.length; i++) { var rec = records[i]; - if (rec.data.BillFeeStatus == "2") { + if (rec.data.BillFeeStatus!="1") { Ext.Msg.show({ title: '提示', msg: '请先撤销最终审核，才能驳回审核！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; } diff --git a/DSWeb/Areas/MvcContainer/Controllers/MsOpCtnApplyController.cs b/DSWeb/Areas/MvcContainer/Controllers/MsOpCtnApplyController.cs index be2e08a..cfe7622 100644 --- a/DSWeb/Areas/MvcContainer/Controllers/MsOpCtnApplyController.cs +++ b/DSWeb/Areas/MvcContainer/Controllers/MsOpCtnApplyController.cs @@ -206,8 +206,14 @@ namespace DSWeb.MvcContainer.Controllers string blUpSQL = "update op_ctnbscard set AGENTNAME='" + headData.AGENTNAME + "',PRE_CNT_TIME=" + updatestr + " where APPLYNO='" + headData.BSNO + "'"; bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + //MsOpCtnApplyDAL.SaveApplyFee(headData, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"])); - } + //var OP = T_ALL_DA.GetStrSQL("USERID", "select top 1 USERID from VW_user where SHOWNAME='" + headData.OP + "'"); + + //MsOpCtnApplyDAL.SaveFeeDR(headData.CTN_PRICE, headData.CURRENCY, GID, Convert.ToString(Session["USERID"]), Convert.ToInt16(headData.CTNNUM), headData.OWNERCTN, OP); + + + } diff --git a/DSWeb/Areas/MvcContainer/DAL/MsOpCtnApply/MsOpCtnApplyDAL.cs b/DSWeb/Areas/MvcContainer/DAL/MsOpCtnApply/MsOpCtnApplyDAL.cs index 35a5956..cdca6d8 100644 --- a/DSWeb/Areas/MvcContainer/DAL/MsOpCtnApply/MsOpCtnApplyDAL.cs +++ b/DSWeb/Areas/MvcContainer/DAL/MsOpCtnApply/MsOpCtnApplyDAL.cs @@ -1276,7 +1276,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnApply + ",[CREATEUSER] ,[CREATETIME] ,[TASKBEGINDATE] ,[COMPLETETYPE] ,[COMPLETETIME] ,[KPI],[MBLNO],[FILENO],[MAILNO],[FILEPATH],[ISPUBLIC],[OP],[BSNO],ISCOMPLETE)" + " SELECT NEWID(),NEWID() as [任务编号],null as [上级任务号], '成本审批驳回' as [任务类型], '账单审核' as [任务来源], '未开始' as [任务状态], '驳回原因：" + headdata.COSTAUDITRESULT + "' as [任务说明]," + "'" + username + "' as [发起人],GETDATE() as [录入日期],GETDATE() as[任务开始时间], '手动' as [完成方式],null as [完成时间] ,null as [KPI值] , '" + headdata.BSNO + "' as [提单号], " - + " null as [文件编号], '' as [邮件编号], '' as [电子档案路径], 0 as 是否公共,'" + op.BSNO + "' as 客服员,'" + headdata.BSNO + "' as 编号,0"); + + " null as [文件编号], '' as [邮件编号], '' as [电子档案路径], 0 as 是否公共,'" + GetUserNameWithUserId(op.BSNO) + "' as 客服员,'" + headdata.BSNO + "' as 编号,0"); db.ExecuteNonQuery(cmdUpdateTask, tran); } @@ -1306,6 +1306,13 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnApply return result; } + private static string GetUserNameWithUserId(string userid) + { + string sql = "select showname from [user] where gid = '" + userid + "' "; + Database db = DatabaseFactory.CreateDatabase(); + return db.ExecuteScalar(CommandType.Text, sql).ToString(); + } + public static DBResult MNGAudit(OpCtnApply headdata, string userid) { var result = new DBResult(); @@ -2757,7 +2764,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnApply feestatus = 0; } - var MsOpSeae = MsOpSeaeDAL.GetData("APPLYNO='" + headData.BSNO + "' AND ISCANCEL<>1 "); + var MsOpSeae = MsOpSeaeDAL.GetData("APPLYNO like '%" + headData.BSNO + "%' AND ISCANCEL<>1 "); if (string.IsNullOrEmpty(MsOpSeae.APPLYNO)) { result.Success = false; result.Message = "不存在此申请单业务！"; @@ -3288,12 +3295,12 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnApply MsChFeeDAL.p_op_gain(BSNO); } - catch (Exception) + catch (Exception e) { tran.Rollback(); result.Success = false; - result.Message = "保存出现错误，请重试或联系系统管理员"; + result.Message = "保存出现错误，请重试或联系系统管理员"+e.Message; return result; } diff --git a/DSWeb/Areas/MvcContainer/DAL/MsOpCtnBsCard/MsOpCtnBsCardDAL.cs b/DSWeb/Areas/MvcContainer/DAL/MsOpCtnBsCard/MsOpCtnBsCardDAL.cs index d16ffa0..bc996e5 100644 --- a/DSWeb/Areas/MvcContainer/DAL/MsOpCtnBsCard/MsOpCtnBsCardDAL.cs +++ b/DSWeb/Areas/MvcContainer/DAL/MsOpCtnBsCard/MsOpCtnBsCardDAL.cs @@ -6545,7 +6545,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard var opseae = GetData("GID='" + enumValue.GID + "'","",db,tran); var isPost = true; - tmperrstr = ismodify(opseae, modifydata); + tmperrstr = ismodify(opseae, modifydata, userid); if (!string.IsNullOrEmpty(tmperrstr)) { isPost = false; @@ -6662,7 +6662,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard var OPLOG = new OPLOG(); OPLOG.BSNO = enumValue.GID; OPLOG.BSTYPE = "OP_CTNBSCARD"; - OPLOG.FIELDNAME = "ETD"; + OPLOG.FIELDNAME = "开船日期"; OPLOG.OLDVALUE = opseae.ETD; OPLOG.NEWVALUE = modifydata.ETD; OPLOG.CREATEUSER = userid; @@ -6683,7 +6683,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard var OPLOG = new OPLOG(); OPLOG.BSNO = enumValue.GID; OPLOG.BSTYPE = "OP_CTNBSCARD"; - OPLOG.FIELDNAME = "ETA"; + OPLOG.FIELDNAME = "到港日期"; OPLOG.OLDVALUE = opseae.ETA; OPLOG.NEWVALUE = modifydata.ETA; OPLOG.CREATEUSER = userid; @@ -7008,7 +7008,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard } var BSLockField = new BSLockField(); BSLockField.BSNO = enumValue.GID; - BSLockField.FIELDNAME = "D_ETD"; + BSLockField.FIELDNAME = "I_DEST_CNT_TIME"; BsLockList.Add(BSLockField); } if (modifydata.I_DEST_RTCNT_TIME != "" && modifydata.I_DEST_RTCNT_TIME != null) @@ -7356,34 +7356,368 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard return result; } - public static string ismodify(OpCtnBsCard opseae, OpCtnBsCard modifydata) + public static string ismodify(OpCtnBsCard headData, OpCtnBsCard modifydata,string userid) { - string errstr = ""; - errstr = errstr + ismodifyDate(modifydata.PORTLOAD_CNT_TIME, modifydata.ETD, opseae.ETD,"0","0","起运港提箱日期","开船日期",""); - errstr = errstr + ismodifyDate(modifydata.ETD, modifydata.ETA, opseae.ETA,opseae.PORTLOAD_CNT_TIME, modifydata.PORTLOAD_CNT_TIME, "开船日期","到港日期", "起运港提箱日期"); - errstr = errstr + ismodifyDate(modifydata.ETA, modifydata.DEST_CNT_TIME, opseae.DEST_CNT_TIME, opseae.ETD, modifydata.ETD, "到港日期", "目的港提箱日期", "开船日期"); - errstr = errstr + ismodifyDate(modifydata.DEST_CNT_TIME, modifydata.DEST_RTCNT_TIME, opseae.DEST_RTCNT_TIME, opseae.ETA, modifydata.ETA, "目的港提箱日期", "目的港还箱日期", "到港日期"); - if (opseae.IDTYPE == "调拨-空返") + string errorstr = ""; + + if (modifydata.ETD != "" && modifydata.ETD != null) + headData.ETD = modifydata.ETD; + if (modifydata.ETA != "" && modifydata.ETA != null) + headData.ETA = modifydata.ETA; + if (modifydata.PORTLOAD_CNT_TIME != "" && modifydata.PORTLOAD_CNT_TIME != null) + headData.PORTLOAD_CNT_TIME = modifydata.PORTLOAD_CNT_TIME; + if (modifydata.DEST_CNT_TIME != "" && modifydata.DEST_CNT_TIME != null) + headData.DEST_CNT_TIME = modifydata.DEST_CNT_TIME; + if (modifydata.DEST_RTCNT_TIME != "" && modifydata.DEST_RTCNT_TIME != null) + headData.DEST_RTCNT_TIME = modifydata.DEST_RTCNT_TIME; + if (modifydata.I_ETD != "" && modifydata.I_ETD != null) + headData.I_ETD = modifydata.I_ETD; + if (modifydata.I_ETA != "" && modifydata.I_ETA != null) + headData.I_ETA = modifydata.I_ETA; + if (modifydata.I_PORTLOAD_CNT_TIME != "" && modifydata.I_PORTLOAD_CNT_TIME != null) + headData.I_PORTLOAD_CNT_TIME = modifydata.I_PORTLOAD_CNT_TIME; + if (modifydata.I_DEST_CNT_TIME != "" && modifydata.I_DEST_CNT_TIME != null) + headData.I_DEST_CNT_TIME = modifydata.I_DEST_CNT_TIME; + if (modifydata.I_DEST_RTCNT_TIME != "" && modifydata.I_DEST_RTCNT_TIME != null) + { + headData.I_DEST_RTCNT_TIME = modifydata.I_DEST_RTCNT_TIME; + } + if (modifydata.D_ETD != "" && modifydata.D_ETD != null) + headData.D_ETD = modifydata.D_ETD; + if (modifydata.D_ETA != "" && modifydata.D_ETA != null) + headData.D_ETA = modifydata.D_ETA; + if (modifydata.D_PORTLOAD_CNT_TIME != "" && modifydata.D_PORTLOAD_CNT_TIME != null) + headData.D_PORTLOAD_CNT_TIME = modifydata.D_PORTLOAD_CNT_TIME; + if (modifydata.D_DEST_CNT_TIME != "" && modifydata.D_DEST_CNT_TIME != null) + headData.D_DEST_CNT_TIME = modifydata.D_DEST_CNT_TIME; + if (modifydata.D_DEST_RTCNT_TIME != "" && modifydata.D_DEST_RTCNT_TIME != null) + { + headData.D_DEST_RTCNT_TIME = modifydata.D_DEST_RTCNT_TIME; + } + var PREHEAD = MsOpCtnBsCardDAL.GetData(" BSNO IN (SELECT TOP 1 BSNO FROM op_ctnbscard WHERE CTNNO='" + headData.CTNNO + "' AND GID<>'" + headData.GID + "' AND (PORTLOAD_CNT_TIME<'" + headData.PORTLOAD_CNT_TIME + "' or ETD<'" + headData.ETD + "') ORDER BY ETD,PORTLOAD_CNT_TIME ) ", userid); + + if (headData.PORTLOAD_CNT_TIME == "") + { + if (headData.ETD != "") + { + errorstr = "开船日期不能小于提箱日期"; + } + } + else + { + + if (headData.ETD != "" && (Convert.ToDateTime(headData.ETD) < Convert.ToDateTime(headData.PORTLOAD_CNT_TIME))) + { + errorstr = "开船日期不能小于提箱日期"; + } + if (PREHEAD.BSNO != "" && PREHEAD.BSNO != null) + { + if ((PREHEAD.IS_DB && PREHEAD.D_DEST_RTCNT_TIME == "") || (PREHEAD.IS_RETURE_EMPTY && PREHEAD.I_DEST_RTCNT_TIME == "")) + { + errorstr = "前一循环,返空目的港还箱日期未填"; + + } + else + if (PREHEAD.DEST_RTCNT_TIME == "") + { + errorstr = "前一循环,目的港还箱日期未填"; + } + + } + + } + + if (headData.ETD == "") + { + if (headData.ETA != "") + { + errorstr = "开船日期不能为空!"; + + } + } + else { - errstr = errstr + ismodifyDate(modifydata.DEST_RTCNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, opseae.D_PORTLOAD_CNT_TIME, opseae.DEST_CNT_TIME, modifydata.DEST_CNT_TIME, "目的港还箱日期", "调拨起运港提箱日期", "目的港提箱日期"); - errstr = errstr + ismodifyDate(modifydata.D_PORTLOAD_CNT_TIME, modifydata.D_ETD, opseae.D_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "调拨起运港提箱日期", "调拨开船日期", "目的港还箱日期"); - errstr = errstr + ismodifyDate(modifydata.D_DEST_RTCNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, opseae.I_PORTLOAD_CNT_TIME, opseae.D_DEST_CNT_TIME, modifydata.D_DEST_CNT_TIME, "调拨目的港还箱日期", "空返起运港提箱日期", "调拨目的港提箱日期"); + + if (headData.ETA != "" && (Convert.ToDateTime(headData.ETA) < Convert.ToDateTime(headData.ETD))) + { + errorstr = "到港日期不能小于开船日期"; + + } + } + if (headData.ETA == "") + { + if (headData.DEST_CNT_TIME != "") + { + errorstr = "到港日期不能为空!"; + + } } else { - errstr = errstr + ismodifyDate(modifydata.DEST_RTCNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, opseae.I_PORTLOAD_CNT_TIME, opseae.DEST_CNT_TIME, modifydata.DEST_CNT_TIME, "目的港还箱日期", "空返起运港提箱日期", "目的港提箱日期"); - errstr = errstr + ismodifyDate(modifydata.I_PORTLOAD_CNT_TIME, modifydata.I_ETD, opseae.I_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "空返起运港提箱日期", "空返开船日期", "目的港还箱日期"); - errstr = errstr + ismodifyDate(modifydata.I_DEST_RTCNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, opseae.D_PORTLOAD_CNT_TIME, opseae.I_DEST_CNT_TIME, modifydata.I_DEST_CNT_TIME, "空返目的港还箱日期", "调拨起运港提箱日期", "空返目的港提箱日期"); + + if (headData.DEST_CNT_TIME != "" && (Convert.ToDateTime(headData.DEST_CNT_TIME) < Convert.ToDateTime(headData.ETA))) + { + errorstr = "提箱日期不能小于到港日期"; + + } } - errstr = errstr + ismodifyDate(modifydata.I_ETD, modifydata.I_ETA, opseae.I_ETA, opseae.I_PORTLOAD_CNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, "空返开船日期", "空返到港日期", "空返起运港提箱日期"); - errstr = errstr + ismodifyDate(modifydata.I_ETA, modifydata.I_DEST_CNT_TIME, opseae.I_DEST_CNT_TIME, opseae.I_ETD, modifydata.I_ETD, "空返到港日期", "空返目的港提箱日期", "空返开船日期"); - errstr = errstr + ismodifyDate(modifydata.I_DEST_CNT_TIME, modifydata.I_DEST_RTCNT_TIME, opseae.I_DEST_RTCNT_TIME, opseae.I_ETA, modifydata.I_ETA, "空返目的港提箱日期", "空返目的港还箱日期", "空返到港日期"); - errstr = errstr + ismodifyDate(modifydata.D_PORTLOAD_CNT_TIME, modifydata.D_ETD, opseae.D_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "调拨起运港提箱日期", "调拨开船日期", "目的港还箱日期"); - errstr = errstr + ismodifyDate(modifydata.D_ETD, modifydata.D_ETA, opseae.D_ETA, opseae.D_PORTLOAD_CNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, "调拨开船日期", "调拨到港日期", "调拨起运港提箱日期"); - errstr = errstr + ismodifyDate(modifydata.D_ETA, modifydata.D_DEST_CNT_TIME, opseae.D_DEST_CNT_TIME, opseae.D_ETD, modifydata.D_ETD, "调拨到港日期", "调拨目的港提箱日期", "调拨开船日期"); - errstr = errstr + ismodifyDate(modifydata.D_DEST_CNT_TIME, modifydata.D_DEST_RTCNT_TIME, opseae.D_DEST_RTCNT_TIME, opseae.D_ETA, modifydata.D_ETA, "调拨目的港提箱日期", "调拨目的港还箱日期", "调拨到港日期"); + if (headData.DEST_CNT_TIME == "") + { + if (headData.DEST_RTCNT_TIME != "") + { + errorstr = "目的港提箱日期不能为空!"; + + } + } + else + { - return errstr; + if (headData.DEST_RTCNT_TIME != "" && (Convert.ToDateTime(headData.DEST_RTCNT_TIME) < Convert.ToDateTime(headData.DEST_CNT_TIME))) + { + errorstr = "目的港还箱日期不能小于目的港提箱日期"; + + } + } + if (headData.DEST_RTCNT_TIME == "") + { + if (headData.I_PORTLOAD_CNT_TIME != "") + { + errorstr = "目的港还箱日期不能为空!"; + + } + } + else + { + + if (headData.I_PORTLOAD_CNT_TIME != "" && (Convert.ToDateTime(headData.I_PORTLOAD_CNT_TIME) < Convert.ToDateTime(headData.DEST_RTCNT_TIME))) + { + errorstr = "空返提箱日期不能小于目的港还箱日期"; + + } + if (headData.D_PORTLOAD_CNT_TIME != "" && (Convert.ToDateTime(headData.D_PORTLOAD_CNT_TIME) < Convert.ToDateTime(headData.DEST_RTCNT_TIME))) + { + errorstr = "调拨提箱日期不能小于目的港还箱日期"; + + } + } + + + + + if (headData.I_PORTLOAD_CNT_TIME == "") + { + if (headData.I_ETD != "") + { + errorstr = "空返开船日期不能小于提箱日期"; + + } + } + else + { + + if (headData.I_ETD != "" && (Convert.ToDateTime(headData.I_ETD) < Convert.ToDateTime(headData.I_PORTLOAD_CNT_TIME))) + { + errorstr = "空返开船日期不能小于提箱日期"; + + } + } + + if (headData.I_ETD == "") + { + if (headData.I_ETA != "") + { + errorstr = "空返开船日期不能为空!"; + + } + } + else + { + + if (headData.I_ETA != "" && (Convert.ToDateTime(headData.I_ETA) < Convert.ToDateTime(headData.I_ETD))) + { + errorstr = "空返到港日期不能小于开船日期"; + + } + } + if (headData.I_ETA == "") + { + if (headData.I_DEST_CNT_TIME != "") + { + errorstr = "空返到港日期不能为空!"; + + } + } + else + { + + if (headData.I_DEST_CNT_TIME != "" && (Convert.ToDateTime(headData.I_DEST_CNT_TIME) < Convert.ToDateTime(headData.I_ETA))) + { + errorstr = "空返提箱日期不能小于到港日期"; + + } + } + if (headData.I_DEST_CNT_TIME == "") + { + if (headData.I_DEST_RTCNT_TIME != "") + { + errorstr = "空返目的港提箱日期不能为空!"; + + } + } + else + { + + if (headData.I_DEST_RTCNT_TIME != "" && (Convert.ToDateTime(headData.I_DEST_RTCNT_TIME) < Convert.ToDateTime(headData.I_DEST_CNT_TIME))) + { + errorstr = "空返目的港还箱日期不能小于目的港提箱日期"; + + } + } + + if (headData.D_PORTLOAD_CNT_TIME == "") + { + if (headData.D_ETD != "") + { + errorstr = "调拨开船日期不能小于调拨提箱日期"; + + } + } + else + { + + if (headData.D_ETD != "" && (Convert.ToDateTime(headData.D_ETD) < Convert.ToDateTime(headData.D_PORTLOAD_CNT_TIME))) + { + errorstr = "调拨开船日期不能小于调拨提箱日期"; + + } + } + + if (headData.D_ETD == "") + { + if (headData.D_ETA != "") + { + errorstr = "调拨开船日期不能为空!"; + + } + } + else + { + + if (headData.D_ETA != "" && (Convert.ToDateTime(headData.D_ETA) < Convert.ToDateTime(headData.D_ETD))) + { + errorstr = "调拨到港日期不能小于开船日期"; + + } + } + if (headData.D_ETA == "") + { + if (headData.D_DEST_CNT_TIME != "") + { + errorstr = "调拨到港日期不能为空!"; + + } + } + else + { + + if (headData.D_DEST_CNT_TIME != "" && (Convert.ToDateTime(headData.D_DEST_CNT_TIME) < Convert.ToDateTime(headData.D_ETA))) + { + errorstr = "调拨提箱日期不能小于到港日期"; + + } + } + if (headData.D_DEST_CNT_TIME == "") + { + if (headData.D_DEST_RTCNT_TIME != "") + { + errorstr = "调拨目的港提箱日期不能为空!"; + + } + } + else + { + + if (headData.D_DEST_RTCNT_TIME != "" && (Convert.ToDateTime(headData.D_DEST_RTCNT_TIME) < Convert.ToDateTime(headData.D_DEST_CNT_TIME))) + { + errorstr = "调拨目的港还箱日期不能小于目的港提箱日期"; + + } + } + + + if (headData.IS_DB && headData.IS_RETURE_EMPTY) + { + if ((!string.IsNullOrEmpty(headData.I_PORTLOAD_CNT_TIME)) && !string.IsNullOrEmpty(headData.D_PORTLOAD_CNT_TIME)) + { + if (Convert.ToDateTime(headData.D_PORTLOAD_CNT_TIME) < Convert.ToDateTime(headData.I_PORTLOAD_CNT_TIME)) + headData.IDTYPE = "调拨-空返"; + + } + else + { + } + + if (headData.IDTYPE == "调拨-空返") + { + if ((!string.IsNullOrEmpty(headData.I_PORTLOAD_CNT_TIME)) && !string.IsNullOrEmpty(headData.D_DEST_RTCNT_TIME)) + { + if (Convert.ToDateTime(headData.I_PORTLOAD_CNT_TIME) < Convert.ToDateTime(headData.D_DEST_RTCNT_TIME)) + { + errorstr = "空返提箱日期不能小于调拨目的港返箱日期"; + + + } + + } + + } + else + { + if ((!string.IsNullOrEmpty(headData.D_PORTLOAD_CNT_TIME)) && !string.IsNullOrEmpty(headData.I_DEST_RTCNT_TIME)) + { + if (Convert.ToDateTime(headData.D_PORTLOAD_CNT_TIME) < Convert.ToDateTime(headData.I_DEST_RTCNT_TIME)) + { + errorstr = "调拨提箱日期不能小于空返目的港返箱日期"; + + + } + + } + + } + + } + else + { + + } + + + //errstr = errstr + ismodifyDate(modifydata.PORTLOAD_CNT_TIME, modifydata.ETD, opseae.ETD,"0","0","起运港提箱日期","开船日期",""); + //errstr = errstr + ismodifyDate(modifydata.ETD, modifydata.ETA, opseae.ETA,opseae.PORTLOAD_CNT_TIME, modifydata.PORTLOAD_CNT_TIME, "开船日期","到港日期", "起运港提箱日期"); + //errstr = errstr + ismodifyDate(modifydata.ETA, modifydata.DEST_CNT_TIME, opseae.DEST_CNT_TIME, opseae.ETD, modifydata.ETD, "到港日期", "目的港提箱日期", "开船日期"); + //errstr = errstr + ismodifyDate(modifydata.DEST_CNT_TIME, modifydata.DEST_RTCNT_TIME, opseae.DEST_RTCNT_TIME, opseae.ETA, modifydata.ETA, "目的港提箱日期", "目的港还箱日期", "到港日期"); + //if (opseae.IDTYPE == "调拨-空返") + //{ + // errstr = errstr + ismodifyDate(modifydata.DEST_RTCNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, opseae.D_PORTLOAD_CNT_TIME, opseae.DEST_CNT_TIME, modifydata.DEST_CNT_TIME, "目的港还箱日期", "调拨起运港提箱日期", "目的港提箱日期"); + // errstr = errstr + ismodifyDate(modifydata.D_PORTLOAD_CNT_TIME, modifydata.D_ETD, opseae.D_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "调拨起运港提箱日期", "调拨开船日期", "目的港还箱日期"); + // errstr = errstr + ismodifyDate(modifydata.D_DEST_RTCNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, opseae.I_PORTLOAD_CNT_TIME, opseae.D_DEST_CNT_TIME, modifydata.D_DEST_CNT_TIME, "调拨目的港还箱日期", "空返起运港提箱日期", "调拨目的港提箱日期"); + //} + //else + //{ + // errstr = errstr + ismodifyDate(modifydata.DEST_RTCNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, opseae.I_PORTLOAD_CNT_TIME, opseae.DEST_CNT_TIME, modifydata.DEST_CNT_TIME, "目的港还箱日期", "空返起运港提箱日期", "目的港提箱日期"); + // errstr = errstr + ismodifyDate(modifydata.I_PORTLOAD_CNT_TIME, modifydata.I_ETD, opseae.I_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "空返起运港提箱日期", "空返开船日期", "目的港还箱日期"); + // errstr = errstr + ismodifyDate(modifydata.I_DEST_RTCNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, opseae.D_PORTLOAD_CNT_TIME, opseae.I_DEST_CNT_TIME, modifydata.I_DEST_CNT_TIME, "空返目的港还箱日期", "调拨起运港提箱日期", "空返目的港提箱日期"); + //} + //errstr = errstr + ismodifyDate(modifydata.I_ETD, modifydata.I_ETA, opseae.I_ETA, opseae.I_PORTLOAD_CNT_TIME, modifydata.I_PORTLOAD_CNT_TIME, "空返开船日期", "空返到港日期", "空返起运港提箱日期"); + //errstr = errstr + ismodifyDate(modifydata.I_ETA, modifydata.I_DEST_CNT_TIME, opseae.I_DEST_CNT_TIME, opseae.I_ETD, modifydata.I_ETD, "空返到港日期", "空返目的港提箱日期", "空返开船日期"); + //errstr = errstr + ismodifyDate(modifydata.I_DEST_CNT_TIME, modifydata.I_DEST_RTCNT_TIME, opseae.I_DEST_RTCNT_TIME, opseae.I_ETA, modifydata.I_ETA, "空返目的港提箱日期", "空返目的港还箱日期", "空返到港日期"); + //errstr = errstr + ismodifyDate(modifydata.D_PORTLOAD_CNT_TIME, modifydata.D_ETD, opseae.D_ETD, opseae.DEST_RTCNT_TIME, modifydata.DEST_RTCNT_TIME, "调拨起运港提箱日期", "调拨开船日期", "目的港还箱日期"); + //errstr = errstr + ismodifyDate(modifydata.D_ETD, modifydata.D_ETA, opseae.D_ETA, opseae.D_PORTLOAD_CNT_TIME, modifydata.D_PORTLOAD_CNT_TIME, "调拨开船日期", "调拨到港日期", "调拨起运港提箱日期"); + //errstr = errstr + ismodifyDate(modifydata.D_ETA, modifydata.D_DEST_CNT_TIME, opseae.D_DEST_CNT_TIME, opseae.D_ETD, modifydata.D_ETD, "调拨到港日期", "调拨目的港提箱日期", "调拨开船日期"); + //errstr = errstr + ismodifyDate(modifydata.D_DEST_CNT_TIME, modifydata.D_DEST_RTCNT_TIME, opseae.D_DEST_RTCNT_TIME, opseae.D_ETA, modifydata.D_ETA, "调拨目的港提箱日期", "调拨目的港还箱日期", "调拨到港日期"); + + return errorstr; } @@ -7437,10 +7771,10 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard } } else { - //if (!string.IsNullOrEmpty(afterdate2)) - //{ - // errstr = errstr + "," + frdatename + "不允许大于" + afterdatename; - //} + if (!string.IsNullOrEmpty(afterdate2)) + { + errstr = errstr + "," + frdatename + "不允许大于" + afterdatename; + } } return errstr; @@ -7495,7 +7829,7 @@ namespace DSWeb.MvcContainer.DAL.MsOpCtnBsCard var opseae = GetData("GID='" + enumValue.GID + "'", "", db, tran); var isPost = true; - tmperrstr = ismodify(opseae, modifydata); + tmperrstr = ismodify(opseae, modifydata,userid); if (!string.IsNullOrEmpty(tmperrstr)) { isPost = false; diff --git a/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCardFeeIndex2.js b/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCardFeeIndex2.js index 842effe..6264ccc 100644 --- a/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCardFeeIndex2.js +++ b/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCardFeeIndex2.js @@ -1064,6 +1064,10 @@ Ext.extend(Shipping.MsOpCtnBsCardFee, Ext.Panel, { } + } else { + sql = "CTNNO='" + this.EditRecord.get('CTNNO') + "' AND CUSTNO='" + this.EditRecord.get('CUSTNO') +"'"; + + } this.sqlcontext = sql; this.storeList.load({ diff --git a/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnInsuranceEdit.js b/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnInsuranceEdit.js index c0251cd..ff8b100 100644 --- a/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnInsuranceEdit.js +++ b/DSWeb/Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnInsuranceEdit.js @@ -342,7 +342,7 @@ Ext.extend(Shipping.MsOpCtnInsuranceEdit, Ext.Panel, { //#region 明细表-单据图片档案管理 - _this = this; + _thisctninsurance = this; this.storeDocList = Ext.create('Ext.data.Store', { model: 'ReceiptDocmb', remoteSort: true, diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs index 0522fb7..e432cef 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs @@ -1363,6 +1363,9 @@ namespace DSWeb.MvcShipping.Controllers { string blUpSQL = " update ch_fee set WMSOUTBSNO='" + custno + "' where GID='"+bill.GId+"'"; bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL); + string blUpSQL2 = " update ch_fee set BSGOODSNAME=ISNULL((SELECT TOP 1 GOODSNAME FROM op_ctnbscard WHERE GID=ch_fee.BSNO),'') from ch_fee where WMSOUTBSNO='" + bill.GId + "'"; + bool bl2 = T_ALL_DA.GetExecuteSqlCommand(blUpSQL2); + } } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 07be7b0..a11b867 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -1117,7 +1117,7 @@ namespace DSWeb.MvcShipping.Controllers } if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE; } - + var nowperiod = ChMonthCloseDAL.GetData("", Convert.ToString(Session["COMPANYID"])); if (opstatus == "add") { headData.INPUTBY = CookieConfig.GetCookie_UserName(Request); @@ -1126,11 +1126,29 @@ namespace DSWeb.MvcShipping.Controllers headData.FEESTATUS = false; headData.DbOperationType = DbOperationType.DbotIns; headData.ISCANCEL = ""; + if (Convert.ToDateTime(nowperiod.PERIOD + "-01") > Convert.ToDateTime(headData.ACCDATE + "-01")) + { + isPost = false; + errorstr = "已月末结转,不允许添加业务！"; + } } else if (opstatus == "edit") { headData.DbOperationType = DbOperationType.DbotUpd; headData.ModelUIStatus = "E"; + if (Convert.ToDateTime(nowperiod.PERIOD + "-01") > Convert.ToDateTime(headData.ACCDATE + "-01")) + { + + var ACCDATE = T_ALL_DA.GetStrSQL("ACCDATE", "select ACCDATE from v_op_bill WHERE BSNO='" + headData.BSNO + "'"); + if (ACCDATE != headData.ACCDATE) + { + isPost = false; + errorstr = "已月末结转,不允许修改会计期间！"; + + } + + } + } else { diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs index e96d9de..018e3e2 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs @@ -842,6 +842,7 @@ namespace DSWeb.MvcShipping.Controllers if (headData.PREETD == "") headData.PREETD = null; #endregion // + var nowperiod = ChMonthCloseDAL.GetData("", Convert.ToString(Session["COMPANYID"])); if (opstatus == "add") { #region 默认值 @@ -884,12 +885,28 @@ namespace DSWeb.MvcShipping.Controllers } #endregion // - headData.DbOperationType = DbOperationType.DbotIns; + headData.DbOperationType = DbOperationType.DbotIns; + if (Convert.ToDateTime(nowperiod.PERIOD + "-01") > Convert.ToDateTime(headData.ACCDATE + "-01")) + { + isPost = false; + errorstr = "已月末结转,不允许添加业务！"; + } } else if (opstatus == "edit") { headData.DbOperationType = DbOperationType.DbotUpd; headData.ModelUIStatus = "E"; + if (Convert.ToDateTime(nowperiod.PERIOD + "-01") > Convert.ToDateTime(headData.ACCDATE + "-01")) + { + + var ACCDATE = T_ALL_DA.GetStrSQL("ACCDATE", "select ACCDATE from v_op_bill WHERE BSNO='" + headData.BSNO + "'"); + if (ACCDATE != headData.ACCDATE) + { + isPost = false; + errorstr = "已月末结转,不允许修改会计期间！"; + + } + } } else { diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs index d3c20e2..b07fbfc 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs @@ -43,12 +43,12 @@ namespace DSWeb.MvcShipping.Controllers public ActionResult CDIndex() { return View(); - } + } // // GET：/RptMng/MsRptPcHeadQry/QryData - public ContentResult BsListData(int start, int limit, string condition, string sort, string printstr, string sortstr, string amendstr = "false",string nodaystr="") - + public ContentResult BsListData(int start, int limit, string condition, string sort, string printstr, string sortstr, string amendstr = "false", string nodaystr = "") + { if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "") @@ -72,7 +72,8 @@ namespace DSWeb.MvcShipping.Controllers } var NORPTFEESTATUS = MsSysParamSetDAL.GetData("PARAMNAME='NORPTFEESTATUS'"); - if (NORPTFEESTATUS.PARAMVALUE == "1") { + if (NORPTFEESTATUS.PARAMVALUE == "1") + { if (!string.IsNullOrEmpty(condition)) { condition = condition + " and F.FEESTATUS<>1 "; @@ -101,7 +102,8 @@ namespace DSWeb.MvcShipping.Controllers strSql.Append("SELECT *,dbo.F_FeeStatusStr(DRFEESTATUS) DRFEESTATUSREF,dbo.F_FeeStatusStr(CRFEESTATUS) CRFEESTATUSREF "); } - else { + else + { strSql.Append(@"SELECT * FROM (SELECT row_number() over ("); var sortstring = DatasetSort.Getsortstring(sort); if (!string.IsNullOrEmpty(sortstring)) @@ -175,20 +177,21 @@ namespace DSWeb.MvcShipping.Controllers strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(ORDERAMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLDR,"); strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(ORDERAMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLCR"); - //strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, GETDATE()) end) "); - //strSql.Append(" else (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); + strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, GETDATE()) end) "); + strSql.Append(" else (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); - //if (NORPTSTLDATETYPE.PARAMVALUE == "1") - //{ - // strSql.Append(",[dbo].[GetCustStlDay](A.OPDATE,F.CUSTOMERNAME,A.SALE) AS STLDATE"); - // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + if (NORPTSTLDATETYPE.PARAMVALUE == "1") + { + strSql.Append(",[dbo].[GetCustStlDay](A.OPDATE,F.CUSTOMERNAME,A.SALE) AS STLDATE"); + strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); - //} - //else { - // strSql.Append(",CASE WHEN A.STLDATE IS NULL THEN A.OPDATE ELSE A.STLDATE END STLDATE"); - // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =A.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + } + else + { + strSql.Append(",CASE WHEN A.STLDATE IS NULL THEN A.OPDATE ELSE A.STLDATE END STLDATE"); + strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =A.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); - //} + } @@ -227,11 +230,12 @@ namespace DSWeb.MvcShipping.Controllers strSql.Append(" ,A.CUSTOMDATE"); strSql.Append(" ,A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE, A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID"); strSql.Append(" ,A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,A.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION],C.CRMREMARK6 "); - //strSql.Append(" ,A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); - strSql.Append(" ,A.STLNAME, B.SALE,B.OPDATE,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + strSql.Append(" ,A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + } - else { + else + { strSql.Append("SELECT B.BSNO,B.OPTYPE, B.OPLBNAME, B.BSTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.BLISSUESTATUS,B.BLTYPE,"); strSql.Append("case B.ETD when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.ETD,23) end as ETD"); @@ -279,21 +283,21 @@ namespace DSWeb.MvcShipping.Controllers strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(ORDERAMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLDR,"); strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(ORDERAMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLCR"); - //strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, GETDATE()) end) "); - //strSql.Append(" else (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); + strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, GETDATE()) end) "); + strSql.Append(" else (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); - //if (NORPTSTLDATETYPE.PARAMVALUE == "1") - //{ - // strSql.Append(",[dbo].[GetCustStlDay](B.OPDATE,F.CUSTOMERNAME,B.SALE) AS STLDATE"); - // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + if (NORPTSTLDATETYPE.PARAMVALUE == "1") + { + strSql.Append(",[dbo].[GetCustStlDay](B.OPDATE,F.CUSTOMERNAME,B.SALE) AS STLDATE"); + strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); - //} - //else - //{ - // strSql.Append(",CASE WHEN B.STLDATE IS NULL THEN B.OPDATE ELSE B.STLDATE END STLDATE"); - // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =B.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + } + else + { + strSql.Append(",CASE WHEN B.STLDATE IS NULL THEN B.OPDATE ELSE B.STLDATE END STLDATE"); + strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =B.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); - //} + } if (PROFITRATEDR.PARAMVALUE != "1") { @@ -329,20 +333,17 @@ namespace DSWeb.MvcShipping.Controllers //} //else - strSql.Append(",'' INVOICENO"); + strSql.Append(",'' INVOICENO"); - //strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); - //strSql.Append(",dbo.F_GetBillCrFeeStatus(B.BSNO) CRFEESTATUS"); - - strSql.Append(",'' DRFEESTATUS"); - strSql.Append(",'' CRFEESTATUS"); + strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); + strSql.Append(",dbo.F_GetBillCrFeeStatus(B.BSNO) CRFEESTATUS"); strSql.Append(" FROM CH_FEE F "); strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); strSql.Append("INNER JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) "); strSql.Append(" INNER JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) "); - //strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); + strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); strSql.Append(" LEFT JOIN ( select d.CUSTOMERNAME,d.BSNO,SUM(CASE WHEN d.CURRENCY='RMB' THEN d.AMOUNT ELSE 0 END) INVRMB , SUM(CASE WHEN d.CURRENCY = 'USD' THEN d.AMOUNT ELSE 0 END) INVUSD"); strSql.Append(",MAX(d.EXCHANGERATE) INVEXCHANGERATE FROM ch_fee_do d WHERE d.CATEGORY = 7 GROUP BY d.BSNO,d.CUSTOMERNAME) INV ON(INV.BSNO= B.BSNO and INV.CUSTOMERNAME=F.CUSTOMERNAME) "); @@ -358,8 +359,8 @@ namespace DSWeb.MvcShipping.Controllers strSql.Append(" ,B.CUSTOMDATE"); strSql.Append(" ,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID"); strSql.Append(" ,B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION],C.CRMREMARK6 "); - //strSql.Append(" ,B.STLNAME, S.SETTLETIME,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); - strSql.Append(" ,B.STLNAME, INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + strSql.Append(" ,B.STLNAME, S.SETTLETIME,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + } @@ -441,18 +442,424 @@ namespace DSWeb.MvcShipping.Controllers paramps_sSQL.DbType = DbType.String; paramps_sSQL.Direction = ParameterDirection.Input; paramps_sSQL.Value = strSql.ToString(); - dbparams.Add(paramps_sSQL); + dbparams.Add(paramps_sSQL); T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA(); var BLCOUNT2 = T_ALL_DA.GetStrSQL("CT", strSqlCount.ToString()); var dbRptResult = PubSysDAL.GetMsSqlPrcDataSet("sMsExesqlQry", dbparams, "Result_Set"); - var json = RptHelper.GetRptJsonResult(0, limit, dbRptResult, "Result_Set", true,null,"",Convert.ToInt32(BLCOUNT2)); + var json = RptHelper.GetRptJsonResult(0, limit, dbRptResult, "Result_Set", true, null, "", Convert.ToInt32(BLCOUNT2)); return new ContentResult() { Content = json }; } } + //public ContentResult BsListData(int start, int limit, string condition, string sort, string printstr, string sortstr, string amendstr = "false",string nodaystr="") + + //{ + + // if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "") + // { + // var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时，请退出系统重新登录！" }; + // return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; + // } + + // var strDa = GetRangDAStr("index", Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["SHOWNAME"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim()); + + // if (!string.IsNullOrEmpty(strDa)) + // { + // if (!string.IsNullOrEmpty(condition)) + // { + // condition = condition + " and " + strDa; + // } + // else + // { + // condition = strDa; + // } + // } + + // var NORPTFEESTATUS = MsSysParamSetDAL.GetData("PARAMNAME='NORPTFEESTATUS'"); + // if (NORPTFEESTATUS.PARAMVALUE == "1") { + // if (!string.IsNullOrEmpty(condition)) + // { + // condition = condition + " and F.FEESTATUS<>1 "; + // } + // else + // { + // condition = " F.FEESTATUS<>1 "; + // } + + // } + + + // var PROFITRATEDR = MsSysParamSetDAL.GetData("PARAMNAME='PROFITRATEDR'"); + + // var NORPTSTLDATETYPE = MsSysParamSetDAL.GetData("PARAMNAME='NORPTSTLDATETYPE'"); + + // var strSql = new StringBuilder(); + // var strSqlCount = new StringBuilder(); + + + // if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true")) + // { + + // if (!string.IsNullOrEmpty(nodaystr)) strSql.Append("SELECT * FROM ("); + + + // strSql.Append("SELECT *,dbo.F_FeeStatusStr(DRFEESTATUS) DRFEESTATUSREF,dbo.F_FeeStatusStr(CRFEESTATUS) CRFEESTATUSREF "); + // } + // else { + // strSql.Append(@"SELECT * FROM (SELECT row_number() over ("); + // var sortstring = DatasetSort.Getsortstring(sort); + // if (!string.IsNullOrEmpty(sortstring)) + // { + // strSql.Append(" order by " + sortstring); + // } + // else + // { + // strSql.Append(" order by CUSTNAME,OPDATE,MBLNO "); + + + // } + // strSql.Append(@") as num , "); + + + // strSql.Append(" *,dbo.F_FeeStatusStr(DRFEESTATUS) DRFEESTATUSREF,dbo.F_FeeStatusStr(CRFEESTATUS) CRFEESTATUSREF "); + + // } + // strSql.Append(",case OPDATE when '' then 0 else case when BALTTLDR<>0 OR BALTTLCR<>0 then DATEDIFF([day],OPDATE,GETDATE()) "); + // strSql.Append(" else (DATEDIFF([day],OPDATE,OPDATE)) end end AS NODAY"); + + + // strSql.Append(" FROM ("); + + // if (amendstr == "true") + // { + // strSql.Append("SELECT A.BSNO,'' OPTYPE,A.OPLBNAME, A.BSTYPE,A.CUSTOMERNAME, A.CUSTNO, A.MBLNO,A.HBLNO,A.VESSEL,A.VOYNO, A.INPUTBY, A.CREATETIME, A.BSSTATUS, A.SALE, A.OP,A.DOC,A.YARD,A.BLISSUESTATUS,A.BLTYPE,"); + // strSql.Append("case A.ETD when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), A.ETD,23) end as ETD"); + // strSql.Append(",case A.ETA when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), A.ETA,23) end as ETA"); + // strSql.Append(",CASE WHEN A.CUSTOMERNAME=F.CUSTOMERNAME THEN A.STLNAME ELSE isnull((select top 1 ACCTYPE from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=A.SALE)) and BGNDATE<=A.OPDATE AND ENDDATE>=A.OPDATE),'现结买单') END STLNAME"); + + // strSql.Append(",case A.OPDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), A.OPDATE,23) end as OPDATE,A.ENTERP,A.DELIVERYDATE"); + // strSql.Append(",case A.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), A.CUSTOMDATE,23) end as CUSTOMDATE"); + // strSql.Append(",A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE,A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID"); + // strSql.Append(",A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,(select [NAME] from [company] where GID=A.SALECORPID) as SALECORP"); + // strSql.Append(",(CASE A.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF "); + // strSql.Append(",F.CUSTOMERNAME AS CUSTNAME "); + // strSql.Append(",C.[DESCRIPTION] AS CUSTFULLNAME,C.CRMREMARK6 "); + // strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS STLRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS ORDERRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS ORDERRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS ORDERUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS ORDERUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(SETTLEMENT,0) END) END)ELSE 0 END),0) AS STLOTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(SETTLEMENT,0) END) END)ELSE 0 END),0) AS STLOTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT-SETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT-SETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(ORDERAMOUNT,0) END) END)ELSE 0 END),0) AS ORDEROTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(ORDERAMOUNT,0) END) END)ELSE 0 END),0) AS ORDEROTCR,"); + // strSql.Append("INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE,"); + // strSql.Append("isnull(SUM(CASE WHEN CURRENCY<>'USD' AND CURRENCY<>'RMB' THEN ISNULL(INVOICE,0) ELSE 0 END),0) AS INVOT,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(AMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS TTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(AMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS TTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(SETTLEMENT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS STLTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(SETTLEMENT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS STLTTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(AMOUNT-SETTLEMENT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS BALTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(AMOUNT-SETTLEMENT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS BALTTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(ORDERAMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(ORDERAMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLCR"); + + // //strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, GETDATE()) end) "); + // //strSql.Append(" else (case A.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],A.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); + + // //if (NORPTSTLDATETYPE.PARAMVALUE == "1") + // //{ + // // strSql.Append(",[dbo].[GetCustStlDay](A.OPDATE,F.CUSTOMERNAME,A.SALE) AS STLDATE"); + // // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + + // //} + // //else { + // // strSql.Append(",CASE WHEN A.STLDATE IS NULL THEN A.OPDATE ELSE A.STLDATE END STLDATE"); + // // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE WITH (NOLOCK) where LINKGID = (select top 1 GID from info_client WITH (NOLOCK) where shortname =A.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + + // //} + + + + // if (PROFITRATEDR.PARAMVALUE != "1") + // { + // strSql.Append(", (CASE WHEN (SUM(G.TTLDR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLDR)) * 100, 10, 2))) END) AS PROFITRATE"); + + // } + // else + // strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); + + // //strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then DATEDIFF([day],B.OPDATE,(CASE C.STLNAME WHEN '月结' THEN "); + // //strSql.Append("DATEADD(month,1,DATEADD(day,ISNULL(CAST(C.STLDATE AS INT),1),DATEADD(day,-Day(B.OPDATE)+1,B.OPDATE)))"); + // //strSql.Append("WHEN '半月结' THEN (CASE WHEN DATEPART(DAY, GETDATE())<=15 THEN DATEADD(day,ISNULL(CAST(C.STLFIRSTHALFDATE AS INT),16),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))"); + // //strSql.Append("ELSE DATEADD(MONTH,1,DATEADD(day,ISNULL(CAST(C.STLMIDDLEDATE AS INT),1),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))) END)"); + // //strSql.Append("ELSE GETDATE() END)) else (DATEDIFF([day],B.OPDATE, S.SETTLETIME)) end end AS NODAY"); + + // strSql.Append(",dbo.F_GetBillDrFeeStatus(A.BSNO) DRFEESTATUS"); + // strSql.Append(",dbo.F_GetBillCrFeeStatus(A.BSNO) CRFEESTATUS"); + // strSql.Append(" FROM CH_FEE F "); + // strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); + // strSql.Append(" INNER JOIN V_OP_BS A ON (A.BSNO=B.PARENTID) "); + // strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=A.BSNO) "); + // strSql.Append(" INNER JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) "); + // strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); + // strSql.Append(" LEFT JOIN ( select d.CUSTOMERNAME,d.BSNO,SUM(CASE WHEN d.CURRENCY='RMB' THEN d.AMOUNT ELSE 0 END) INVRMB , SUM(CASE WHEN d.CURRENCY = 'USD' THEN d.AMOUNT ELSE 0 END) INVUSD"); + // strSql.Append(",MAX(d.EXCHANGERATE) INVEXCHANGERATE FROM ch_fee_do d WHERE d.CATEGORY = 7 GROUP BY d.BSNO,d.CUSTOMERNAME) INV ON(INV.BSNO= B.BSNO and INV.CUSTOMERNAME=F.CUSTOMERNAME) "); + // if (!string.IsNullOrEmpty(condition)) + // { + // strSql.Append(" Where " + condition); + // } + + // strSql.Append(" GROUP BY A.BSNO,A.OPLBNAME, A.BSTYPE,A.CUSTOMERNAME, A.CUSTNO, A.MBLNO,A.HBLNO,A.VESSEL, A.VOYNO, A.INPUTBY, A.CREATETIME, A.BSSTATUS, A.SALE, A.OP, A.DOC,A.YARD,A.BLISSUESTATUS,A.BLTYPE,"); + // strSql.Append(" A.ETD,A.ETA"); + // strSql.Append(" ,A.OPDATE,A.ENTERP,A.DELIVERYDATE"); + // strSql.Append(" ,A.CUSTOMDATE"); + // strSql.Append(" ,A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE, A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID"); + // strSql.Append(" ,A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,A.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION],C.CRMREMARK6 "); + // //strSql.Append(" ,A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + // strSql.Append(" ,A.STLNAME, B.SALE,B.OPDATE,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + + // } + // else { + + // strSql.Append("SELECT B.BSNO,B.OPTYPE, B.OPLBNAME, B.BSTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.BLISSUESTATUS,B.BLTYPE,"); + // strSql.Append("case B.ETD when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.ETD,23) end as ETD"); + // strSql.Append(",case B.ETA when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.ETA,23) end as ETA"); + // strSql.Append(",CASE WHEN B.CUSTOMERNAME=F.CUSTOMERNAME THEN B.STLNAME ELSE isnull((select top 1 ACCTYPE from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),'现结买单') END STLNAME"); + // strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.OPDATE,23) end as OPDATE,B.ENTERP,B.DELIVERYDATE"); + // strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE"); + // strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID"); + // strSql.Append(",B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP"); + // strSql.Append(",(CASE B.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF "); + // strSql.Append(",F.CUSTOMERNAME AS CUSTNAME "); + // strSql.Append(",C.[DESCRIPTION] AS CUSTFULLNAME,C.CRMREMARK6 "); + // strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS STLRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS ORDERRMBDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS ORDERRMBCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS ORDERUSDDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS ORDERUSDCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(SETTLEMENT,0) END) END)ELSE 0 END),0) AS STLOTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(SETTLEMENT,0) END) END)ELSE 0 END),0) AS STLOTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT-SETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT-SETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(ORDERAMOUNT,0) END) END)ELSE 0 END),0) AS ORDEROTDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(ORDERAMOUNT,0) END) END)ELSE 0 END),0) AS ORDEROTCR,"); + // strSql.Append("INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE,"); + // strSql.Append("isnull(SUM(CASE WHEN CURRENCY<>'USD' AND CURRENCY<>'RMB' THEN ISNULL(INVOICE,0) ELSE 0 END),0) AS INVOT,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(AMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS TTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(AMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS TTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(SETTLEMENT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS STLTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(SETTLEMENT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS STLTTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(AMOUNT-SETTLEMENT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS BALTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(AMOUNT-SETTLEMENT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS BALTTLCR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN cast(round(ISNULL(ORDERAMOUNT,0) * ISNULL(EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLDR,"); + // strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN cast(round(ISNULL(ORDERAMOUNT,0) *ISNULL( EXCHANGERATE,0),2) as numeric(20,2)) ELSE 0 END),0) AS ORDERTTLCR"); + + // //strSql.Append(",case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, GETDATE()) end) "); + // //strSql.Append(" else (case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else DATEDIFF([day],B.OPDATE, S.SETTLETIME) end) end AS ACTUALDAY,S.SETTLETIME"); + + // //if (NORPTSTLDATETYPE.PARAMVALUE == "1") + // //{ + // // strSql.Append(",[dbo].[GetCustStlDay](B.OPDATE,F.CUSTOMERNAME,B.SALE) AS STLDATE"); + // // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =F.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + + // //} + // //else + // //{ + // // strSql.Append(",CASE WHEN B.STLDATE IS NULL THEN B.OPDATE ELSE B.STLDATE END STLDATE"); + // // strSql.Append(",isnull((select top 1 case ACCTYPE WHEN '月结' then accmonth*30 + accdays WHEN '季结' then accmonth*90 + accdays else accdays end from Info_Client_ACCDATE where LINKGID = (select top 1 GID from info_client where shortname =B.CUSTOMERNAME ) AND ((ISNULL(SALE,'')='') or (ISNULL(SALE,'')=B.SALE)) and BGNDATE<=B.OPDATE AND ENDDATE>=B.OPDATE),0) CONTRACTDAY "); + + // //} + + // if (PROFITRATEDR.PARAMVALUE != "1") + // { + // strSql.Append(", (CASE WHEN (SUM(G.TTLDR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLDR)) * 100, 10, 2))) END) AS PROFITRATE"); + + // } + // else + // strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); + + + // strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then 0 else case when isnull(SUM(F.AMOUNT),0)<>isnull(SUM(F.SETTLEMENT),0) then DATEDIFF([day],B.OPDATE,(CASE C.STLNAME WHEN '月结' THEN "); + // strSql.Append("DATEADD(month,1,DATEADD(day,ISNULL(CAST(C.STLDATE AS INT),1),DATEADD(day,-Day(B.OPDATE)+1,B.OPDATE)))"); + // strSql.Append("WHEN '半月结' THEN (CASE WHEN DATEPART(DAY, GETDATE())<=15 THEN DATEADD(day,ISNULL(CAST(C.STLFIRSTHALFDATE AS INT),16),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))"); + // strSql.Append("ELSE DATEADD(MONTH,1,DATEADD(day,ISNULL(CAST(C.STLMIDDLEDATE AS INT),1),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))) END)"); + // strSql.Append("ELSE GETDATE() END)) else (DATEDIFF([day],B.OPDATE, S.SETTLETIME)) end end AS NODAY"); + + // //var FEEDEBITINVISMUST = MsSysParamSetDAL.GetData("PARAMNAME='RPTNOINVOICENO'"); + // //if (FEEDEBITINVISMUST.PARAMVALUE == "1") + // //{ + + // // if (condition.IndexOf("F.FEETYPE=1") >= 0) + // // { + // // // strSql.Append(",INVOICENO = stuff ((SELECT distinct INVOICENUM+',' FROM CH_FEE AS t WHERE ISNULL(t.INVOICENUM,'')<>'' AND t .BSNO = B.BSNO and t.CUSTOMERNAME=f.CUSTOMERNAME FOR xml path('')), 1, 0, '') "); + // // strSql.Append(",INVOICENO = stuff ((SELECT distinct i.INVOICENO+',' FROM CH_FEE_DO AS t left join ch_fee_invoice i on (i.BILLNO=t.BILLNO) WHERE t.CATEGORY=7 and t .BSNO = B.BSNO and i.CUSTOMERNAME=f.CUSTOMERNAME FOR xml path('')), 1, 0, '') "); + + // // } + // // else + // // { + // // strSql.Append(",INVOICENO = stuff ((SELECT distinct BILLNO+',' FROM CH_FEE_DO AS t WHERE t.CATEGORY=4 and t .BSNO = B.BSNO and t.CUSTOMERNAME=f.CUSTOMERNAME FOR xml path('')), 1, 0, '') "); + + + // // } + // //} + // //else + + // strSql.Append(",'' INVOICENO"); + + + // strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); + // strSql.Append(",dbo.F_GetBillCrFeeStatus(B.BSNO) CRFEESTATUS"); + + // //strSql.Append(",'' DRFEESTATUS"); + // //strSql.Append(",'' CRFEESTATUS"); + + // strSql.Append(" FROM CH_FEE F "); + // strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); + // strSql.Append("INNER JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) "); + // strSql.Append(" INNER JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) "); + // strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); + // strSql.Append(" LEFT JOIN ( select d.CUSTOMERNAME,d.BSNO,SUM(CASE WHEN d.CURRENCY='RMB' THEN d.AMOUNT ELSE 0 END) INVRMB , SUM(CASE WHEN d.CURRENCY = 'USD' THEN d.AMOUNT ELSE 0 END) INVUSD"); + // strSql.Append(",MAX(d.EXCHANGERATE) INVEXCHANGERATE FROM ch_fee_do d WHERE d.CATEGORY = 7 GROUP BY d.BSNO,d.CUSTOMERNAME) INV ON(INV.BSNO= B.BSNO and INV.CUSTOMERNAME=F.CUSTOMERNAME) "); + + + // if (!string.IsNullOrEmpty(condition)) + // { + // strSql.Append(" Where " + condition); + // } + + // strSql.Append(" GROUP BY B.BSNO,B.OPTYPE,B.OPLBNAME, B.BSTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.BLISSUESTATUS,B.BLTYPE,"); + // strSql.Append(" B.ETD,B.ETA"); + // strSql.Append(" ,B.OPDATE,B.ENTERP,B.DELIVERYDATE"); + // strSql.Append(" ,B.CUSTOMDATE"); + // strSql.Append(" ,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID"); + // strSql.Append(" ,B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION],C.CRMREMARK6 "); + // strSql.Append(" ,B.STLNAME, S.SETTLETIME,INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + // //strSql.Append(" ,B.STLNAME, INV.INVRMB,INV.INVUSD,INV.INVEXCHANGERATE"); + + // } + + // strSql.Append(") AS T "); + + + + + + + // if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true")) + // { + + // if (!string.IsNullOrEmpty(nodaystr)) + // { + // strSql.Append(" ) AS Y WHERE " + nodaystr); + // } + + // if (!string.IsNullOrEmpty(sortstr)) + // { + // strSql.Append(" order by " + sortstr); + // } + // else + // { + // strSql.Append(" order by CUSTNAME,OPDATE,MBLNO "); + // //if (amendstr == "true") + // // strSql.Append(" order by F.CUSTOMERNAME,A.OPDATE,B.MBLNO "); + // //else strSql.Append(" order by F.CUSTOMERNAME,B.OPDATE,B.MBLNO "); + + // } + + // var jsonRespose = new JsonResponse + // { + // Success = true, + // Message = condition, + // Data = strSql.ToString() + // }; + + // return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; + // } + // else + // { + + // if (!string.IsNullOrEmpty(nodaystr)) + // { + // strSql.Append(" ) AS Y WHERE " + nodaystr); + // } + + // //var sortstring = DatasetSort.Getsortstring(sort); + // //if (!string.IsNullOrEmpty(sortstring)) + // //{ + // // strSql.Append(" order by " + sortstring); + // //} + // //else + // //{ + // // strSql.Append(" order by CUSTNAME,OPDATE,MBLNO "); + + + // //} + + // strSql.Append(@")as t "); + // strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit)); // + + // strSqlCount.Append(" SELECT COUNT(1) CT FROM ("); + + // strSqlCount.Append(" SELECT B.BSNO,F.CUSTOMERNAME"); + // strSqlCount.Append(" FROM CH_FEE F "); + // strSqlCount.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); + // if (!string.IsNullOrEmpty(condition)) + // { + // strSqlCount.Append(" Where " + condition); + // } + // strSqlCount.Append(" GROUP BY B.BSNO,F.CUSTOMERNAME) AS V "); + + // var dbparams = new List(); + + // var paramps_sSQL = new CustomDbParamter(); + // paramps_sSQL.ParameterName = "@sSQL"; + // paramps_sSQL.DbType = DbType.String; + // paramps_sSQL.Direction = ParameterDirection.Input; + // paramps_sSQL.Value = strSql.ToString(); + // dbparams.Add(paramps_sSQL); + + // T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA(); + // var BLCOUNT2 = T_ALL_DA.GetStrSQL("CT", strSqlCount.ToString()); + + + // var dbRptResult = PubSysDAL.GetMsSqlPrcDataSet("sMsExesqlQry", dbparams, "Result_Set"); + // var json = RptHelper.GetRptJsonResult(0, limit, dbRptResult, "Result_Set", true,null,"",Convert.ToInt32(BLCOUNT2)); + // return new ContentResult() { Content = json }; + // } + + //} public ContentResult GetSqlStr(string condition) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs index 632775f..35f20cc 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs @@ -712,6 +712,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL + static public int DeleteFee(string tempGId) { int iResult = 0; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeSetList/MsCodeFeeSetListEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeSetList/MsCodeFeeSetListEdit.js index 175fed7..067c7e5 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeSetList/MsCodeFeeSetListEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFeeSetList/MsCodeFeeSetListEdit.js @@ -41,6 +41,7 @@ Ext.extend(Shipping.MsCodeFeeSetListEdit, Ext.Panel, { this.StoreDefaultUnit.add({ 'value': '个', 'text': '个' }); this.StoreDefaultUnit.add({ 'value': '小时', 'text': '小时' }); this.StoreDefaultUnit.add({ 'value': '20TK', 'text': '20TK' }); + this.StoreDefaultUnit.add({ 'value': '台', 'text': '台' }); this.comboxDefaultUnit = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: Zi.LAN.DEFAULTUNIT, //'默认计费标准', diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 1fcbd70..8ceb51e 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -1173,10 +1173,6 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { header: Zi.LAN.ENTERP, //'货物标识', width: 70 }, { - dataIndex: 'DELIVERYDATE', - header: Zi.LAN.DELIVERYDATE, //'货物标识', - width: 70 - }, { dataIndex: 'ISCANCEL', header: '退舱', //'退舱', width: 60, diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index 116d9ae..46d1b09 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles D:\DONGSHENG7\D7HENGCHENG\DSWeb\Properties\PublishProfiles\配置文件1.pubxml true - Debug|Any CPU + Release|Any CPU diff --git a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml index 147b917..21ce63d 100644 --- a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml +++ b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml @@ -9,9 +9,9 @@ Release Any CPU - True - False - D:\DONGSHENGWEBHC2 - True + true + false + D:\DS7发布\DONGSHENGWEBHC + true \ No newline at end of file diff --git a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user index bc89ff9..f8fd461 100644 --- a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user +++ b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user @@ -6,8 +6,8 @@ 2018-03-02T16:59:08.8750562+08:00 - <_PublishTargetUrl>D:\DONGSHENGWEBHC2 - False|2024-04-29T09:52:38.5503406Z;False|2024-04-29T17:26:13.0332784+08:00;False|2024-04-29T17:24:27.2283158+08:00;False|2024-04-29T17:21:02.7760525+08:00;False|2024-04-29T17:15:23.0790860+08:00;False|2024-04-29T17:13:16.3908539+08:00;False|2024-04-29T17:10:51.6254597+08:00;False|2024-04-29T17:09:35.0339596+08:00; + <_PublishTargetUrl>D:\DS7发布\DONGSHENGWEBHC + True|2024-07-04T06:05:54.8854677Z;True|2024-07-01T10:41:18.2261097+08:00;True|2024-07-01T07:32:26.2448777+08:00;True|2024-06-28T14:53:31.5250758+08:00;True|2024-06-28T11:24:52.3384934+08:00;True|2024-06-21T10:38:56.6985088+08:00;False|2024-04-29T17:52:38.5503406+08:00;False|2024-04-29T17:26:13.0332784+08:00;False|2024-04-29T17:24:27.2283158+08:00;False|2024-04-29T17:21:02.7760525+08:00;False|2024-04-29T17:15:23.0790860+08:00;False|2024-04-29T17:13:16.3908539+08:00;False|2024-04-29T17:10:51.6254597+08:00;False|2024-04-29T17:09:35.0339596+08:00; @@ -402,7 +402,7 @@ 04/18/2022 10:10:31 - 04/10/2024 10:52:47 + 06/20/2024 14:13:34 03/16/2021 14:28:12 @@ -5754,7 +5754,7 @@ 09/23/2022 08:56:03 - 09/12/2023 14:38:09 + 05/30/2024 10:03:22 01/10/2024 11:24:31 @@ -5817,7 +5817,7 @@ 02/07/2024 10:32:58 - 03/22/2024 15:34:27 + 06/21/2024 10:35:58 12/26/2023 16:34:26 @@ -5844,7 +5844,7 @@ 02/20/2024 10:33:35 - 04/10/2024 13:46:38 + 06/21/2024 10:10:04 03/14/2024 09:35:05 @@ -8358,7 +8358,7 @@ 03/01/2018 17:06:33 - 06/08/2021 16:39:21 + 05/28/2024 11:37:24 05/18/2020 15:11:46 @@ -10257,7 +10257,7 @@ 06/14/2018 09:45:27 - 03/26/2024 16:34:40 + 05/09/2024 08:04:34 01/04/2024 13:51:25 @@ -10275,7 +10275,7 @@ 06/04/2020 14:31:29 - 10/13/2023 09:39:42 + 06/07/2024 15:07:44 01/05/2024 08:36:04 @@ -10818,7 +10818,7 @@ 12/30/2020 11:03:47 - 11/14/2023 17:14:06 + 05/09/2024 09:50:48 05/20/2020 15:01:30 @@ -15318,19 +15318,19 @@ 03/01/2018 17:08:26 - 04/29/2024 17:55:43 + 07/04/2024 14:13:53 - 04/29/2024 17:55:43 + 07/04/2024 14:13:53 - 04/29/2024 17:55:44 + 07/04/2024 14:13:54 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 10/23/2017 13:15:18 @@ -15357,10 +15357,10 @@ 05/17/2018 14:25:17 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 03/01/2018 17:08:26 @@ -15465,10 +15465,10 @@ 03/10/2017 15:05:10 - 04/29/2024 17:09:14 + 06/21/2024 10:37:39 - 04/29/2024 17:09:14 + 06/21/2024 10:37:39 03/10/2017 15:05:10 @@ -15495,7 +15495,7 @@ 05/30/2019 17:57:06 - 04/13/2024 15:54:27 + 05/15/2024 13:35:06 05/30/2019 17:57:06 @@ -15549,10 +15549,10 @@ 10/29/2019 16:00:07 - 04/29/2024 17:09:14 + 06/21/2024 10:37:39 - 04/29/2024 17:09:14 + 06/21/2024 10:37:39 05/30/2019 17:57:06 @@ -15606,10 +15606,10 @@ 03/01/2018 17:08:26 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 - 04/29/2024 17:09:15 + 06/21/2024 10:37:39 02/22/2023 13:31:10 @@ -26523,7 +26523,7 @@ 05/28/2020 13:54:15 - 03/27/2024 11:54:40 + 06/20/2024 10:37:31 03/01/2018 17:05:43 diff --git a/DSWebComponent/bin/Debug/DSWebComponent.dll b/DSWebComponent/bin/Debug/DSWebComponent.dll index 626c096155e8e84712231a145dad3e8422a2165e..0f66412330b71913a9e3e45558617af728414180 100644 GIT binary patch delta 66 zcmZp0XmFU&!94Y6@W$@F!UEG0KYkbFIO@`@c-1@8XY-ED5h5+jAlb?H#U%xvJDjj~ WxNYgN{=tOw`FEn%Zsw5q!43fMqaIrT delta 66 zcmZp0XmFU&!MrhBe`EJvVS!S%>2Dam?Q&`O=-=sQU|g{|LZpQmBs=-OxTHYLiF-E3 VABKA_H{*;IUbIVPGl#?vb^xIe8#@31 diff --git a/DSWebComponent/bin/Debug/DSWebComponent.pdb b/DSWebComponent/bin/Debug/DSWebComponent.pdb index 89dd5bc1100e4bd55a2ec80aeebffb9bdf2f8bdb..4ef56f00a0ef9f4edf52b52cbd44d6a156b33acb 100644 GIT binary patch delta 57 zcmV-90LK4-tO0e0h5tGFtb1+#3>k+`BP>A0002zK*&2l+c`+D P;E-pZ+*_@)98Ba1vRD|J delta 57 zcmV-90LK4-tO0lDYcFO200017$lg51;a5qg PHVIu5qPirr98Ba1i%%9l diff --git a/DSWebComponent/bin/Release/DSWebComponent.dll b/DSWebComponent/bin/Release/DSWebComponent.dll index d302f98420cb89d3014144d4ef3c00ac040ecf93..a8a1c04237a32dade3ff7646bc4011d146a5587c 100644 GIT binary patch delta 66 zcmZp0XmFU&!Cd^jWMlVVA%O_){*aix+nicwad1fmvR&OgLpXsMBs=-Hn52NO`hgcq VpIf@MN7T&zbw%yTW)<-}8~~$r9Jv4h delta 66 zcmZp0XmFU&!Mr2Dam?Q&`O=-=sQU|g{|LZpQmBs=-OxTHYLiF-E3 VABKA_H{*;IUbIVPGl#?vb^xIe8#@31 diff --git a/DSWebComponent/obj/Debug/DSWebComponent.pdb b/DSWebComponent/obj/Debug/DSWebComponent.pdb index 89dd5bc1100e4bd55a2ec80aeebffb9bdf2f8bdb..4ef56f00a0ef9f4edf52b52cbd44d6a156b33acb 100644 GIT binary patch delta 57 zcmV-90LK4-tO0e0h5tGFtb1+#3>k+`BP>A0002zK*&2l+c`+D P;E-pZ+*_@)98Ba1vRD|J delta 57 zcmV-90LK4-tO0lDYcFO200017$lg51;a5qg PHVIu5qPirr98Ba1i%%9l diff --git a/DSWebComponent/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DSWebComponent/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 338164ec9a0a56e8ca1d2ce928a9c51829b3fe73..d2910a2fe27d71c2dd61e865df9c7945b98c62ca 100644 GIT binary patch delta 344 zcmbPfbevm4oSA`vflaSGGcPxVMK2{Mhea>7B9(z-@&uk_#-z!Kyipv^`9-N9naK&f zrC_0W79cMcBnM(7f*6zd*%`qMj)>eGkm59u=;U+!Je)xD85n^$2q+RH0b;SZmFDDt zgb{#k@+jxSd^itAi5D-7<4h z{StFiYmHs3VqE_aMPPjmLk@%2cLr@cnY>QOF7TLQSn+%if{To;}v{H;PUm)!-axbWBV3+5dC<+AI6s{;vZJ_K4aH<#TBESKBALaQPU z!C$lH=Ie{~rFuT^EY7icHbjuipFnyYaMvNcEnkBa&G(Wun;^{+lUsf>(CRS`e#~4~ z9E0;pDex?}RXow)lT~UAd#?+>&Kn!tg-M(F4tJP_ZcnOJGxflAHzf1mSjfX}Q-xXB z_V7~MhHxF6?^CL*Fxdbd4J!wh0=e^i& z@tajVxmJI1RMy3LDt*Pw0+(QGAvvh=rlXlG1C#c_4$}u}ym6&sv?)a$Jw&sbkkH^t z%hvgTG)_zdxo{d4U3A6;l*ubi?}X0}K|Z^=y1-S_Wi0}{I4(*xP94c%f47=wn9NDQJJ zNG6j8eo!U`{u(N`lm-vO6W_0`Dd5aa@Ii9he2dQdkl)+8r3oAu)<# z#JG<#VT_@8eOl@;r`0kN>0>6L8j;Et z%5fCamksH%dNRn!VEZ_=XCq6q3&sT2ro#3wspKi{8V|8FLUrc++Np(##C5>6UdN*$(;tV`u+9QDl)PL67y`x)3eV{mS4W8Mw7^P zJcV5Lf=448FZ;GiW>veKD#V>e5Gw|di1JAYab^%l$A?p3nwccZpwDkUA@bMp&M-u# zH~0i`YVpmGAf6%wiw^=Rc!qnrN4Z*zS{vU*uq7AEm%=VAjo?a+> z%~HeTVIME@o*LR${7)F(KWb-|u;rgrw549ZX!mc?lvDfUg+GqC@Ab>?@ttC?Hawhu zhPz(($q-$mETi!)ic;_Q-3(E|5a2s3q&6@;m?Rz(a>a|5B#9?ptIZH`q$fk9EL0RZ*-4FUiF diff --git a/HcDBUtility/bin/Debug/HcDBUtility.dll b/HcDBUtility/bin/Debug/HcDBUtility.dll index 961c8e1708fbfc08c18ffe63ceb112c0f85a452b..4583af65736e67a1b62e5c9cc067123559f739fd 100644 GIT binary patch delta 68 zcmZp8z|`=7X+j6{)Stl{yFbnp=-He+`%_i8|8!^8d|8j^=bL+G3GjeqC(mCdDG+RI Y*|A|#um8$@4R!*b>yB?evCM)K09kV%=>Px# delta 68 zcmZp8z|`=7X+j6{rfmI<-5+NPup7*fH9IBdwnppHd(IyJ-pxI;1b9HQljkp!6kw`# Y{JOMJ&ZE`)<+{-S|BW}FSZ2Wq0QFNICjbBd diff --git a/HcDBUtility/bin/Debug/HcDBUtility.pdb b/HcDBUtility/bin/Debug/HcDBUtility.pdb index 29cfc5773c28265a9293f328f9ab33bccb559bd6..5452b783c175900795c041891766c8f43d7558b0 100644 GIT binary patch delta 62 zcmV-E0Kxx&j0k{?2(So92vuNYWaF>e0h8f!FoQryw?Ie%#H$#U`BP>A0000}GdYN` Ul8sNPzJNXu^M1#-9P|O?5fHo?+5i9m delta 62 zcmV-E0Kxx&j0k{?2(So92(werrx}{s0h8f!FoQryw?Ie%#H$#xYcFO200002eL?l5 UfgVVOOX;pv|Nk?$9P|O?5e#P;!TX~g=yP2cn2^UCq^7|%9fn<4^ XE7SJqJMNq`iFLcW^YYCS%`Z3r=ocL? delta 68 zcmZpe!PGE=X+j6{#%%qK-MQrgcA~BmlD1pAtlV)w=M-Oz!Dfz%CtM)e$?uya1@1Io XUK(%q$Zt<+zjNy^Er!h!%`Z3r-#{I^ diff --git a/HcDBUtility/bin/Debug/JsonHelper.pdb b/HcDBUtility/bin/Debug/JsonHelper.pdb index 90c5f2dab245ce4950a5b367315fc5676c30ec04..c8f25a0ab82e955a5c4523609247b01ff6fa593c 100644 GIT binary patch delta 52 zcmV-40L%Y?+ysE!1h5D$2JM1BWaF>14leff7?t@`W&r>I0An8<)Rw$2LAjEW1-BlID_ delta 52 zcmV-40L%Y?+ysE!1h5D$28I0NjJqrC&DUPP}!GLxuV( K0Jj_@0ptlY+!YZ3 diff --git a/HcDBUtility/bin/Release/HcDBUtility.dll b/HcDBUtility/bin/Release/HcDBUtility.dll index aaed408593fce19c0a26f660802e0afe8d55a4ae..b8821db9de694c237c7bef0daae43267b59030a8 100644 GIT binary patch delta 68 zcmZqJ!PKyWX+j5c@$-_6-D^7qG?pxXG1W)Rp*i1vR#8<~<7SVpEu0|P$^R!y3hY0& Yb7x%YB*%%5k8Fy2T_v`yUF?w>EopZQ%sTPX0exQefhi Y{hBxUUOP?eWU756xln(z#*`cE05@_UT>t<8 diff --git a/HcDBUtility/bin/Release/HcDBUtility.pdb b/HcDBUtility/bin/Release/HcDBUtility.pdb index 3c94ea9d9de7ce966083263d3448c2e52bf28b7a..d14e4505331797242e41152d408e5c4d41d36f17 100644 GIT binary patch delta 65 zcmV-H0KWf#j0b>>2e1f82z7k|{DZ^V0h0j&8<9{IgFr~PKu7_^XBczmbY=kn006(n Xxw&3tl0lK<#Ij!NdJ?xBumR*1F{>JL delta 65 zcmV-H0KWf#j0b>>2e1f82suN?=oFgT0h0j&8<9{IgFr~PKu7_^XBfLq3@^0)65cp)a=_umR*1`RW() diff --git a/HcDBUtility/bin/Release/JsonHelper.dll b/HcDBUtility/bin/Release/JsonHelper.dll index 73941d46adc075fe9fddd6d80bf7a0051a1acb30..7614a1d16934c144ed8f2a5026f474a94eb96a3f 100644 GIT binary patch delta 68 zcmZo@U}|V!n$W>q{Jdmi_um|Wi$?v|UY!Z??rwY3{d%M3h0QZ^12{pllV6uf3asKh Xq0shsp>M+}SKp?`RmUmM=Z7vw^jlbMuVc08WtXk0 XZS9LcI<9VZnK#c+p>4BB`5O)Z;^rMH diff --git a/HcDBUtility/bin/Release/JsonHelper.pdb b/HcDBUtility/bin/Release/JsonHelper.pdb index 8d8744ecf6df488ed345ed06a42d1a24f916ea2f..cebf19d666fc8cc758c19053ff674fdd2ee26b1d 100644 GIT binary patch delta 51 zcmV-30L=e@j0Av;1h5D$1`uH1`-8)?4lef17<1=zW&r>I0ICVdAcp;+O@PWpO@dKt Jjk6s54lef17`kIGW&r>I0Dn(lhKHl^L92sAo}Muv JhO->})BEL)(5)=rv@G!1sTAK)=$=f!!OEM=0?#0~l1 zrZ?Krp^TtvOj;Gz`= zEt-8A;x9(Y9*7y}I6)Z)kj%4ti-eQ;?RcnFrg>iPq5xBWyZrd!T^zy$G{_X{XU0ID z2m}*fVycx<6B~Ekepo2|CuW1rX!mw=!kW8n%#WsA&xmLAxRpWl4U&z4B|aN!o?1-7 zu#U8#XBrLkG0|KX%vX7?B!Pze0}Z(41bMwb$iB)llo_G^s^FA!lPWDRA^g@;tRBF^ zDoNpElo<41Qh{AjVJze>N*aj5R!6ak84VHG&eDQ3==`hLum6dnD)#HjRe%8B)t$8D z($DJn9J;9vJ)BF6Ij{&ca)Gzpx+sxHvN}%JP}o^w?52xsbAne#_dOTn(4<<1KFYsD z<9fdL%-!Ms=?J#go!@Z~&)s$4rZ+2}%Q23*g{>kK8@*V+TJ=!cA-B`6R{3XF`|G3C zi0ce&sS5#WNUhSv`g|2ahAuKiJ93?9!8Ppk;-Q!{NK6_fnG$2rrn6kXT!nl=+ykdU z>*nLFua^er*A@lZ;-3C(T-t*fKb}UclHXh54ZvU~N3Iq^FiPB%=U8g3VJT0iP*HG? q9!PcLt2<3siKleRhxDmlhO2&3qt#k&P`scgcHBIE|7n{Ip7#$^83LgI literal 7079 zcmeHMdruoj5Vv_;FoYDRX&%s|PMbClxmO$@1f=|t*yhm?V%apQ6kBBPJT{xGZ{6KJ zz(IVLeuAnWv7I^Wv%w^-6rYqoe3r+{KIS(wyLb1SAr_CtV*lVpzjR$3K~a6dT_v@w z8T%F2J`*M5SGlyaveA&`!bH>aZSKu0{IOv&X)i6~8rrf;(Gkbcbex_rpsbmc!L|$E1 zQ0LmHR(C-H9Wy{7oJB>w!RSG`dS>W_^!R&Fx6kj+aorTGMSy1)wh!9e$-;t?E@&;) zQ?#BN^a+n#dkIvFzGrv?+Dp!AI*F3L?rSJQ4HS5&YE8)oDt(8VE~!p$5Eg618nvug zY!u~4JRZ03i!wIy=Xj~54K(n0;{LjZ4xGIX9w_eGTNtdjnKy4fF$M34S4{X&U|hX@ z7)~u2#l3nu)zGd~f;-)N?El|l%gb!ZU3!#RSy+Vm$19cer|kGbO^qTBmBEJf3s)D9 z507XRrzpIeqEP;YpQ!=gK*IwX#TgnN&_TU8D{8pmZdzsOyesFx@#`oxQp+8rKSj_|?1x;p%XMs* zxqFcKicFkAF?-sI4y7k+tR#-l(0D2|Gqq@4#@?}D{A+48G#AztY)w+1y)eI!SxJ0@ zf5#@16gv7^S4r3h+-p>=YuFyMt3p`UgBBb@lA;@!M3jE9&)Z+M^fo{s`7b-%YdhQR z43y2{%6fLSj6|-Ed_EP>`_#R|$B*upL-$kd03!wN*@)1)(_2y|hq}}3Y-x|FW&k#a zV9)!^%#~h)6Id8-vRzON*&&ilJ5O0mQ*jMj+)+%m+No5a@LN>4`Pm9{%&h-0F|3ATYm2~0O14Ulg~>tT2R zzDFDxv4=15XbZ>+4xR~|`vE~K(Sgz<;|@aT=pfq3qg}#0jtTyOQDPVP_9Fs&(E;Ow z!+z>$ESj`)Npkil#AMN7{@xIQYj+W*7A?#c_x>QPF?xdzdEb!t4Ya~B=(H)IEW21) zYUuG@%|F1z?*2)s6G#3Y3*RRFm7if*hl;!(tw2R_?gzd315R?^R3;`8_wcFLxssGW zP}$qMkD@sE=Wdd6lK|iWHpbSlULB`AB}iU+Es0a&($|}$Oopx`Wiw=~l}2&>D0^-J z{n+{$M=u|3aL-W5lxnG)c;_5jHuldR?VMj7ZXH{{;P@aCquw+Y?ai6GX+)Cpjv!nQu@S|71j!KUz7PbTpy(R?Yxp4fum2VeA0%NFzcTeN6tyo7 diff --git a/HcDBUtility/obj/Debug/HcDBUtility.dll b/HcDBUtility/obj/Debug/HcDBUtility.dll index 961c8e1708fbfc08c18ffe63ceb112c0f85a452b..4583af65736e67a1b62e5c9cc067123559f739fd 100644 GIT binary patch delta 68 zcmZp8z|`=7X+j6{)Stl{yFbnp=-He+`%_i8|8!^8d|8j^=bL+G3GjeqC(mCdDG+RI Y*|A|#um8$@4R!*b>yB?evCM)K09kV%=>Px# delta 68 zcmZp8z|`=7X+j6{rfmI<-5+NPup7*fH9IBdwnppHd(IyJ-pxI;1b9HQljkp!6kw`# Y{JOMJ&ZE`)<+{-S|BW}FSZ2Wq0QFNICjbBd diff --git a/HcDBUtility/obj/Debug/HcDBUtility.pdb b/HcDBUtility/obj/Debug/HcDBUtility.pdb index 29cfc5773c28265a9293f328f9ab33bccb559bd6..5452b783c175900795c041891766c8f43d7558b0 100644 GIT binary patch delta 62 zcmV-E0Kxx&j0k{?2(So92vuNYWaF>e0h8f!FoQryw?Ie%#H$#U`BP>A0000}GdYN` Ul8sNPzJNXu^M1#-9P|O?5fHo?+5i9m delta 62 zcmV-E0Kxx&j0k{?2(So92(werrx}{s0h8f!FoQryw?Ie%#H$#xYcFO200002eL?l5 UfgVVOOX;pv|Nk?$9P|O?5e#P;!T`yUF?w>EopZQ%sTPX0exQefhi Y{hBxUUOP?eWU756xln(z#*`cE05@_UT>t<8 diff --git a/HcDBUtility/obj/Release/HcDBUtility.pdb b/HcDBUtility/obj/Release/HcDBUtility.pdb index 3c94ea9d9de7ce966083263d3448c2e52bf28b7a..d14e4505331797242e41152d408e5c4d41d36f17 100644 GIT binary patch delta 65 zcmV-H0KWf#j0b>>2e1f82z7k|{DZ^V0h0j&8<9{IgFr~PKu7_^XBczmbY=kn006(n Xxw&3tl0lK<#Ij!NdJ?xBumR*1F{>JL delta 65 zcmV-H0KWf#j0b>>2e1f82suN?=oFgT0h0j&8<9{IgFr~PKu7_^XBfLq3@^0)65cp)a=_umR*1`RW() diff --git a/JsonHelper/bin/Debug/JsonHelper.dll b/JsonHelper/bin/Debug/JsonHelper.dll index 2493edeacf940c85016106198d807072bdf77d01..a4a4f8592d5026b6a41812a2d9b002ad4b04f4e9 100644 GIT binary patch delta 68 zcmZpe!PGE=X+j6{)Stl{yK~D0G@3c{OR8TvZq*64>X~g=yP2cn2^UCq^7|%9fn<4^ XE7SJqJMNq`iFLcW^YYCS%`Z3r=ocL? delta 68 zcmZpe!PGE=X+j6{#%%qK-MQrgcA~BmlD1pAtlV)w=M-Oz!Dfz%CtM)e$?uya1@1Io XUK(%q$Zt<+zjNy^Er!h!%`Z3r-#{I^ diff --git a/JsonHelper/bin/Debug/JsonHelper.pdb b/JsonHelper/bin/Debug/JsonHelper.pdb index 90c5f2dab245ce4950a5b367315fc5676c30ec04..c8f25a0ab82e955a5c4523609247b01ff6fa593c 100644 GIT binary patch delta 52 zcmV-40L%Y?+ysE!1h5D$2JM1BWaF>14leff7?t@`W&r>I0An8<)Rw$2LAjEW1-BlID_ delta 52 zcmV-40L%Y?+ysE!1h5D$28I0NjJqrC&DUPP}!GLxuV( K0Jj_@0ptlY+!YZ3 diff --git a/JsonHelper/bin/Release/JsonHelper.dll b/JsonHelper/bin/Release/JsonHelper.dll index 73941d46adc075fe9fddd6d80bf7a0051a1acb30..7614a1d16934c144ed8f2a5026f474a94eb96a3f 100644 GIT binary patch delta 68 zcmZo@U}|V!n$W>q{Jdmi_um|Wi$?v|UY!Z??rwY3{d%M3h0QZ^12{pllV6uf3asKh Xq0shsp>M+}SKp?`RmUmM=Z7vw^jlbMuVc08WtXk0 XZS9LcI<9VZnK#c+p>4BB`5O)Z;^rMH diff --git a/JsonHelper/bin/Release/JsonHelper.pdb b/JsonHelper/bin/Release/JsonHelper.pdb index 8d8744ecf6df488ed345ed06a42d1a24f916ea2f..cebf19d666fc8cc758c19053ff674fdd2ee26b1d 100644 GIT binary patch delta 51 zcmV-30L=e@j0Av;1h5D$1`uH1`-8)?4lef17<1=zW&r>I0ICVdAcp;+O@PWpO@dKt Jjk6s54lef17`kIGW&r>I0Dn(lhKHl^L92sAo}Muv JhO->}X~g=yP2cn2^UCq^7|%9fn<4^ XE7SJqJMNq`iFLcW^YYCS%`Z3r=ocL? delta 68 zcmZpe!PGE=X+j6{#%%qK-MQrgcA~BmlD1pAtlV)w=M-Oz!Dfz%CtM)e$?uya1@1Io XUK(%q$Zt<+zjNy^Er!h!%`Z3r-#{I^ diff --git a/JsonHelper/obj/Debug/JsonHelper.pdb b/JsonHelper/obj/Debug/JsonHelper.pdb index 90c5f2dab245ce4950a5b367315fc5676c30ec04..c8f25a0ab82e955a5c4523609247b01ff6fa593c 100644 GIT binary patch delta 52 zcmV-40L%Y?+ysE!1h5D$2JM1BWaF>14leff7?t@`W&r>I0An8<)Rw$2LAjEW1-BlID_ delta 52 zcmV-40L%Y?+ysE!1h5D$28I0NjJqrC&DUPP}!GLxuV( K0Jj_@0ptlY+!YZ3 diff --git a/JsonHelper/obj/Release/JsonHelper.dll b/JsonHelper/obj/Release/JsonHelper.dll index 73941d46adc075fe9fddd6d80bf7a0051a1acb30..7614a1d16934c144ed8f2a5026f474a94eb96a3f 100644 GIT binary patch delta 68 zcmZo@U}|V!n$W>q{Jdmi_um|Wi$?v|UY!Z??rwY3{d%M3h0QZ^12{pllV6uf3asKh Xq0shsp>M+}SKp?`RmUmM=Z7vw^jlbMuVc08WtXk0 XZS9LcI<9VZnK#c+p>4BB`5O)Z;^rMH diff --git a/JsonHelper/obj/Release/JsonHelper.pdb b/JsonHelper/obj/Release/JsonHelper.pdb index 8d8744ecf6df488ed345ed06a42d1a24f916ea2f..cebf19d666fc8cc758c19053ff674fdd2ee26b1d 100644 GIT binary patch delta 51 zcmV-30L=e@j0Av;1h5D$1`uH1`-8)?4lef17<1=zW&r>I0ICVdAcp;+O@PWpO@dKt Jjk6s54lef17`kIGW&r>I0Dn(lhKHl^L92sAo}Muv JhO->};c7gLAo67qo_}yCPU3B}c8uM&33x^3KNOrO{r=&pHzUHFe VcelAsslS6{AP7*c1i!`%_*F7H~?CE8f^do diff --git a/OfficeHelper/bin/Debug/OfficeHelper.pdb b/OfficeHelper/bin/Debug/OfficeHelper.pdb index 385fe6327f046f4c2db6f2babd64970a49ea3295..35b7a64dc33b0668df7934e8d42858a6d1c6485a 100644 GIT binary patch delta 51 zcmV-30L=e@i~)d*0k8-p1~>3MWaF>14kY#y7?t@`W&r>I0Cv8Ea{Jx3Mv{6tG`hDm J|Fax8rx}{F4kY#y7_nI01Yy#-f|kpOriEV#+!7H J)3Y2nW)sdc8~}V38lV6G delta 66 zcmZorX;7Ka!MrP3e`B{TyTGj8h9yyw-+UKo-C35SW}LA32DI0GX%6q4kY#y7`kIGW&r>I0IZ_jRjTx^L6VJp>K-Hy JL$e$>fCNoSA`vflaSGGcPxVMK2{Mhea>7B9(!Cavx7JW71?tz9>%T{GwElObLiL zc_*(FM4ZDVu_O^BKG}gUjxiA|`HzpCF%85LjL6N=^U2IB1StU8z`!_JKrBpx5y)b3 zD}@Mwgdu=!vWBRPuu!!}W?o4^Vo8QuQGTvxNosEGF$&I4U8obp(iREsYIjMe$ zxv8~=E>8mP$1SZd qpy%frqTp5pG`c*$C|kjVrOZUnfF-v$GlvVr(la(NHnfB}mH_}F^HWU# literal 6318 zcmeHLZBH9V5VpZwFoYD-ln`i=OO>`HvQD@_c#-&!VDq9TgxVIZ#93s0H)l57i@UoA zxQO4{4#-Far`X7`@mR63PP{ey*`RPGO;u-|h_1Tt`x zvBzb|+=>cq9vJI^=LPMKu8|=YlQ`4j{frcdg!W9z?u)C63or(yJ6ks*3ZzY z21nqp)#v7&MQ6z=6zs)0HqV9#a`_8LZ$s|dgtzT05JB@-!J17FMwy9izZoj|7zaOQ zt{a?y{YFag>Tauas=z0&qAq?I#H=(-z%d2kYlqi$1` z)v@j2XKfpSYvX*MlCsJ~15`Y$64oWC9W)|e@P;16~$;%1P(@sW;G$8 z!KD(divd}jm;wsnG#a`bj7un!SDM}jK0gBS{AP8L%cjd(1bB5|C(&lw19wGWfs}!G zgWhw6bHbGC3<0|w`igtd8FJN9J4$jYlu!l-1o&ubLj)cg{e+eth^{sYi#DJQYFa8a zh;ksEPHXr>nHuy|p4eK2@mrnOn zG>I&VS5p$k?|4r2cmeejG>IJQCupxeoV7IZ;OroZk!*&lLnM$6q_X!=;A5CXmc$5& zQ4}NEeUvF}48_~Ca)&vsR**=aFac&vc1>faRE;@g{usaT`7QzNkj>KRx%L3<{8Cyq ziywA2D_fdytJ#3(q$SteLf65>O_c$iI7i7nsBS<{~keKiZh;U{QM@m_cR{M$d=(pA?N&*4ereXn1BkE#BCZFo4V&r!({rz2;z7bvFA)^EH< zJlDR*)`_z%?kl=Dq8p`cTsi0352&9$tKNJ^);iaI#P(j$#96d6c2;I5M40Ff?Oc0_ ys@dC_W1agQ=9nWw7{%)qR+4xj5hX<1_jD8y6g>z3>hC1~b!pz;N#e`Q+UUOk$tH*Z diff --git a/OfficeHelper/obj/Debug/OfficeHelper.dll b/OfficeHelper/obj/Debug/OfficeHelper.dll index 6bc5772be22531c0f1d0ab87d530ac5e5bac998c..5b8f8f7e1cb0f9a783994c3ef8b362ba534e802b 100644 GIT binary patch delta 66 zcmZorX;7Ka!94Y6@W$>;c7gLAo67qo_}yCPU3B}c8uM&33x^3KNOrO{r=&pHzUHFe VcelAsslS6{AP7*c1i!`%_*F7H~?CE8f^do diff --git a/OfficeHelper/obj/Debug/OfficeHelper.pdb b/OfficeHelper/obj/Debug/OfficeHelper.pdb index 385fe6327f046f4c2db6f2babd64970a49ea3295..35b7a64dc33b0668df7934e8d42858a6d1c6485a 100644 GIT binary patch delta 51 zcmV-30L=e@i~)d*0k8-p1~>3MWaF>14kY#y7?t@`W&r>I0Cv8Ea{Jx3Mv{6tG`hDm J|Fax8rx}{F4kY#y7_nI01Yy#-f|kpOriEV#+!7H J)3Y2nW)sdc8~}V38lV6G delta 66 zcmZorX;7Ka!MrP3e`B{TyTGj8h9yyw-+UKo-C35SW}LA32DI0GX%6q4kY#y7`kIGW&r>I0IZ_jRjTx^L6VJp>K-Hy JL$e$>heLBZGk7bS-lWLr~CT~{QYr_YUog9B!Qs70< Yv>nY4_e0h2L8FoQriw?H@n#Az6n`BP>A0002!QkJ-b U;15l-4XL$?emD8I9HIf_3pZ05RsaA1 delta 62 zcmV-E0Kxx&+y;Q$2CxV?2zd{;rx}{s0h2L8FoQriw?H@n#Az6@YcFO20002WP!07; UtGZ2-4`F;TAG7Ya9HIf_3)$BfbpQYW diff --git a/WebSqlHelper/bin/Release/WebSqlHelper.dll b/WebSqlHelper/bin/Release/WebSqlHelper.dll index 06e18a75a07e9e3fcfdea90f6c71a57f4438947c..b67744470e0cf787e3fa0b44ca2c19976b775e20 100644 GIT binary patch delta 68 zcmZqZU~cGOp3uQu{Jdmi_uX{@B@FX?{uQu0_o$yTF5IIlvAJUX6dsW5Wd1#p0;)-S XM0yKNotE0%iEP}icYCwNo)hct(-^~^4r|^JeC-d)-6j&pX Y;XL=#cb5*O1+y7yygW8r>^Z>>0O^GtH2?qr diff --git a/WebSqlHelper/bin/Release/WebSqlHelper.pdb b/WebSqlHelper/bin/Release/WebSqlHelper.pdb index f6959fd2fa0e591d981200465105bf9f0e3db56f..ca66993c725ccbc46945c8441aef1401e2fd13c7 100644 GIT binary patch delta 65 zcmV-H0KWf#`~`sg1+WM>2y+qX`-8*U0h0j&7LiaIgFra9KsW)!H5hZ}bY=kn001Ro XycCUbHA1C4+*yIQF59;pZUN*EMamfT delta 65 zcmV-H0KWf#`~`sg1+WM>2#cwH=oFgT0h0j&7LiaIgFra9KsW)!H5j{NFJ=J%0068Q XXhWUy_e6*ypql`EN=UaHZUN*EFc26P diff --git a/WebSqlHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSqlHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index dc52de10bddc43cc060c99758687b2ea58dd97b3..b2db0ff18f1dd256e7dece7c6f65deb8a57f37ce 100644 GIT binary patch delta 491 zcmX?X(#U5j&dk8Tz@}H8nU|ZwqL-4B!=jg3k;=dW6b*5)igEGxa}V}#^>a6maWMzc z&LCp)XC6Zp=ltB<{5+7BAbbifr9$yZ8>;%`r>AG;rGpIe#I14)uK{EH7ssM;eluOuL`B*U#JKi9J)HMdr(I%Ki~ zlNeKF?c^wKXD8n3pu}>w%$!ue#N5!^JNX~Cw7!6zpKFMMTM^L4^8BJ~1rwGs6Fmc#+~Uj}E)Yx4 L*udD(67ClOP;-ko literal 6723 zcmeHMZByGu5VpZ67($9^N(eNG)23~bx+*RZUS^nSf(>{=2(>+=Gsr_u(%M{*CHL+G zxD3Cgzo65f*zU@6OnNoAec21;T5*6Rgnyp%O0P=V0Ae3#D1r# z%uH;%d#-KOb8MXNL#iw@Q3DkYEBU4bwTU3|39q@HfE-jAx}xAph4!6V*8+ZieWw;& ztLr^}HN=BU^=C(=9h|3B7tG9Y0haOv2RYiX6%!?3!rI$nYEO>VE>sLRgjYom(X7S< z)VNflc{(786H`DgoJ63r&N!oG{6fnITspTa(;Y%n&6$H2lwJN+if_^}xJEBt?xJB#J`ZX;U z>qprakHG1xOo3l z*tMhtcWaq+U0R-SxOuwAX8-dRo1bTM*4&Hi;>;{eFDzCv*V%DHO^w12mF~LrhQr0< zy%3Eeio)F#1^5k*sV;AzUVugsL%jg)){CbTfuPD>>u(uYid5t3a)-^`ao4w*T?H+-f;K-*+9e{`bVL7ZRm zOGfVP=2~ezzqvMViYwqus^Q5Y_23(=*w{OOr-FyviG z-}F4)4;q3?*x;sMqS?Nr1Ue=Wu<*%%Ii^?uH-&H;pA5I*)oMue0>m#7@#p`E_|_z{ z8eEX@LPV~7fGE2wO9t}T8eV78!R;pf^l0J5Gb3F5bUVKA25{;~BV60_5oyqJ8XYDY zD0zrV_9IXd5@our`GOIh4ir8@g=Ulr1q6E1(dr4K=P~N3L^mG_gs)HqM5iJr81CX$ zi4&*3RGT7_O;3u5HW{luLoso@a%FD!M0<{{W5?^heLBZGk7bS-lWLr~CT~{QYr_YUog9B!Qs70< Yv>nY4_e0h2L8FoQriw?H@n#Az6n`BP>A0002!QkJ-b U;15l-4XL$?emD8I9HIf_3pZ05RsaA1 delta 62 zcmV-E0Kxx&+y;Q$2CxV?2zd{;rx}{s0h2L8FoQriw?H@n#Az6@YcFO20002WP!07; UtGZ2-4`F;TAG7Ya9HIf_3)$BfbpQYW diff --git a/WebSqlHelper/obj/Release/WebSqlHelper.dll b/WebSqlHelper/obj/Release/WebSqlHelper.dll index 06e18a75a07e9e3fcfdea90f6c71a57f4438947c..b67744470e0cf787e3fa0b44ca2c19976b775e20 100644 GIT binary patch delta 68 zcmZqZU~cGOp3uQu{Jdmi_uX{@B@FX?{uQu0_o$yTF5IIlvAJUX6dsW5Wd1#p0;)-S XM0yKNotE0%iEP}icYCwNo)hct(-^~^4r|^JeC-d)-6j&pX Y;XL=#cb5*O1+y7yygW8r>^Z>>0O^GtH2?qr diff --git a/WebSqlHelper/obj/Release/WebSqlHelper.pdb b/WebSqlHelper/obj/Release/WebSqlHelper.pdb index f6959fd2fa0e591d981200465105bf9f0e3db56f..ca66993c725ccbc46945c8441aef1401e2fd13c7 100644 GIT binary patch delta 65 zcmV-H0KWf#`~`sg1+WM>2y+qX`-8*U0h0j&7LiaIgFra9KsW)!H5hZ}bY=kn001Ro XycCUbHA1C4+*yIQF59;pZUN*EMamfT delta 65 zcmV-H0KWf#`~`sg1+WM>2#cwH=oFgT0h0j&7LiaIgFra9KsW)!H5j{NFJ=J%0068Q XXhWUy_e6*ypql`EN=UaHZUN*EFc26P