From 2a5ca0e2e98e2556bd218cade91975830e55b781 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 14 四月 2025 12:16:16 +0800
Subject: [PATCH] womcaa接口表更新

---
 StandardPda/MES.Service/service/WomcaaManager.cs |   64 +++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 12dfdad..76e5a52 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -78,7 +78,7 @@
     {
         var entity = new Womcaa
         {
-            Erpid = Convert.ToInt32(dto.Id),
+            Erpid = Convert.ToInt64(dto.Id),
             Caa001 = dto.FBillNo,
             Caa021 = dto.FWorkShopID,
             RoutingId = dto.FRoutingId,
@@ -105,9 +105,11 @@
 
             CreateType = dto.FCreateType,
             Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
-                ? Convert.ToInt32(dto.PLAN_ID)
+                ? Convert.ToInt64(dto.PLAN_ID)
                 : null,
-            Caa019 = Convert.ToInt32(dto.PLAN_SEQ),
+            Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
+                ? Convert.ToInt64(dto.PLAN_SEQ)
+                : null,
             Caa020 = dto.PLAN_NUM,
             SrcBillType = dto.FSrcBillType,
             SrcBillNo = dto.FSrcBillNo,
@@ -139,13 +141,21 @@
         {
             var womcab = new Womcab
             {
-                Erpid = Convert.ToDecimal(dto.ID),
+                Erpid = !string.IsNullOrEmpty(dto.ID)
+                    ? Convert.ToDecimal(dto.ID)
+                    : throw new Exception("瀛愯〃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),
+                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
+                    ? Convert.ToDecimal(dto.FNeedQty)
+                    : null,
+                MustQty = !string.IsNullOrEmpty(dto.FMustQty)
+                    ? Convert.ToDecimal(dto.FMustQty)
+                    : null,
+                Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
+                    ? Convert.ToDecimal(dto.FPickedQty)
+                    : null,
                 PositionNo = dto.FPositionNO,
                 SupplyOrganization = dto.FChildSupplyOrgId,
                 IssuingOrganization = dto.FSupplyOrg,
@@ -156,17 +166,37 @@
                 IssueType = dto.FIssueType,
                 Cab009 = dto.FUnitID,
                 SupplyType = dto.FSupplyType,
-                Cab012 = Convert.ToDecimal(dto.FStdQty),
-                FreplaceGroup = Convert.ToInt32(dto.FReplaceGroup),
-                UseRate = Convert.ToDecimal(dto.FUseRate),
+                Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
+                    ? Convert.ToDecimal(dto.FStdQty)
+                    : null,
+                FreplaceGroup = !string.IsNullOrEmpty(dto.FReplaceGroup)
+                    ? Convert.ToInt64(dto.FReplaceGroup)
+                    : null,
+                UseRate = !string.IsNullOrEmpty(dto.FUseRate)
+                    ? Convert.ToDecimal(dto.FUseRate)
+                    : null,
                 MaterialType = dto.FMaterialType,
-                Cab014 = Convert.ToInt32(dto.FIsKeyItem),
-                Numerator = Convert.ToDecimal(dto.FNumerator),
-                Denominator = Convert.ToDecimal(dto.FDenominator),
-                Pid = Convert.ToDecimal(dto.FID),
-                Eid = Convert.ToDecimal(dto.FID),
-                Scrapqty = Convert.ToDecimal(dto.FFixScrapQty),
-                Scraprate = Convert.ToDecimal(dto.FScrapRate),
+                Cab014 = !string.IsNullOrEmpty(dto.FIsKeyItem)
+                    ? Convert.ToInt64(dto.FIsKeyItem)
+                    : null,
+                Numerator = !string.IsNullOrEmpty(dto.FNumerator)
+                    ? Convert.ToDecimal(dto.FNumerator)
+                    : null,
+                Denominator = !string.IsNullOrEmpty(dto.FDenominator)
+                    ? Convert.ToDecimal(dto.FDenominator)
+                    : null,
+                Pid = !string.IsNullOrEmpty(dto.FID)
+                    ? Convert.ToDecimal(dto.FID)
+                    : throw new Exception("鐖秈d涓嶅厑璁镐负绌�"),
+                Eid = !string.IsNullOrEmpty(dto.FID)
+                    ? Convert.ToDecimal(dto.FID)
+                    : throw new Exception("鐖秈d涓嶅厑璁镐负绌�"),
+                Scrapqty = !string.IsNullOrEmpty(dto.FFixScrapQty)
+                    ? Convert.ToDecimal(dto.FFixScrapQty)
+                    : null,
+                Scraprate = !string.IsNullOrEmpty(dto.FScrapRate)
+                    ? Convert.ToDecimal(dto.FScrapRate)
+                    : null,
                 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