From bf780b6c83012b5beb3d7515b8fb61753c5fb736 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期四, 26 六月 2025 08:48:37 +0800
Subject: [PATCH] 采购承诺交期改string类型

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

diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 4e916be..9657312 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,5 +1,5 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.service;
 using MES.Service.Dto.webApi;
 using MES.Service.Modes;
 using SqlSugar;
@@ -8,6 +8,15 @@
 
 public class MesItemsManager : Repository<MesItems>
 {
+    public MesItems GetItemQcPrint(WarehouseQuery query)
+    {
+        return Db.Queryable<MesItems>()
+            .Where(c => c.Factory == query.Factory
+                        && c.Company == query.Company
+                        && c.ItemNo == query.ItemNo).First();
+    }
+
+
     public bool Save(ErpItems item)
     {
         var entity = GetMesItems(item);
@@ -25,11 +34,11 @@
                         return 1;
                     break;
                 case "2":
-                    if (InsertItem(db, entity))
+                    if (InsertOrUpdate(db, entity))
                         return 1;
                     break;
                 case "3":
-                    if (DeleteItem(db, entity.Id))
+                    if (UpdateItemStatus(db, entity.Id, "B"))
                         return 1;
                     break;
                 case "4":
@@ -121,6 +130,7 @@
         return new MesItems
         {
             Id = Convert.ToDecimal(item.Id),
+            ItemId= Convert.ToDecimal(item.Id),
             ItemNo = item.FNumber,
             ItemName = item.FName,
             ItemModel = item.FSpecification,
@@ -129,7 +139,7 @@
             Highlimit = item.FMaxStock,
             PrdPack = item.FMinPackCount,
             DepotCode = item.FStockId,
-            //Ppbom00019124 = item.PPBOM00019124,
+            Ppbom00019124 = item.PPBOM00019124,
             Fmaterialgroup = item.FMaterialGroup,
             Remarks = item.FDescription,
             Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -142,13 +152,28 @@
             Fforbidstatus = item.FForbidStatus,
             MaterialProperti = item.FErpClsID,
             ProductionWorkshop = item.FWorkShopId,
-            ProduceUnit = item.FPRODUCEUNITID,
-            SubconUnit = item.FSUBCONUNITID,
-            FSubsidiary = item.FSubsidiary,
-            Fumbrella = item.Fumbrella,
-            FLOSSPERCENT  = item.FLOSSPERCENT ,
-            FMnemonicCode = item.FMnemonicCode,
-            FExpPeriod = item.FExpPeriod      ,
+            ProduceUnit = item.Fproduceunitid,
+            SubconUnit = item.Fsubconunitid,
+            CreateOrg = Convert.ToDecimal(item.FCreateOrgId),
+            UseOrg = Convert.ToDecimal(item.FUseOrgId),
+            CustNo = item.F_WWC_TEXT7,
+            F_WWC_TEXT8= item.F_WWC_TEXT8,
+            F_WWC_DECIMAL= item.F_WWC_DECIMAL,
+            F_WWC_DECIMAL1= item.F_WWC_DECIMAL1,
+            F_WWC_DECIMAL2= item.F_WWC_DECIMAL2,
+            F_WWC_DECIMAL3= item.F_WWC_DECIMAL3,
+            F_WWC_DECIMAL4= item.F_WWC_DECIMAL4,
+            FBCN= item.FBCN,
+            FGW=item.FGW,
+            FYJ=item.FYJ,
+            FSB=item.FSB,
+            F_WWC_TEXT1 = item.F_WWC_TEXT1,
+            F_WWC_TEXT2 = item.F_WWC_TEXT2,
+            F_WWC_TEXT3 = item.F_WWC_TEXT3,
+            F_WWC_TEXT4 = item.F_WWC_TEXT4,
+            F_WWC_TEXT5 = item.F_WWC_TEXT5,
+            F_WWC_TEXT6 = item.F_WWC_TEXT6,
+            CreateDate = DateTime.Now,
             Company = "1000",
             Factory = "1000"
         };

--
Gitblit v1.9.3