From eca13a5ffc805ea1252a75dfeae46afd1cdbe701 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 11 十一月 2025 14:48:12 +0800
Subject: [PATCH] 巡检入库检bug修复，物料检验周期字段增加
---
MES.Service/service/BasicData/MesItemsManager.cs | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 321b39a..6d598f3 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);
@@ -33,14 +34,18 @@
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":
+ if (InsertOrUpdate(db, entity))
+ return 1;
+ break;
+ case "5":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -129,6 +134,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
+ ItemId= Convert.ToDecimal(item.Id),
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
@@ -144,16 +150,37 @@
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,
MaterialProperti = item.FErpClsID,
ProductionWorkshop = item.FWorkShopId,
- ProduceUnit = item.FPRODUCEUNITID,
- SubconUnit = item.FSUBCONUNITID,
+ 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"
+ Factory = "1000",
+ F_WWC_FJZQ= item.F_WWC_FJZQ
};
}
--
Gitblit v1.9.3