From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MES.Service/service/BasicData/MesItemsManager.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 321b39a..fa57d25 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -15,7 +15,8 @@
                         && c.Company == query.Company
                         && c.ItemNo == query.ItemNo).First();
     }
-    
+
+
     public bool Save(ErpItems item)
     {
         var entity = GetMesItems(item);
@@ -129,6 +130,7 @@
         return new MesItems
         {
             Id = Convert.ToDecimal(item.Id),
+            Type = item.Type,
             ItemNo = item.FNumber,
             ItemName = item.FName,
             ItemModel = item.FSpecification,
@@ -144,7 +146,7 @@
             Fissuetype = item.FIssueType,
             Fisbatchmanage = item.FIsBatchManage,
             Fpurchaserid = item.FPurchaserId,
-            Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
+            Fpurchaseunitid = item.FPurchaseUnitId,
             Storeunit = item.FStoreUnitID,
             Saleunit = item.FSaleUnitId,
             Fforbidstatus = item.FForbidStatus,
@@ -152,8 +154,12 @@
             ProductionWorkshop = item.FWorkShopId,
             ProduceUnit = item.FPRODUCEUNITID,
             SubconUnit = item.FSUBCONUNITID,
+            CreateDate = DateTime.Now,
             Company = "1000",
-            Factory = "1000"
+            Factory = "1000",
+            CheckbosSFBZ = item.F_UNW_CheckBox_SFBZ,
+            CheckbosSFDB = item.F_UNW_CheckBox_SFDB
+
         };
     }
 

--
Gitblit v1.9.3