From 451b0f45516d5c571c3eb15fd567a8f61a78a70e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 11 十二月 2025 11:26:31 +0800
Subject: [PATCH] 物料单位编码转ID
---
MES.Service/service/BasicData/MesItemsManager.cs | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 36ff2a1..7697f7e 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -133,7 +133,7 @@
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
- ItemUnit = item.FBaseUnitId,
+ ItemUnit = item.FBaseUnitId,//鐗╂枡鍩烘湰鍗曚綅缂栫爜杞琁D
Lowlimit = Convert.ToDouble(item.FSafeStock),
Highlimit = Convert.ToDouble(item.FMaxStock),
PrdPack = Convert.ToDouble(item.FMinPackCount),
@@ -142,7 +142,15 @@
Remarks = item.FDescription,
Ffinishreceiptoverrate =
Convert.ToDecimal(item.FFinishReceiptOverRate),
- Fissuetype = item.FIssueType,
+ //鍙戞枡鏂瑰紡
+ Fissuetype = item.FIssueType switch
+ {
+ "1" => "閫愭壒棰嗘枡",
+ "2" => "鑷姩鎵ｆ枡",
+ _ => item.FIssueType
+ },
+ //Fissuetype = item.FIssueType,
+
//鎵瑰彿绠＄悊
Fisbatchmanage = item.FIsBatchManage switch
{
@@ -180,6 +188,113 @@
FSubsidiary = string.IsNullOrEmpty(item.FUseOrgId) ? "1" : item.FUseOrgId,
Fumbrella = string.IsNullOrEmpty(item.FCreateOrgId) ? "1" : item.FCreateOrgId,
};
+ //鐗╂枡鍩烘湰鍗曚綅缂栫爜杞琁D,ItemUnit = item.FBaseUnitId
+ var entityItemUnit = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FBaseUnitId)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityItemUnit))
+ {
+ entity.ItemUnit = entityItemUnit;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FBaseUnitId))
+ {
+ entity.ItemUnit = item.FBaseUnitId;
+ }
+ else
+ {
+ entity.ItemUnit = "0";
+ }
+
+ //鐗╂枡閿�鍞崟浣嶇紪鐮佽浆ID,Saleunit = item.FSaleUnitId
+ var entitySaleunit = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FSaleUnitId)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entitySaleunit))
+ {
+ entity.Saleunit = entitySaleunit;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FSaleUnitId))
+ {
+ entity.Saleunit = item.FSaleUnitId;
+ }
+ else
+ {
+ entity.Saleunit = "0";
+ }
+
+ //鐗╂枡搴撴埧鍗曚綅缂栫爜杞琁D,Storeunit = item.FStoreUnitID
+ var entityStoreunit = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FStoreUnitID)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityStoreunit))
+ {
+ entity.Storeunit = entityStoreunit;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FStoreUnitID))
+ {
+ entity.Storeunit = item.FStoreUnitID;
+ }
+ else
+ {
+ entity.Storeunit = "0";
+ }
+
+ //鐗╂枡閲囪喘鍗曚綅缂栫爜杞琁D,Fpurchaseunitid = item.FPurchaseUnitId
+ var entityFpurchaseunitid = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FPurchaseUnitId)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityFpurchaseunitid))
+ {
+ entity.Fpurchaseunitid = entityFpurchaseunitid;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FPurchaseUnitId))
+ {
+ entity.Fpurchaseunitid = item.FPurchaseUnitId;
+ }
+ else
+ {
+ entity.Fpurchaseunitid = "0";
+ }
+
+ //鐗╂枡鐢熶骇鍗曚綅缂栫爜杞琁D,ProduceUnit = item.FPRODUCEUNITID
+ var entityProduceUnit = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FPRODUCEUNITID)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityProduceUnit))
+ {
+ entity.ProduceUnit = entityProduceUnit;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FPRODUCEUNITID))
+ {
+ entity.ProduceUnit = item.FPRODUCEUNITID;
+ }
+ else
+ {
+ entity.ProduceUnit = "0";
+ }
+
+ //鐗╂枡濮斿鍗曚綅缂栫爜杞琁D,SubconUnit = item.FSUBCONUNITID
+ var entitySubconUnit = Db.Queryable<MesUnit>()
+ .Where(x => x.Fnumber == item.FSUBCONUNITID)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entitySubconUnit))
+ {
+ entity.SubconUnit = entitySubconUnit;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FSUBCONUNITID))
+ {
+ entity.SubconUnit = item.FSUBCONUNITID;
+ }
+ else
+ {
+ entity.SubconUnit = "0";
+ }
// ERP: 0=鏈鐢�, 1=绂佺敤
// MES: A=鏈鐢�, B=绂佺敤
--
Gitblit v1.9.3