diff --git a/DSWeb/Areas/MvcShipping/DAL/MsCwAccitemsFt/MsCwAccitemsFtDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsCwAccitemsFt/MsCwAccitemsFtDAL.cs index 00d88369..2d6f2a73 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsCwAccitemsFt/MsCwAccitemsFtDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsCwAccitemsFt/MsCwAccitemsFtDAL.cs @@ -359,10 +359,18 @@ namespace DSWeb.MvcShipping.DAL.MsCwAccitemsFt FT.TTLEMP = GetUserNum(userstr); FT.FTAMOUNT = FT.TTLEMP * USERAMOUNT; TTLUSERAMOUNT = TTLUSERAMOUNT + FT.FTAMOUNT; + + + } + if (TTLUSERAMOUNT != Convert.ToDecimal(FTAMOUNT)) + { + FtList[FtList.Count - 1].FTAMOUNT = FtList[FtList.Count - 1].FTAMOUNT + (Convert.ToDecimal(FTAMOUNT)- TTLUSERAMOUNT); } } + + if (FtList != null && FtList.Count != 0) { var AccidList = BasicDataRefDAL.GetCwAccitemsGlAll("", userid); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 51cf07e3..086502d2 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -11048,9 +11048,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { return; } - if (this.isfen && this.opStatus == 'add') { + if (_this.isfen && _this.opStatus == 'add') { var condition = "BSNO='" + _this.MainEditRecord.get('BSNO') + "'"; - } else if (this.opStatus == 'add') { + } else if (_this.opStatus == 'add' ||_this.opStatus == 'copyadd') { var condition = "BSNO='xxxxxx'"; } else { @@ -13215,31 +13215,34 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { params: { condition: "BSNO='" + bsno + "'" }, callback: function (r, options, success) { if (success) { - if (_this.storeBodyList.getCount() > 0) { - for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { - var memberbody = _this.storeBodyList.getAt(j); - memberbody.set("CTN_ID", NewGuid()); - memberbody.set("BSNO", "*"); - memberbody.set("CNTRNO", ""); - memberbody.set("SEALNO", ""); - memberbody.set("PKGS", 0); - memberbody.set("KGS", 0); - memberbody.set("CBM",0); - memberbody.commit(); + if (_this.opStatus == 'copyadd') { + if (_this.storeBodyList.getCount() > 0) { + for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { + var memberbody = _this.storeBodyList.getAt(j); + memberbody.set("CTN_ID", NewGuid()); + memberbody.set("BSNO", "*"); + memberbody.set("CNTRNO", ""); + memberbody.set("SEALNO", ""); + memberbody.set("PKGS", 0); + memberbody.set("KGS", 0); + memberbody.set("CBM", 0); + memberbody.commit(); + } + } else { + _this.storeBodyList.removeAll(); } - } else { - _this.storeBodyList.removeAll(); + _this.opStatus = 'add'; + _this.copybill = false; + _this.copyfee = false; } - _this.opStatus = 'add'; - _this.copybill = false; - _this.copyfee = false; + //_this.opStatus = 'add'; + //_this.copybill = false; + //_this.copyfee = false; } }, scope: this }); - _this.opStatus = 'add'; - _this.copybill = false; - _this.copyfee = false; + } else { //_this.storeBodyList.removeAll(); _this.opStatus = 'add'; @@ -13804,7 +13807,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { url: '/MvcShipping/MsOpSeae/SaveAll', scope: this, params: { - opstatus: this.opStatus, + opstatus: _thisseaeedit.opStatus, data: Ext.JSON.encode(data), data2: data2js, data3: Ext.JSON.encode(data3), @@ -13836,11 +13839,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { // if (this.opStatus == 'add') { + this.opStatus = 'edit'; var arrNewRecords = this.StoreList.insert(0, returnData); this.editRecord = this.StoreList.getAt(0); if (type == '0') { this.opStatus = 'edit'; basicForm2.findField('BSNO').setDisabled(true); + //this.storeBodyList.reload(); for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { var memberbody = this.storeBodyList.getAt(j); memberbody.set("BSNO", this.editRecord.get('BSNO')); @@ -13855,6 +13860,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (type == '0') { this.opStatus = 'edit'; basicForm2.findField('BSNO').setDisabled(true); + //this.storeBodyList.reload(); + for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { var memberbody = this.storeBodyList.getAt(j); memberbody.set("BSNO", this.editRecord.get('BSNO')); @@ -13879,6 +13886,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (type == '0') { this.opStatus = 'edit'; basicForm2.findField('BSNO').setDisabled(true); + //this.storeBodyList.reload(); + for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { var memberbody = this.storeBodyList.getAt(j); memberbody.set("BSNO", this.editRecord.get('BSNO')); @@ -15744,7 +15753,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { if (success) { var jsonresult = Ext.JSON.decode(response.responseText); if (jsonresult.Success) { - this.storeBodyList.reload(); + var condition = "BSNO='" + this.editRecord.get('BSNO') + "'"; + this.storeBodyList.load({ params: { condition: condition } }); this.setAllTotal(); var KGS = this.formEdit.getForm().findField('KGS').getValue(); this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index f36d818e..44aa9128 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -2246,6 +2246,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; } + if (selections.length != 1) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '复制新建不允许选择多票业务！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } var record = selections[0]; this.SelectedRecord = record; this.OprationStatus = 'copyadd'; @@ -2261,6 +2265,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; } + if (selections.length != 1) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '复制新建不允许选择多票业务！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } var record = selections[0]; this.SelectedRecord = record; this.OprationStatus = 'copyaddbill'; @@ -2276,6 +2284,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); return; } + if (selections.length != 1) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '复制新建不允许选择多票业务！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } var record = selections[0]; this.SelectedRecord = record; this.OprationStatus = 'copyaddfee';