From d8bbd1bc855990e908fc5df9594fc7b4e4628eed Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 28 八月 2024 17:56:23 +0800
Subject: [PATCH] 生产领料单erp推送

---
 MES.Service/service/WomcaaManager.cs |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 8e52cfb..bdddbe0 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -34,7 +34,6 @@
                     return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
                 case "2":
                 case "4":
-                case "5":
                     return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
                         ? 1
                         : 0;
@@ -79,7 +78,9 @@
         {
             Erpid = Convert.ToDecimal(dto.Id),
             Caa001 = dto.FBillNo,
-            Caa021 = dto.FWorkShopID,
+            Caa021 = dto.FWorkShopID0,
+            RoutingId = dto.FRoutingId,
+            WorkShopId = dto.FREMWorkShopId,
             DepotCode = dto.FStockId,
             CreateDate = dto.FDate,
             Caa004 = dto.FBillType,
@@ -99,6 +100,7 @@
             Mtono = dto.FMTONO,
             Lot = dto.FLot,
             Caa013 = dto.FBomId,
+            Caa015 = dto.F_UNW_Text_xsddh,
             CreateType = dto.FCreateType,
             SrcBillType = dto.FSrcBillType,
             SrcBillNo = dto.FSrcBillNo,
@@ -108,7 +110,7 @@
             ForceCloserid = dto.FForceCloserId,
             CloseType = dto.FCloseType,
             SrcSplitBillno = dto.FSrcSplitBillNo,
-            Caa016 = dto.FDESCRIPTION,
+            Caa016 = dto.FMemoItem,
             Caa018 = Convert.ToDecimal(dto.planId),
             Caa019 = Convert.ToDecimal(dto.planSeq),
             Caa020 = dto.planNum
@@ -128,12 +130,12 @@
         {
             var womcab = new Womcab
             {
-                Erpid = Convert.ToDecimal(dto.FENTRYID),
+                Erpid = Convert.ToDecimal(dto.ID),
                 Cab001 = dto.FBillNo,
                 Cab002 = dto.FSeq,
-                Cab003 = dto.FMaterialID,
-                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
-                    ? Convert.ToDecimal(dto.FNeedQty)
+                Cab003 = dto.FMaterialID2,
+                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
+                    ? Convert.ToDecimal(dto.FNeedQty2)
                     : null,
                 Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
                     ? Convert.ToDecimal(dto.FPickedQty)
@@ -153,7 +155,9 @@
                 Cab014 = dto.FIsKeyItem,
                 Numerator = dto.FNumerator,
                 Denominator = dto.FDenominator,
-                Eid = Convert.ToDecimal(dto.FID)
+                Eid = Convert.ToDecimal(dto.PID),
+                SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
+                SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
             };
 
             var entity = Db.Queryable<Womcab>()

--
Gitblit v1.9.3