From d8bbd1bc855990e908fc5df9594fc7b4e4628eed Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 28 八月 2024 17:56:23 +0800
Subject: [PATCH] 生产领料单erp推送
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.xml | 20 ++++++++++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.xml | 6 +-
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 23 +++++++----
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.xml | 20 ++++++++++
23 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index a444cd4..e67a803 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 4151104..fa697fc 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 64a9a86..b0cbbee 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index e9dbd0c..089d566 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 34788f7..6b1d2ec 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -927,28 +927,33 @@
item.ItemId + "')";
var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);
+ var xsddh = item.Caa015 ?? "";
+ var wzh = item.PositionNo ?? "";
+ var qty = ((int)item.Quantity).ToString();
+ var erpid = ((int)item.erpId).ToString();
+ var id = ((int)item.Id).ToString();
scllentryList.Add(new
{
FMaterialId = item.ItemNo,
FUnitID = C_ITEM_UNIT,
- FAppQty = item.Quantity,
- FActualQty = item.Quantity,
+ FAppQty = qty,
+ FActualQty = qty,
FStockId = item.DepotCode,
- FPPBomEntryId = item.erpId,
- F_UNW_Text_xsddh = item.Caa015,
- F_UNW_TEXT_WZH = item.PositionNo,
- F_MES_ENTRYID = item.Id
+ FPPBomEntryId = erpid,
+ F_UNW_Text_xsddh = xsddh,
+ F_UNW_TEXT_WZH = wzh,
+ F_MES_ENTRYID = id
});
}
var dataJson = new
{
- F_MES_ID = mesInvItemOuts.Id,
- FDate = mesInvItemOuts.CreateBy,
+ F_MES_ID = mesInvItemOuts.Id.ToString(),
+ FDate = DateTime.Now.ToString("yyyy-MM-dd"),
FPickerId = userName,
F_UNW_LargeText_BZ = " ",
F_UNW_KH = " ",
- F_UNW_DDSL = womcaa.Caa012,
+ F_UNW_DDSL = womcaa.Caa012.ToString(),
F_UNW_Text_CZG = userName,
scllentry = scllentryList
};
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index a444cd4..e67a803 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 4151104..fa697fc 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index d3b307d..0d74bd0 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 1b8d978..15b3623 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 8cb3a9c..492f2f4 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 63b3c28..3378e73 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -1051,20 +1051,20 @@
</member>
<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
<summary>
- 鑾峰彇鐗╂枡鎺ユ敹淇℃伅
+ 鑾峰彇鐗╂枡鎺ユ敹淇℃伅
</summary>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
<summary>
- 鑾峰彇鏄庣粏鑿滃崟
+ 鑾峰彇鏄庣粏鑿滃崟
</summary>
<param name="query"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
<summary>
- 纭鎺ユ敹
+ 纭鎺ユ敹
</summary>
<param name="query"></param>
<returns></returns>
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 64a9a86..b0cbbee 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index e9dbd0c..089d566 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index b1da865..2cff899 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 4067afb..15b3623 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 83ea1b9..6b36183 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index f07d581..3378e73 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -1049,6 +1049,26 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 鑾峰彇鐗╂枡鎺ユ敹淇℃伅
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 鑾峰彇鏄庣粏鑿滃崟
+ </summary>
+ <param name="query"></param>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 纭鎺ユ敹
+ </summary>
+ <param name="query"></param>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 64a9a86..b0cbbee 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index e9dbd0c..089d566 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index b1da865..2cff899 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 4067afb..15b3623 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 83ea1b9..6b36183 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index f07d581..3378e73 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -1049,6 +1049,26 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetOutItemList(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 鑾峰彇鐗╂枡鎺ユ敹淇℃伅
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetFormList(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 鑾峰彇鏄庣粏鑿滃崟
+ </summary>
+ <param name="query"></param>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.ConfirmReceipt(MES.Service.Dto.service.WarehouseQuery)">
+ <summary>
+ 纭鎺ユ敹
+ </summary>
+ <param name="query"></param>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.Warehouse.MesInvItemOutCDetailsController.GetList">
<summary>
鑾峰彇鎵�鏈�
--
Gitblit v1.9.3