dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent f7dd0f0fbd c8692e5aef
commit 9dd8d82688
3 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File

8
DSWeb/Areas/MvcShipping/DAL/MsCwAccitemsFt/MsCwAccitemsFtDAL.cs
Unescape Escape View File

@ -359,10 +359,18 @@ namespace DSWeb.MvcShipping.DAL.MsCwAccitemsFt
FT.TTLEMP = GetUserNum(userstr); FT.TTLEMP = GetUserNum(userstr);
FT.FTAMOUNT = FT.TTLEMP * USERAMOUNT; FT.FTAMOUNT = FT.TTLEMP * USERAMOUNT;
TTLUSERAMOUNT = TTLUSERAMOUNT + FT.FTAMOUNT; 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) if (FtList != null && FtList.Count != 0)
{ {
var AccidList = BasicDataRefDAL.GetCwAccitemsGlAll("", userid); var AccidList = BasicDataRefDAL.GetCwAccitemsGlAll("", userid);

56
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -11048,9 +11048,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
return; return;
} }
if (this.isfen && this.opStatus == 'add') { if (_this.isfen && _this.opStatus == 'add') {
var condition = "BSNO='" + _this.MainEditRecord.get('BSNO') + "'"; var condition = "BSNO='" + _this.MainEditRecord.get('BSNO') + "'";
} else if (this.opStatus == 'add') { } else if (_this.opStatus == 'add' ||_this.opStatus == 'copyadd') {
var condition = "BSNO='xxxxxx'"; var condition = "BSNO='xxxxxx'";
} else { } else {
@ -13215,31 +13215,34 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
params: { condition: "BSNO='" + bsno + "'" }, params: { condition: "BSNO='" + bsno + "'" },
callback: function (r, options, success) { callback: function (r, options, success) {
if (success) { if (success) {
if (_this.storeBodyList.getCount() > 0) { if (_this.opStatus == 'copyadd') {
for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) { if (_this.storeBodyList.getCount() > 0) {
var memberbody = _this.storeBodyList.getAt(j); for (var j = 0; j < _this.storeBodyList.getCount(); j += 1) {
memberbody.set("CTN_ID", NewGuid()); var memberbody = _this.storeBodyList.getAt(j);
memberbody.set("BSNO", "*"); memberbody.set("CTN_ID", NewGuid());
memberbody.set("CNTRNO", ""); memberbody.set("BSNO", "*");
memberbody.set("SEALNO", ""); memberbody.set("CNTRNO", "");
memberbody.set("PKGS", 0); memberbody.set("SEALNO", "");
memberbody.set("KGS", 0); memberbody.set("PKGS", 0);
memberbody.set("CBM",0); memberbody.set("KGS", 0);
memberbody.commit(); memberbody.set("CBM", 0);
memberbody.commit();
}
} else {
_this.storeBodyList.removeAll();
} }
} else { _this.opStatus = 'add';
_this.storeBodyList.removeAll(); _this.copybill = false;
_this.copyfee = false;
} }
_this.opStatus = 'add'; //_this.opStatus = 'add';
_this.copybill = false; //_this.copybill = false;
_this.copyfee = false; //_this.copyfee = false;
} }
}, },
scope: this scope: this
}); });
_this.opStatus = 'add';
_this.copybill = false;
_this.copyfee = false;
} else { } else {
//_this.storeBodyList.removeAll(); //_this.storeBodyList.removeAll();
_this.opStatus = 'add'; _this.opStatus = 'add';
@ -13804,7 +13807,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
url: '/MvcShipping/MsOpSeae/SaveAll', url: '/MvcShipping/MsOpSeae/SaveAll',
scope: this, scope: this,
params: { params: {
opstatus: this.opStatus, opstatus: _thisseaeedit.opStatus,
data: Ext.JSON.encode(data), data: Ext.JSON.encode(data),
data2: data2js, data2: data2js,
data3: Ext.JSON.encode(data3), data3: Ext.JSON.encode(data3),
@ -13836,11 +13839,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
// //
if (this.opStatus == 'add') { if (this.opStatus == 'add') {
this.opStatus = 'edit';
var arrNewRecords = this.StoreList.insert(0, returnData); var arrNewRecords = this.StoreList.insert(0, returnData);
this.editRecord = this.StoreList.getAt(0); this.editRecord = this.StoreList.getAt(0);
if (type == '0') { if (type == '0') {
this.opStatus = 'edit'; this.opStatus = 'edit';
basicForm2.findField('BSNO').setDisabled(true); basicForm2.findField('BSNO').setDisabled(true);
//this.storeBodyList.reload();
for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
var memberbody = this.storeBodyList.getAt(j); var memberbody = this.storeBodyList.getAt(j);
memberbody.set("BSNO", this.editRecord.get('BSNO')); memberbody.set("BSNO", this.editRecord.get('BSNO'));
@ -13855,6 +13860,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (type == '0') { if (type == '0') {
this.opStatus = 'edit'; this.opStatus = 'edit';
basicForm2.findField('BSNO').setDisabled(true); basicForm2.findField('BSNO').setDisabled(true);
//this.storeBodyList.reload();
for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
var memberbody = this.storeBodyList.getAt(j); var memberbody = this.storeBodyList.getAt(j);
memberbody.set("BSNO", this.editRecord.get('BSNO')); memberbody.set("BSNO", this.editRecord.get('BSNO'));
@ -13879,6 +13886,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (type == '0') { if (type == '0') {
this.opStatus = 'edit'; this.opStatus = 'edit';
basicForm2.findField('BSNO').setDisabled(true); basicForm2.findField('BSNO').setDisabled(true);
//this.storeBodyList.reload();
for (var j = 0; j < this.storeBodyList.getCount(); j += 1) { for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
var memberbody = this.storeBodyList.getAt(j); var memberbody = this.storeBodyList.getAt(j);
memberbody.set("BSNO", this.editRecord.get('BSNO')); memberbody.set("BSNO", this.editRecord.get('BSNO'));
@ -15744,7 +15753,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (success) { if (success) {
var jsonresult = Ext.JSON.decode(response.responseText); var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) { if (jsonresult.Success) {
this.storeBodyList.reload(); var condition = "BSNO='" + this.editRecord.get('BSNO') + "'";
this.storeBodyList.load({ params: { condition: condition } });
this.setAllTotal(); this.setAllTotal();
var KGS = this.formEdit.getForm().findField('KGS').getValue(); var KGS = this.formEdit.getForm().findField('KGS').getValue();
this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS');

12
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -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 }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return; 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]; var record = selections[0];
this.SelectedRecord = record; this.SelectedRecord = record;
this.OprationStatus = 'copyadd'; 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 }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return; 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]; var record = selections[0];
this.SelectedRecord = record; this.SelectedRecord = record;
this.OprationStatus = 'copyaddbill'; 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 }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return; 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]; var record = selections[0];
this.SelectedRecord = record; this.SelectedRecord = record;
this.OprationStatus = 'copyaddfee'; this.OprationStatus = 'copyaddfee';

Write Preview
Loading…
Cancel
Save