From 3b3e5ca0fc0addf20cb5f7308b7636562746fe4c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 01 九月 2025 14:53:52 +0800
Subject: [PATCH] 基础资料更新
---
MES.Service/service/BasicData/MesItemsManager.cs | 107 +++++++++++++++++++++++++----------------------------
1 files changed, 51 insertions(+), 56 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index b4a7084..87bbcf5 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}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
+ Console.WriteLine("璀﹀憡: 浼犲叆鐨勭墿鏂欏垪琛ㄤ负绌�");
+ return false;
+ }
+
+ // 閫愭潯澶勭悊锛屽叏閮ㄦ垚鍔熸墠杩斿洖true锛堜簨鍔″唴鎵归噺澶勭悊鏇翠紭锛屾澶勪繚鎸佸師鏈夐�昏緫锛�
+ var result = items.Select(Save).ToList();
+ return result.All(b => b);
}
private bool UpdateItemStatus(SqlSugarScope db, decimal itemId,
@@ -113,54 +89,73 @@
private MesItems GetMesItems(ErpItems item)
{
- return new MesItems
+ var id = string.IsNullOrEmpty(item.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : long.Parse(item.Id);
+ var entity = new MesItems
{
- Id = Convert.ToDecimal(item.Id),
+ Id = id,
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),
+ // Lowlimit = !string.IsNullOrEmpty(item.FSafeStock)
+ // ? Convert.ToDecimal(item.FSafeStock)
+ // : null,
+ // Highlimit = !string.IsNullOrEmpty(item.FMaxStock)
+ // ? Convert.ToDecimal(item.FMaxStock)
+ // : null,
+ // PrdPack = !string.IsNullOrEmpty(item.FMinPackCount)
+ // ? Convert.ToDecimal(item.FMinPackCount)
+ // : null,
DepotCode = item.FStockId,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
- Ffinishreceiptoverrate = Convert.ToDecimal(item.FFinishReceiptOverRate),
- FFinishReceiptShortRate = item.FFinishReceiptShortRate,
+ // Ffinishreceiptoverrate =
+ // !string.IsNullOrEmpty(item.FFinishReceiptOverRate)
+ // ? Convert.ToInt32(item.FFinishReceiptOverRate)
+ // : null,
Fissuetype = item.FIssueType,
- Fisbatchmanage = Convert.ToInt32(item.FIsBatchManage),
+ // Fisbatchmanage = !string.IsNullOrEmpty(item.FIsBatchManage)
+ // ? Convert.ToInt32(item.FIsBatchManage)
+ // : null,
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,
+ EItemId = id,
+ ItemId = id,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
+
+ var mesItems = Db.Queryable<MesItems>()
+ .Where(s => s.ItemNo == entity.ItemNo)
+ .First();
+
+ if (mesItems != null)
+ {
+ entity.Id = mesItems.Id;
+ }
+
+ return entity;
}
private bool UpdateItemStatusBatch(SqlSugarScope db,
--
Gitblit v1.9.3