From 602ae2fa185d90a585d04a770a46a2b819e22c2e Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Mon, 11 Mar 2024 16:50:30 +0800
Subject: [PATCH] 12
---
.../ChPayapplicationBLEdit.js | 2 +-
.../Viewsjs/MsOpApply/MsOpApplyEdit.js | 4 ++--
.../MvcShipping/Viewsjs/WMS/WMSINEdit.js | 3 ++-
JobSendAgentMail/JobSendAgentMail.csproj | 22 +++++++++++++++++++
JobSendAgentMail/packages.config | 1 +
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js
index 3d9e945a..423c0b9e 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js
@@ -3296,7 +3296,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
var SALECORPID = this.formEdit.getForm().findField('SALECORPID').getValue();
if ((SALECORPID == '') || (SALECORPID == null)) {
var selectedRecords2 = this.gridAddList.selModel.getSelection();
- var rec = selectedRecords2[i];
+ var rec = selectedRecords2[0];
SALECORP = rec.data.SALECORP;
var recs = DsStoreQueryBy(this.storeSaleCompany, 'NAME', SALECORP);
if (recs.getCount() > 0) {
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
index 7d5d64ae..9dc3abdf 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
@@ -2578,8 +2578,8 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
field = basicForm.findField('OPDATE');
field.setValue(mydatestr);
- field = this.formEdit.getForm().findField('CUSTOMDATE');
- field.setValue(mydatestr);
+ //field = this.formEdit.getForm().findField('CUSTOMDATE');
+ //field.setValue(mydatestr);
var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
field = basicForm.findField('ACCDATE');
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/WMS/WMSINEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/WMS/WMSINEdit.js
index 6495add5..bdfeb789 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/WMS/WMSINEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/WMS/WMSINEdit.js
@@ -2308,7 +2308,8 @@ Ext.extend(Shipping.WMSINEdit, Ext.Panel, {
this.panelFee.strBSNO = data.ASSOCIATEDNO;
this.panelFee.StoreDateCurr.load({ params: { optype: "op_Seai", bsno: data.ASSOCIATEDNO} });
this.panelFee.StoreUnit.load({ params: { bsno: data.ASSOCIATEDNO, bstype: "WMSIN"} });
- this.panelFee.storeBodySum.load({ params: { bsno: data.ASSOCIATEDNO} });
+ this.panelFee.storeBodySum.load({ params: { bsno: data.ASSOCIATEDNO } });
+ this.panelFee.storeChFeeGain.load({ params: { bsno: data.ASSOCIATEDNO, optype: "WMSIN" } });
//this.panelFee.storeDrChFee.load({ params: { billno: data.ASSOCIATEDNO, type: 1, optype: "op_Seai"} });
this.panelFee.LoadDrChFee2("bsno='" + data.ASSOCIATEDNO + "' and feetype=1 and isnull(wmsoutbsno,'')<>'' ");
diff --git a/JobSendAgentMail/JobSendAgentMail.csproj b/JobSendAgentMail/JobSendAgentMail.csproj
index b2a06b92..30f20fa5 100644
--- a/JobSendAgentMail/JobSendAgentMail.csproj
+++ b/JobSendAgentMail/JobSendAgentMail.csproj
@@ -1,5 +1,6 @@
+
Debug
@@ -13,6 +14,8 @@
512
true
+
+
true
@@ -40,6 +43,12 @@
..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll
+
+ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
+
+
+ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
+
..\packages\HtmlAgilityPack.1.11.29\lib\Net45\HtmlAgilityPack.dll
@@ -64,6 +73,7 @@
..\D7MqClient\packages\RabbitMQ.Client.6.2.2\lib\net461\RabbitMQ.Client.dll
+
..\D7MqClient\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
@@ -77,11 +87,15 @@
+
+
+
+
Designer
@@ -98,4 +112,12 @@
+
+
+ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
+
+
+
+
+
\ No newline at end of file
diff --git a/JobSendAgentMail/packages.config b/JobSendAgentMail/packages.config
index 95e32a09..93b9ae94 100644
--- a/JobSendAgentMail/packages.config
+++ b/JobSendAgentMail/packages.config
@@ -2,6 +2,7 @@
+