From ffda0baad362ac0b72caae668e2ca229eea2bbe2 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 16 七月 2025 15:11:06 +0800
Subject: [PATCH] 分割前订单增加

---
 StandardPda/MES.Service/service/WomcaaManager.cs |   63 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 3100366..6c0f161 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -81,8 +81,6 @@
             Erpid = Convert.ToInt64(dto.Id),
             Caa001 = dto.FBillNo,
             Caa021 = dto.FWorkShopID,
-            RoutingId = dto.FRoutingId,
-            WorkShopId = dto.FREMWorkShopId,
             DepotCode = dto.FStockId,
             CreateDate = dto.FDate,
             Caa004 = dto.FBillType,
@@ -104,13 +102,7 @@
             Caa013 = dto.FBomId,
 
             CreateType = dto.FCreateType,
-            Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
-                ? Convert.ToInt64(dto.PLAN_ID)
-                : null,
-            Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
-                ? Convert.ToInt64(dto.PLAN_SEQ)
-                : null,
-            Caa020 = dto.PLAN_NUM,
+            Caa020 = dto.FBillNo,
             SrcBillType = dto.FSrcBillType,
             SrcBillNo = dto.FSrcBillNo,
             SrcBillentryseq = dto.FSrcBillEntrySeq,
@@ -120,16 +112,36 @@
             CloseType = dto.FCloseType,
             SrcSplitBillno = dto.FSrcSplitBillNo,
             Caa016 = dto.FDescription,
-            //BTBZ = dto.BTBZ,  
             PrdOrg = dto.FPrdOrgId,
-            TrustOrg = dto.FEnTrustOrgId
-            //Typea = dto.TypeA
+            TrustOrg = dto.FEnTrustOrgId,
+            Bomtype = dto.FBOMType,
+            Bommaster = dto.FBOMMaster,
+            Bomaltrnate = dto.FBOMAlternate,
+            Bomeffedate = dto.FBOMEffeDate,
+            Routingalternate = dto.FRoutingAlternate,
+            Routingeffedate = dto.FRoutingEffeDate,
+            Mrpqty = dto.FMRPQty,
+            Actualstartdate = dto.FActualStartDate,
+            Actualcompletedate = dto.FActualCompleteDate,
+            Mosourcedoctype = dto.FMOSourceDocType,
+            Project = dto.FProject,
+            Ownerorg = dto.FOwnerOrg,
+            Createdby =  dto.FCreatedBy,
+            Createdon = dto.FCreatedOn,
+            Totalstartqty =  dto.FTotalStartQty,
+            Totalcompleteqty = dto.FTotalCompleteQty,
+            Totalrcvqty = dto.FTotalRcvQty,
+            Totalreworkingqty = dto.FTotalReworkingQty,
+            Reasonforrework = dto.FReasonForRework,
+            Isforcewholeset = dto.FIsForceWholeSet,
+            PREVMO = dto.FPrevMO,
+            Typea = dto.TypeA
         };
 
 
         var single = base.GetSingle(it => it.Erpid == entity.Erpid);
         if (single != null) entity.Id = single.Id;
-        
+
         //Caa006 = dto.FMaterialId,
         var mesLinkU9 = Db.Queryable<MesLinkU9>()
             .Where(x => x.U9Id == dto.FMaterialId
@@ -167,7 +179,6 @@
                 PositionNo = dto.FPositionNO,
                 SupplyOrganization = dto.FChildSupplyOrgId,
                 IssuingOrganization = dto.FSupplyOrg,
-                OwnerId = dto.FOwnerID,
                 Mtono = dto.FMTONO,
                 Lot = dto.FLot,
                 DepotCode = dto.FStockID,
@@ -183,7 +194,7 @@
                 UseRate = !string.IsNullOrEmpty(dto.FUseRate)
                     ? Convert.ToDecimal(dto.FUseRate)
                     : null,
-                MaterialType = dto.FMaterialType,
+              
                 Cab014 = !string.IsNullOrEmpty(dto.FIsKeyItem)
                     ? Convert.ToInt64(dto.FIsKeyItem)
                     : null,
@@ -205,15 +216,31 @@
                 Scraprate = !string.IsNullOrEmpty(dto.FScrapRate)
                     ? Convert.ToDecimal(dto.FScrapRate)
                     : null,
+                Project  = dto.FProject,
+                Bomreqqty = dto.FBOMReqQty,
+                Materialtype = dto.FMaterialType,
+                IsOverIssue = dto.FIsOverIssue,
+                StandardMaterialscale = dto.FStandardMaterialScale,
+                Fixedmaterialnum = dto.FFixedMaterialNum,
+                IsSubstitute = dto.FIsSubstitute,
+                Substituteditem = dto.FSubstitutedItem,
+                Issueuom = dto.FIssueUOM,
+                Qpa = dto.FQPA,
+                Scraptype = dto.FScrapType,
+                Bfopportunity = dto.FBFOpportunity,
+                Supplywh = dto.FSupplyWh,
+                Mocompletesetcheck = dto.FMOCompleteSetCheck,
+                Mostartsetcheck = dto.FMOStartSetCheck,
+                Iscoupleissue = dto.FIsCoupleIssue,
+                FDescription  = dto.FDescription,
                 TypeB = dto.TypeB
-                // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr,
-                // WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
+
             };
 
             var entity = Db.Queryable<Womcab>()
                 .Where(s => s.Erpid == womcab.Erpid).Single();
             if (entity != null) womcab.Id = entity.Id;
-            
+
             //Cab003 = dto.FMaterialID
             var mesLinkU9 = Db.Queryable<MesLinkU9>()
                 .Where(x => x.U9Id == dto.FMaterialID

--
Gitblit v1.9.3