From e159c28b6d090dc875c878e462ceb45a809315d7 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 11:29:46 +0800
Subject: [PATCH] 111
---
MES.Service/service/BasicData/MesItemsManager.cs | 136 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index b4a7084..6ab9610 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -44,39 +44,15 @@
public bool SaveList(List<ErpItems> items)
{
- var list = items.Select(GetMesItems).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
+ if (items == null || !items.Any())
{
- foreach (var itemGroup in groupBy)
- switch (itemGroup.Key)
- {
- case "0":
- if (!UpdateItemStatusBatch(db, itemGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateItemStatusBatch(db, itemGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "2":
- case "4":
- if (!InsertOrUpdateBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
+ Console.WriteLine("璀﹀憡: 浼犲叆鐨勭墿鏂欏垪琛ㄤ负绌�");
+ return false;
+ }
- return 1;
- }) > 0;
+ // 閫愭潯澶勭悊锛屽叏閮ㄦ垚鍔熸墠杩斿洖true锛堜簨鍔″唴鎵归噺澶勭悊鏇翠紭锛屾澶勪繚鎸佸師鏈夐�昏緫锛�
+ var result = items.Select(Save).ToList();
+ return result.All(b => b);
}
private bool UpdateItemStatus(SqlSugarScope db, decimal itemId,
@@ -113,54 +89,75 @@
private MesItems GetMesItems(ErpItems item)
{
- return new MesItems
+ var entity = new MesItems
{
- Id = Convert.ToDecimal(item.Id),
+ Guid = Guid.NewGuid(),
Type = item.Type,
ItemNo = item.FNumber,
- FOldNumber = item.FOldNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
ItemUnit = item.FBaseUnitId,
- Lowlimit = Convert.ToDouble(item.FSafeStock),
- Highlimit = Convert.ToDouble(item.FMaxStock),
- FMinStock = item.FMinStock,
- PrdPack = Convert.ToDouble(item.FMinPackCount),
DepotCode = item.FStockId,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
- Ffinishreceiptoverrate = Convert.ToDecimal(item.FFinishReceiptOverRate),
- FFinishReceiptShortRate = item.FFinishReceiptShortRate,
Fissuetype = item.FIssueType,
- Fisbatchmanage = Convert.ToInt32(item.FIsBatchManage),
Fpurchaserid = item.FPurchaserId,
- FDefaultVendor = item.FDefaultVendor,
- Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
+ Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
- FDocumentStatus = item.FDocumentStatus,
Fforbidstatus = item.FForbidStatus,
MaterialProperti = item.FErpClsID,
- FMfgPolicyId = item.FMfgPolicyId,
ProductionWorkshop = item.FWorkShopId,
- FBOMUnitId = item.FBOMUnitId,
ProduceUnit = item.FPRODUCEUNITID,
- FIsKitting = item.FIsKitting,
- FIsCoby = item.FIsCoby,
- FOverControlMode = item.FOverControlMode,
SubconUnit = item.FSUBCONUNITID,
- Fumbrella = item.FCreateOrgId,
- FSubsidiary = item.FUseOrgId,
- FLOSSPERCENT = item.FLOSSPERCENT,
+ FSubsidiary = string.IsNullOrEmpty(item.FUseOrgId) ? "1" : item.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(item.FCreateOrgId) ? "1" : item.FCreateOrgId,
+ LossPercent = item.FLOSSPERCENT,
MnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
- EItemId = long.Parse(item.Id),
- ItemId = long.Parse(item.Id),
+ ExpPeriod = item.FExpPeriod,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
+
+ // 鏌ユ壘鏄惁宸插瓨鍦ㄧ浉鍚岀墿鏂欑紪鐮佺殑璁板綍
+ var existingItem = Db.Queryable<MesItems>()
+ .Where(s => s.ItemNo == entity.ItemNo)
+ .First();
+
+ if (existingItem != null)
+ {
+ // 濡傛灉瀛樺湪锛屼娇鐢ㄧ幇鏈夌殑ID锛屽悗缁皢鍒犻櫎鍚庨噸鏂版彃鍏�
+ entity.Id = existingItem.Id;
+ entity.ItemId = existingItem.Id;
+ }
+ else
+ {
+ // 濡傛灉涓嶅瓨鍦紝璁句负0锛孖nsertOrUpdate鏂规硶灏嗙敓鎴愭柊ID
+ entity.Id = 0;
+ entity.ItemId = 0;
+ }
+
+ return entity;
+ }
+
+ /// <summary>
+ /// 鐢熸垚鏂扮殑ID锛岀‘淇濅笉閲嶅
+ /// </summary>
+ private decimal GenerateNewId()
+ {
+ // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
+ var maxId = Db.Queryable<MesItems>().Max(x => (decimal?)x.Id) ?? 0;
+ var newId = maxId + 1;
+
+ // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
+ while (Db.Queryable<MesItems>().Where(x => x.Id == newId).Any())
+ {
+ newId++;
+ }
+
+ return newId;
}
private bool UpdateItemStatusBatch(SqlSugarScope db,
@@ -199,11 +196,30 @@
private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
{
- db.Deleteable<MesItems>().Where(s => s.Id == entity.Id)
- .ExecuteCommand();
-
- var insert = db.Insertable(entity).ExecuteCommand();
- return insert > 0;
+ // 纭繚ItemId涓嶪d淇濇寔涓�鑷�
+ entity.ItemId = entity.Id;
+
+ if (entity.Id == 0)
+ {
+ // 鏂板鎯呭喌锛氱敓鎴愭柊ID骞舵彃鍏�
+ var newId = GenerateNewId();
+ entity.Id = newId;
+ entity.ItemId = newId;
+ return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
+ }
+ else
+ {
+ // 鏇存柊鎯呭喌锛氬垹闄ゅ悗閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ var originalId = entity.Id;
+
+ // 鍏堝垹闄ゅ師璁板綍锛堝鏋滃瓨鍦級
+ db.Deleteable<MesItems>().Where(s => s.Id == originalId).ExecuteCommand();
+
+ // 閲嶆柊鎻掑叆锛屼繚鎸佸師鏈塈D
+ entity.Id = originalId;
+ entity.ItemId = originalId;
+ return db.Insertable(entity).IgnoreColumns(ignoreNullColumn:true).ExecuteCommand() > 0;
+ }
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesItems> itemList)
--
Gitblit v1.9.3