diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index f3ffb615..749c4a89 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs @@ -25407,7 +25407,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement sortint = sortint + 1; } - CwVouitemsEntities = tmpCwVouitemsEntities.OrderByDescending(x => x.TMPGID).ThenBy(p => p.ITEMNO).ToList(); + CwVouitemsEntities = tmpCwVouitemsEntities.OrderBy(x => x.TMPGID).ThenBy(p => p.ITEMNO).ToList(); } else { foreach (var vouitem in CwVouitemsEntities) @@ -25678,7 +25678,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement result = modb.Save(MsCwVouchersGl); if (result.Success == true) { - var NewCwVouitemsEntities=CwVouitemsEntities.OrderByDescending(x=>x.TMPBILLNO).ThenBy(x=>x.ITEMNO); + var NewCwVouitemsEntities=CwVouitemsEntities.OrderBy(x=>x.TMPBILLNO).ThenBy(x=>x.ITEMNO); int n = 1; foreach (var enumValue in NewCwVouitemsEntities) diff --git a/DSWeb/Areas/MvcShipping/Views/Ocr/SelectRegionAir.aspx b/DSWeb/Areas/MvcShipping/Views/Ocr/SelectRegionAir.aspx index 4d2fe5db..6978e7c9 100644 --- a/DSWeb/Areas/MvcShipping/Views/Ocr/SelectRegionAir.aspx +++ b/DSWeb/Areas/MvcShipping/Views/Ocr/SelectRegionAir.aspx @@ -218,6 +218,7 @@ || name == "ENTERPID" || name == "OPERATORFAX" || name == "KGS" + || name == "PKGS" || name == "CBM" || name == "VOYNO"|| name == "ETD"|| name == "YARD") { tag = "input"; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js index 3cb7eea3..c4b963e9 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js @@ -2653,14 +2653,14 @@ Ext.extend(Shipping.MsOpPriceEdit, Ext.Panel, { Print: function () { var basicForm = this.formHead.getForm(); - var billNo = basicForm.findField('BSNO').value; + var billNo = basicForm.findField('GID').value; if (billNo == '*' || billNo == '') { Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); return; } - var printType = 'MSOPOHTER'; - var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_other WHERE BSNO = '" + billNo + "'"; + var printType = 'MSOPPRICE'; + var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_price WHERE GID = '" + billNo + "'"; var sql2 = ""; var sql3 = ""; var sql4 = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js index 67eb7bb4..8a128e2d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js @@ -2759,14 +2759,14 @@ Ext.extend(Shipping.MsOpPriceSellEdit, Ext.Panel, { Print: function () { var basicForm = this.formHead.getForm(); - var billNo = basicForm.findField('BSNO').value; + var billNo = basicForm.findField('GID').value; if (billNo == '*' || billNo == '') { Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); return; } - var printType = 'MSOPOHTER'; - var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_other WHERE BSNO = '" + billNo + "'"; + var printType = 'MSOPPRICE'; + var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_price WHERE GID = '" + billNo + "'"; var sql2 = ""; var sql3 = ""; var sql4 = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/SeaeFee.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/SeaeFee.js index e9e52f3d..5a142068 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/SeaeFee.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/SeaeFee.js @@ -78,6 +78,7 @@ Ext.extend(Shipping.SeaeFee, Ext.Panel, { }, { fieldLabel: Zi.LAN.CNTRTOTAL3, //'箱型箱量', + flex: 0.5, readOnly: true, name: 'CNTRTOTAL' }, @@ -108,6 +109,13 @@ Ext.extend(Shipping.SeaeFee, Ext.Panel, { labelWidth: 45, readOnly: true, name: 'INVNO' + }, + { + fieldLabel: Zi.LAN.KGSCBM, //'毛重', + flex: 0.5, + labelWidth: 45, + readOnly: true, + name: 'INVNO' } ] }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index 04516b39..553878bf 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -956,4 +956,4 @@ Zi.LAN.PKGTYPE = "包件种类"; Zi.LAN.FACTORY = "生产企业"; Zi.LAN.GXWTHM = "更新委托货描"; Zi.LAN.DGTRUCKER = "危险品车队"; - +Zi.LAN.KGSCBM = "重抛比"; diff --git a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs index 2363e243..2495183f 100644 --- a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs +++ b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs @@ -857,6 +857,9 @@ namespace DSWeb.Areas.TruckMng.Controllers DBResult result = new DBResult(); foreach (var ctn in bodyctnData) { + var fen = Fenlist.Find(x => x.ContainerNo == ctn.CNTRNO); + if (fen == null) + { if (headData.BsType == "装箱") { @@ -885,34 +888,35 @@ namespace DSWeb.Areas.TruckMng.Controllers } - headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request); - - headData.DbOperationType = DbOperationType.DbotIns; - headData.TRANSSTATUS = "新建"; - headData.gId = "PC" + Guid.NewGuid().ToString("N").ToUpper(); - headData.PGid = PGID; - headData.SealNo = ctn.SEALNO; - headData.ContainerNo = ctn.CNTRNO; - headData.ContainerType = ctn.CTNALL; - headData.ContainerQty = "1"; - headData.BLTYPE = "派车分票"; - headData.ACCDATE = DateTime.Now.ToString("yyyy-MM"); - headData.LrDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - //if (!string.IsNullOrEmpty(headData.LrDate)) - //{ - // headData.LrDate = headData.LrDate.Substring(0, 10); - //} - //else - //{ - // var currentTime = System.DateTime.Now; - // headData.LrDate = currentTime.ToString("d"); - //} - - var BSNO = headData.gId; - - var modb = new ModelObjectDB(); - result = modb.Save(headData); + headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request); + + headData.DbOperationType = DbOperationType.DbotIns; + headData.TRANSSTATUS = "新建"; + headData.gId = "PC" + Guid.NewGuid().ToString("N").ToUpper(); + headData.PGid = PGID; + headData.SealNo = ctn.SEALNO; + headData.ContainerNo = ctn.CNTRNO; + headData.ContainerType = ctn.CTNALL; + headData.ContainerQty = "1"; + headData.BLTYPE = "派车分票"; + headData.ACCDATE = DateTime.Now.ToString("yyyy-MM"); + headData.LrDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + + //if (!string.IsNullOrEmpty(headData.LrDate)) + //{ + // headData.LrDate = headData.LrDate.Substring(0, 10); + //} + //else + //{ + // var currentTime = System.DateTime.Now; + // headData.LrDate = currentTime.ToString("d"); + //} + + var BSNO = headData.gId; + + var modb = new ModelObjectDB(); + result = modb.Save(headData); + } } diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js index 1c21a601..f8a0a152 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js @@ -1839,6 +1839,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { var PGid = this.formEdit.getForm().findField('PGid'); PGid.setValue(this.selectPGID); if (this.editRecord != NaN && this.editRecord != null) { + this.formEdit.getForm().findField('CUSTNO').setValue(this.editRecord.get('CUSTNO')); + this.formEdit.getForm().findField('TruckSpec').setValue(this.editRecord.get('TruckSpec')); + this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName')); this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName')); this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName')); @@ -2479,12 +2482,14 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' return; } - var ContainerNo = _thisPc.formEdit.getForm().findField('ContainerNo').getValue(); - if (ContainerNo != '') { - Ext.Msg.show({ title: '警告', msg: '已存在箱号,不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' - return; + var cntrnostr = ''; - } + var cntrnostr = _thisPc.formEdit.getForm().findField('ContainerNo').getValue(); + //if (ContainerNo != '') { + // Ext.Msg.show({ title: '警告', msg: '已存在箱号,不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' + // return; + + //} @@ -2516,12 +2521,12 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { var sVESSEL = ""; var sVOYNO = ""; var bodydatas = []; - var cntrnostr = ''; var sealnostr = ''; var pkgsstr = ''; var tixiangshijian = ''; var fanchangshijian = ''; var ctnnum = 0; + var createfen = 0; for (var j = 0; j < storeyardctn.getCount(); j += 1) { var member = storeyardctn.getAt(j); var WEIGHDATE = member.data.WEIGHDATE; @@ -2533,6 +2538,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d'); member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN; if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0'; + if (cntrnostr!=''&&cntrnostr.indexOf(member.data.CNTRNO)>0) + bodydatas.push(member); + cntrnostr = cntrnostr + ' ' + member.data.CNTRNO; sealnostr = sealnostr + ' ' + member.data.SEALNO; pkgsstr = pkgsstr + ' ' + member.data.PKGS + '/' + member.data.KGS + '/' + member.data.CBM; @@ -2543,7 +2551,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { if (fanchangshijian != '') fanchangshijian = Ext.util.Format.date(fanchangshijian, 'Y-m-d'); ctnnum = ctnnum + 1; - bodydatas.push(member); + }; var field = _thisPc.formEdit.getForm().findField('ContainerNo'); field.setValue(cntrnostr); @@ -2563,7 +2571,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { if (field.getValue == "") field.setValue(fanchangshijian); - if (ctnnum != 1) { + if ((ctnnum != 1) && (bodydatas.length != 0)) { var jsonBody = ConvertRecordsToJsonAll(bodydatas); Ext.Msg.wait('正在保存数据, 请稍侯..'); diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js index 5b53053a..a47a59b7 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js @@ -2418,6 +2418,8 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { var PGid = this.formEdit.getForm().findField('PGid'); PGid.setValue(this.selectPGID); if (this.editRecord != NaN && this.editRecord != null) { + this.formEdit.getForm().findField('CUSTNO').setValue(this.editRecord.get('CUSTNO')); + this.formEdit.getForm().findField('TruckSpec').setValue(this.editRecord.get('TruckSpec')); this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName')); this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName')); this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName')); @@ -3448,18 +3450,18 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, { Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' return; } - if (this.storeBodyList.getCount() != 0) { - Ext.Msg.show({ title: '警告', msg: '已存在集装箱信息不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!' - return; - //Ext.MessageBox.confirm('提示', '已存在集装箱信息确认要引入吗？', - // function (btn) { - // if (btn != 'yes') { - // return; + //if (this.storeBodyList.getCount() != 0) { + // Ext.Msg.show({ title: '警告', msg: '已存在集装箱信息不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!' + // return; + // //Ext.MessageBox.confirm('提示', '已存在集装箱信息确认要引入吗？', + // // function (btn) { + // // if (btn != 'yes') { + // // return; - // } - // }); + // // } + // // }); - } + //} var BSNO = this.formEdit.getForm().findField('gId').getValue(); diff --git a/JobAutoCreateFee/JobBankData.cs b/JobAutoCreateFee/JobBankData.cs index 86923fcc..57b2b1a3 100644 --- a/JobAutoCreateFee/JobBankData.cs +++ b/JobAutoCreateFee/JobBankData.cs @@ -38,7 +38,7 @@ namespace JobCreateFee var JsonGetBankData = new GetBankData(); JsonGetBankData.AccountName = companyName; JsonGetBankData.AccountKey = CustId; - JsonGetBankData.BeginDate = DateTime.Now.AddDays(-1).ToString("yyyyMMdd"); + JsonGetBankData.BeginDate = DateTime.Now.AddDays(-2).ToString("yyyyMMdd"); JsonGetBankData.EndDate = DateTime.Now.ToString("yyyyMMdd"); var PCNO = DateTime.Now.ToString("yyyyMMddhhmmss");