From 9e9dbf388afbdad4d57ecb7b0e21b7d521177034 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 14 五月 2025 13:07:43 +0800
Subject: [PATCH] 采购订单出版

---
 StandardInterface/MES.Service/service/WomcaaManager.cs |   72 ++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 7769901..baacc02 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -154,7 +154,7 @@
         var entity = new Womcaa
         {
             Erpid = Convert.ToInt32(dto.Id), ///     ERPID
-            Caa001 = dto.ppbombillno, ///     鍗曞彿
+            Caa001 = dto.FBillNo, ///     鍗曞彿
             Caa021 = dto.FWorkShopID, ///     宸ヤ綔杞﹂棿
             RoutingId = dto.FRoutingId, ///     宸ヨ壓璺嚎
             WorkShopId = dto.FREMWorkShopId, ///     浜х嚎
@@ -177,7 +177,8 @@
             Mtono = dto.FMTONO, ///     璁″垝璺熻釜鍙�
             Lot = dto.FLot, ///     鎵瑰彿
             Caa013 = dto.FBomId, ///     BOM鐗堟
-
+            Caa015 = dto.CAA015,               //閿�鍞鍗曞彿
+            Caa015Head = dto.CAA015_line,      //閿�鍞鍗曡鍙�
             CreateType = dto.FCreateType, ///     鐢熸垚鏂瑰紡
             Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
                 ? Convert.ToInt32(dto.PLAN_ID)
@@ -193,14 +194,16 @@
             CloseType = dto.FCloseType, ///     缁撴绫诲瀷
             SrcSplitBillno = dto.FSrcSplitBillNo, ///     婧愭媶鍒嗚鍗曠紪鍙�
             Caa016 = dto.FDescription, ///     澶囨敞
-            BTBZ = dto.BTBZ, ///     澶囨敞
+            Btbz = dto.BTBZ, ///     澶囨敞
             PrdOrg = dto.FPrdOrgId, ///     鐢熶骇缁勭粐ID
             TrustOrg = dto.FEnTrustOrgId, ///     濮旀墭缁勭粐ID
             Typea = dto.TypeA, ///     鍗曟嵁鐘舵��
+            RkOrg = dto.RK_ORG,           //鍏ュ簱缁勭粐
+            Rcn=dto.RCN,                 //鏃ヤ骇鑳�
 
 
             //娌冨皵鏂板
-            WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
+            // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
             //WR_F_SCDD_XH = dto.F_SCDD_XH
         };
 
@@ -220,35 +223,42 @@
             var womcab = new Womcab
             {
                 Erpid = Convert.ToDecimal(dto.ID),
-                Cab001 = dto.FBillNo,
-                Cab002 = dto.FSeq,
-                Cab003 = dto.FMaterialID,
-                Cab006 = Convert.ToDecimal(dto.FNeedQty),
-                MustQty = Convert.ToDecimal(dto.FMustQty),
-                Cab007 = Convert.ToDecimal(dto.FPickedQty),
-                PositionNo = dto.FPositionNO,
-                SupplyOrganization = dto.FChildSupplyOrgId,
-                IssuingOrganization = dto.FSupplyOrg,
-                OwnerId = dto.FOwnerID,
-                Mtono = dto.FMTONO,
-                Lot = dto.FLot,
-                DepotCode = dto.FStockID,
-                IssueType = dto.FIssueType,
-                Cab009 = dto.FUnitID,
-                SupplyType = dto.FSupplyType,
-                Cab012 = Convert.ToDecimal(dto.FStdQty),
-                Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
-                UseRate = Convert.ToDecimal(dto.FUseRate),
-                MaterialType = dto.FMaterialType,
-                Cab014 = dto.FIsKeyItem,
-                Numerator = Convert.ToDecimal(dto.FNumerator),
-                Denominator = Convert.ToDecimal(dto.FDenominator),
+                Cab001 = dto.FBillNo,                         //鍗曟嵁缂栧彿
+                Cab002 = dto.FSeq,                            //搴忓彿
+                Cab003 = dto.FMaterialID,                     //瀛愰」鐗╂枡缂栫爜
+                Cab006 = Convert.ToDecimal(dto.FNeedQty),     //闇�姹傛暟閲�
+                MustQty = Convert.ToDecimal(dto.FMustQty),    //搴斿彂鏁伴噺
+                Cab007 = Convert.ToDecimal(dto.FPickedQty),   //宸查鏁伴噺
+                PositionNo = dto.FPositionNO,                 //浣嶇疆鍙�
+                SupplyOrganization = dto.FChildSupplyOrgId,   //渚涘簲缁勭粐
+                IssuingOrganization = dto.FSupplyOrg,         //鍙戞枡缁勭粐
+                OwnerId = dto.FOwnerID,                       //璐т富
+                Mtono = dto.FMTONO,                           //璁″垝璺熻釜鍙�
+                Lot = dto.FLot,                               //鎵瑰彿
+                DepotCode = dto.FStockID,                     //浠撳簱
+                IssueType = dto.FIssueType,                   //鍙戞枡鏂瑰紡
+                Cab009 = dto.FUnitID,                          //鍗曚綅
+                SupplyType = dto.FSupplyType,                  //渚涘簲绫诲瀷
+                Cab012 = Convert.ToDecimal(dto.FStdQty),        // 鏍囧噯鐢ㄩ噺
+               // Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
+                UseRate = Convert.ToDecimal(dto.FUseRate),      //浣跨敤姣斾緥
+                MaterialType = dto.FMaterialType,                     //瀛愰」绫诲瀷
+                Cab014 = Convert.ToInt32(dto.FIsKeyItem),                              //鏇夸唬涓绘枡
+                Numerator = Convert.ToDecimal(dto.FNumerator),        //鍒嗗瓙
+                Denominator = Convert.ToDecimal(dto.FDenominator),    //鍒嗘瘝
                 Pid = Convert.ToDecimal(dto.PID),
                 Eid = Convert.ToDecimal(dto.PID),
-                SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
-                SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
-                Typeb = dto.TypeB,
-                WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
+                Scrapqty = Convert.ToDecimal(dto.FFixScrapQty),    //鍥哄畾鎹熻��
+                Scraprate = Convert.ToDecimal(dto.FScrapRate),     //鍙樺姩鎹熻�楃巼
+                Wlsl=dto.WLSL,
+                Khwlbm=dto.KWWLBM,
+                Khwlmc =dto.KHWLMC,
+                Slzz=dto.SLZZ,
+                Slbm=dto.SLBM,
+                Xqbm=dto.XQBM,
+                Xqzz=dto.XQZZ,
+                //  Typeb = dto.TypeB,
+                // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
                 //WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
             };
 

--
Gitblit v1.9.3