From 8684d3db5566311dcf7631b5da52ca3bc2228423 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 16 十二月 2025 18:39:11 +0800
Subject: [PATCH] 采购订单、生产订单优化：优化
---
MES.Service/service/BasicData/MesItemsManager.cs | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index c34f099..cf1dd48 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -164,7 +164,7 @@
Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
- //Fforbidstatus = item.FForbidStatus,
+ Fforbidstatus = item.FForbidStatus,//鍚敤涓庣鐢�
MaterialProperti = item.FErpClsID,
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
@@ -311,21 +311,57 @@
}
else
{
- entity.SubconUnit = "0";
+ entity.DepotCode = "0";
}
- // ERP: Y=鏈鐢�, N=绂佺敤
- // MES: A=鏈鐢�, B=绂佺敤
- if (string.IsNullOrEmpty(item.FForbidStatus))
+ //閲囪喘鍛樼紪鐮佽浆ID,Fpurchaserid = item.FPurchaserId,
+ var entityFpurchaserid = Db.Queryable<MesStaff>()
+ .Where(x => x.StaffNo == item.FPurchaserId)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityFpurchaserid))
{
- entity.Fforbidstatus = "A";
+ entity.Fpurchaserid = entityFpurchaserid;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FPurchaserId))
+ {
+ entity.Fpurchaserid = item.FPurchaserId;
}
else
{
- //鎴戞湡鏈涚殑鍊兼槸A=鍚敤,B=绂佺敤
- //瀹為檯缁欐垜鐨勫�兼槸Y鎴朜锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
- entity.Fforbidstatus = item.FForbidStatus == "N" ? "B" : "A";
+ entity.Fpurchaserid = "0";
}
+
+ //宸ヤ綔涓績缂栫爜杞琁D,ProductionWorkshop = item.FWorkShopId,
+ var entityProductionWorkshop = Db.Queryable<SysDepartment>()
+ .Where(x => x.WorkshopCenterCode == item.FWorkShopId)
+ .Select(x => x.Id.ToString())
+ .First();
+ if (!string.IsNullOrWhiteSpace(entityProductionWorkshop))
+ {
+ entity.ProductionWorkshop = entityProductionWorkshop;
+ }
+ else if (!string.IsNullOrWhiteSpace(item.FWorkShopId))
+ {
+ entity.ProductionWorkshop = item.FWorkShopId;
+ }
+ else
+ {
+ entity.ProductionWorkshop = "0";
+ }
+
+ //// ERP: Y=鏈鐢�, N=绂佺敤
+ //// MES: A=鏈鐢�, B=绂佺敤
+ //if (string.IsNullOrEmpty(item.FForbidStatus))
+ //{
+ // entity.Fforbidstatus = "A";
+ //}
+ //else
+ //{
+ // //鎴戞湡鏈涚殑鍊兼槸A=鍚敤,B=绂佺敤
+ // //瀹為檯缁欐垜鐨勫�兼槸Y鎴朜锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+ // entity.Fforbidstatus = item.FForbidStatus == "N" ? "B" : "A";
+ //}
return entity;
}
@@ -348,17 +384,8 @@
return newId;
}
- /// <summary>
- /// 鍚敤涓庣鐢�"Y"銆�"N" 杞崲涓� "A"銆�"B"
- /// </summary>
- /// <param name="db"></param>
- /// <param name="itemList"></param>
- /// <param name="inputStatus"></param>
- /// <returns></returns>
- /// <exception cref="NotImplementedException"></exception>
- private bool UpdateItemStatusBatch(SqlSugarScope db,List<MesItems> itemList, string inputStatus)
+ private bool UpdateItemStatusBatch(SqlSugarScope db,List<MesItems> itemList, string status)
{
- var status = (inputStatus == "Y") ? "A" : (inputStatus == "N") ? "B" : inputStatus;
var ids = itemList.Select(it => it.Id).ToArray();
var result = db.Updateable<MesItems>()
.SetColumns(s => s.Fforbidstatus == status)
--
Gitblit v1.9.3