From baa7d3abea49a36b1ca83d29343e720647ee2b8b Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 10:29:55 +0800
Subject: [PATCH] 1.生产订单新增同步时间。 2.采购订单新增同步时间。 3.员工新增账号逻辑优化。 4.基础信息+业务单据增加route储存单号。

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

diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 85badcc..aa0e102 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,7 +23,8 @@
     public bool Save(ErpWOM wom)
     {
         var womErpCaa = wom.ErpCaa;
-        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+
+        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FBillNo);
         var mesWomcabs =
             MapErpCABtoWomcab(wom.ErpCabs);
 
@@ -84,12 +85,12 @@
         throw new NotImplementedException("鏇存柊澶辫触");
     }
 
-    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string PPBOMNO)
     {
         var entity = new Womcaa
         {
             Erpid = Convert.ToInt32(dto.Id), ///     ERPID
-            Caa001 = dto.FBillNo, ///     鍗曞彿
+            Caa001 = PPBOMNO, ///     鍗曞彿
             Caa021 = dto.FWorkShopID, ///     宸ヤ綔杞﹂棿
             RoutingId = dto.FRoutingId, ///     宸ヨ壓璺嚎
             WorkShopId = dto.FREMWorkShopId, ///     浜х嚎
@@ -145,7 +146,8 @@
             // Customer = dto.F_XIFG_Base_83g1, ///     瀹㈡埛
             Caa0111 = dto.FPlanFinishDate, ///     棰勮瀹屽伐鏃堕棿澶囦唤
             Typea = dto.TypeA, ///     棰勮瀹屽伐鏃堕棿澶囦唤
-            Typeb = dto.TypeB ///     棰勮瀹屽伐鏃堕棿澶囦唤
+            //Typeb = dto.TypeB ///     棰勮瀹屽伐鏃堕棿澶囦唤
+            SynchronousDate = DateTime.Now
         };
 
         var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -197,7 +199,8 @@
                 Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
                 UseRate = Convert.ToDecimal(dto.FUseRate),
                 MaterialType = dto.FMaterialType,
-                MustQty = Convert.ToDecimal(dto.FMustQty)
+                MustQty = Convert.ToDecimal(dto.FMustQty),
+                Typeb = dto.TypeB
                 // Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗� 
                 //
                 // CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿 

--
Gitblit v1.9.3