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

20241113

Browse Source
QDHHYT
dengyu 2 weeks ago
parent e0b5790460
commit 6d9748beb5
5 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
Unescape Escape View File

@ -5135,7 +5135,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
var cmdUpdate = var cmdUpdate =
db.GetSqlStringCommand( db.GetSqlStringCommand(
@"UPDATE CH_FEE SET CUSTOMERNAME=@CUSTOMERNAME WHERE GID=@GID "); @"UPDATE CH_FEE SET CUSTOMERNAME=@CUSTOMERNAME,MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME WHERE GID=@GID ");
if (FeeList != null) if (FeeList != null)
@ -5208,8 +5208,12 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
db.ExecuteNonQuery(cmdInsert, tran); db.ExecuteNonQuery(cmdInsert, tran);
cmdUpdate.Parameters.Clear(); cmdUpdate.Parameters.Clear();
db.AddInParameter(cmdUpdate, "@GID", DbType.String, enumValue.GId); db.AddInParameter(cmdUpdate, "@GID", DbType.String, enumValue.GId);
db.AddInParameter(cmdUpdate, "@CUSTOMERNAME", DbType.String,NewCustName); db.AddInParameter(cmdUpdate, "@CUSTOMERNAME", DbType.String,NewCustName);
db.AddInParameter(cmdUpdate, "@MODIFIEDUSER", DbType.String, userid);
db.AddInParameter(cmdUpdate, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
db.ExecuteNonQuery(cmdUpdate, tran); db.ExecuteNonQuery(cmdUpdate, tran);
} }

29
DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs
Unescape Escape View File

