From 6d3eca191a75ab2f4229e4514b36f04ec79bc0fe Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 09 七月 2025 13:58:46 +0800
Subject: [PATCH] llj排序

---
 StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
index ae89557..31efed9 100644
--- a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -50,12 +50,25 @@
         List<Womcab> mesRohInDatas)
     {
         var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
-        var update = base.DeleteById(womcaaWW.Id);
-        var insertOrUpdate = db
-            .Deleteable<Womcab>().In(decimals)
-            .ExecuteCommand() > 0;
 
-        if (update && insertOrUpdate) return true;
+        var update = true;
+        if (womcaaWW != null)
+        {
+            if (womcaaWW.Id != null)
+            {
+                update = base.DeleteById(womcaaWW.Id);
+            }
+        }
+        var insertOrUpdate = true;
+        if (decimals != null || decimals.Length > 0)
+        {
+            insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+        }
+
+        if (update && insertOrUpdate)
+        {
+            return true;
+        }
         throw new NotImplementedException("鏇存柊澶辫触");
     }
 
@@ -113,7 +126,7 @@
 
         var entity = new Womcaa
         {
-            Caa001 = erpDto.ppbombillno, ///     鍗曞彿
+            Caa001 = erpDto.FBillNo, ///     鍗曞彿
             //Caa001 = erpDto.FBillNo,
             DepotCode = erpDto.FStockID,
             CreateDate = erpDto.FDate, // ParseDateTime(erpDto.FDate) ?? null,
@@ -144,6 +157,7 @@
             Fsubid = erpDto.FSUBID,
             Fsubbillnoseq = erpDto.FSUBBILLNOSEQ,
             Fsubbillno = erpDto.FSUBBILLNO,
+            Caa020 = erpDto.FSUBBILLNO,
             SrcBillType = erpDto.FSrcBillType,
             SrcBillNo = erpDto.FSrcBillNo,
             SrcBillentryseq = erpDto.FSrcBillEntrySeq,
@@ -171,6 +185,10 @@
           //  F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
           //  F_WWDD_XH = erpDto.F_WWDD_XH,
             //F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
+            WwOrg=erpDto.WW_ZZ,
+            CgOrg=erpDto.CG_ZZ,
+            SuppId=erpDto.FSUPPLIERID,
+
         };
 
         var single = base.GetSingle(it => it.Erpid == entity.Erpid);

--
Gitblit v1.9.3