@ -2695,20 +2695,21 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
{ {
bool ishave = false; bool ishave = false;
if (invdetailDataList != null) //20241112 根据客户需求 不 根据发票明细内容的发票费用名称合并 不同发票申请 的发票明细
{ //if (invdetailDataList != null)
foreach (var invdetailData in invdetailDataList) //{
{ // foreach (var invdetailData in invdetailDataList)
if (invdetailData.GOODSNAME == enumInvDetail.GOODSNAME) // {
{ // if (invdetailData.GOODSNAME == enumInvDetail.GOODSNAME)
invdetailData.TAXPRICE = invdetailData.TAXPRICE + enumInvDetail.TAXPRICE; // {
invdetailData.PRICE = invdetailData.PRICE + enumInvDetail.PRICE; // invdetailData.TAXPRICE = invdetailData.TAXPRICE + enumInvDetail.TAXPRICE;
invdetailData.AMOUNT = invdetailData.AMOUNT + enumInvDetail.AMOUNT; // invdetailData.PRICE = invdetailData.PRICE + enumInvDetail.PRICE;
invdetailData.TAX = invdetailData.TAX + enumInvDetail.TAX; // invdetailData.AMOUNT = invdetailData.AMOUNT + enumInvDetail.AMOUNT;
ishave = true; // invdetailData.TAX = invdetailData.TAX + enumInvDetail.TAX;
} // ishave = true;
} // }
} // }
//}
if (!ishave) if (!ishave)
{ {

4
DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
Unescape Escape View File

@ -5449,7 +5449,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
var cmdUpdate = var cmdUpdate =
db.GetSqlStringCommand( db.GetSqlStringCommand(
@"UPDATE CH_FEE SET SALECORP=@SALECORP WHERE GID=@GID "); @"UPDATE CH_FEE SET SALECORP=@SALECORP,MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME WHERE GID=@GID ");
if (FeeList != null) if (FeeList != null)
@ -5462,6 +5462,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
cmdUpdate.Parameters.Clear(); cmdUpdate.Parameters.Clear();
db.AddInParameter(cmdUpdate, "@GID", DbType.String, enumValue.GId); db.AddInParameter(cmdUpdate, "@GID", DbType.String, enumValue.GId);
db.AddInParameter(cmdUpdate, "@SALECORP", DbType.String, NewSALECORP); db.AddInParameter(cmdUpdate, "@SALECORP", DbType.String, NewSALECORP);
db.AddInParameter(cmdUpdate, "@MODIFIEDUSER", DbType.String, userid);
db.AddInParameter(cmdUpdate, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString());
db.ExecuteNonQuery(cmdUpdate, tran); db.ExecuteNonQuery(cmdUpdate, tran);
} }

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

@ -2191,14 +2191,6 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
this.onDelDetailClick(button, event, 1); this.onDelDetailClick(button, event, 1);
}, },
scope: this scope: this
}, '-'
, {
text: Zi.LAN.btnAddOpCtnDetail, //'多品名维护',
id: "btnAddOpCtnDetail",
handler: function (button, event) {
this.onAddOpCtnDetail(button, event);
},
scope: this
} }
, '-', { , '-', {
text: Zi.LAN.btnadddetail2, //'展开集装箱', text: Zi.LAN.btnadddetail2, //'展开集装箱',
@ -2264,12 +2256,6 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
_this.winCtnListShow.show(); _this.winCtnListShow.show();
}, },
scope: this scope: this
}, '-', {
text: Zi.LAN.updatectntruck, //'同步车队',
handler: function (button, event) {
this.onUpDetailTruckClick(button, event);
},
scope: this
}, '-', { }, '-', {
text: Zi.LAN.setPackage, //'批量设置包装', text: Zi.LAN.setPackage, //'批量设置包装',
handler: function (button, event) { handler: function (button, event) {
@ -2294,6 +2280,20 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
this.onsetCtnClick(1, "CBM"); this.onsetCtnClick(1, "CBM");
}, },
scope: this scope: this
}, '-'
, {
text: Zi.LAN.btnAddOpCtnDetail, //'多品名维护',
id: "btnAddOpCtnDetail",
handler: function (button, event) {
this.onAddOpCtnDetail(button, event);
},
scope: this
}, '-', {
text: Zi.LAN.updatectntruck, //'同步车队',
handler: function (button, event) {
this.onUpDetailTruckClick(button, event);
},
scope: this
}], }],
columns: this.ctncolumns columns: this.ctncolumns
@ -14451,7 +14451,6 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue(); var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue();
this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + KINDPKGS); this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + KINDPKGS);
this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + KINDPKGS + ' ONLY.'); this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
} }
} else if (e.field == 'CTNALL') { } else if (e.field == 'CTNALL') {
var CTNALL = e.record.data['CTNALL']; var CTNALL = e.record.data['CTNALL'];
@ -14936,6 +14935,39 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
}; };
this.setAllTotal(); this.setAllTotal();
if (fieldname == 'KGS') {
var KGS = this.formEdit.getForm().findField('KGS').getValue();
this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS');
}
if (fieldname == 'CBM') {
var CBM = this.formEdit.getForm().findField('CBM').getValue();
this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM');
}
if (fieldname == 'PKGS') {
var PKGS = this.formEdit.getForm().findField('PKGS').getValue();
var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue();
this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + KINDPKGS);
this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
}
if (fieldname == 'KINDPKGS') {
var KINDPKGS = e.record.data['KINDPKGS'];
this.setHeadFieldValue('KINDPKGS', KINDPKGS);
var PKGS = this.formEdit.getForm().findField('PKGS').getValue();
this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + KINDPKGS);
this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
for (var j = 0; j < this.storeBodyList.getCount(); j += 1) {
var memberbody = this.storeBodyList.getAt(j);
if (memberbody.data.KINDPKGS == "" || memberbody.data.KINDPKGS == NaN || memberbody.data.KINDPKGS == null) {
memberbody.set("KINDPKGS", KINDPKGS);
memberbody.commit();
}
};
} }
}, },
@ -15046,6 +15078,9 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
for (var i = 0; i < this.storeBodyList.getCount(); i += 1) { for (var i = 0; i < this.storeBodyList.getCount(); i += 1) {
var memberbody = this.storeBodyList.getAt(i); var memberbody = this.storeBodyList.getAt(i);
if (memberbody.data.CNTRNO == member.data.CNTRNO) { if (memberbody.data.CNTRNO == member.data.CNTRNO) {
memberbody.set("CTNNUM", 1);
if (member.data.SEALNO != '') { if (member.data.SEALNO != '') {
memberbody.set("SEALNO", member.data.SEALNO.trim()); memberbody.set("SEALNO", member.data.SEALNO.trim());
} }

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEditView.js
Unescape Escape View File

@ -707,7 +707,11 @@ Ext.extend(Shipping.MsOpSeaeView, Ext.Panel, {
//labelWidth: 50, //labelWidth: 50,
//flex: 0.5, //flex: 0.5,
name: 'IRCODE' name: 'IRCODE'
}, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } }, {
fieldLabel: '指定货工厂',
flex: 1,
name: 'ZDHGC'
}, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }
] ]
} }

Write Preview
Loading…
Cancel
Save