From a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 15:38:14 +0800
Subject: [PATCH] 1.仓库信息储存逻辑调整 2.生产订单接口优化。
---
MES.Service/service/BasicData/MesItemsManager.cs | 65 ++++++++++++--------------------
1 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 16761de..e405e58 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -24,15 +23,13 @@
if (UpdateItemStatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
case "3":
if (DeleteItem(db, entity.Id))
return 1;
break;
+ case "2":
case "4":
+ case "5":
if (InsertOrUpdate(db, entity))
return 1;
break;
@@ -64,14 +61,11 @@
if (!UpdateItemStatusBatch(db, itemGroup.Value, "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
- if (!InsertItemBatch(db, itemGroup.Value))
- 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("鍚屾澶辫触");
@@ -109,7 +103,8 @@
private bool DeleteItem(SqlSugarScope db, decimal itemId)
{
- var deleteById = db.Deleteable<MesItems>().In(itemId).ExecuteCommand();
+ var deleteById = db.Deleteable<MesItems>()
+ .Where(s => s.Id == itemId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -121,19 +116,23 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
+ EItemId = long.Parse(item.Id),
+ ItemId = long.Parse(item.Id),
+ Type = item.Type,
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
ItemUnit = item.FBaseUnitId,
- Lowlimit = item.FSafeStock,
- Highlimit = item.FMaxStock,
- PrdPack = item.FMinPackCount,
+ Lowlimit = Convert.ToDouble(item.FSafeStock),
+ Highlimit = Convert.ToDouble(item.FMaxStock),
+ PrdPack = Convert.ToDouble(item.FMinPackCount),
DepotCode = item.FStockId,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
- Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
+ Ffinishreceiptoverrate =
+ Convert.ToDecimal(item.FFinishReceiptOverRate),
Fissuetype = item.FIssueType,
- Fisbatchmanage = item.FIsBatchManage,
+ Fisbatchmanage = Convert.ToInt32(item.FIsBatchManage),
Fpurchaserid = item.FPurchaserId,
Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
Storeunit = item.FStoreUnitID,
@@ -145,14 +144,11 @@
SubconUnit = item.FSUBCONUNITID,
FSubsidiary = item.FUseOrgId,
Fumbrella = item.FCreateOrgId,
- FLOSSPERCENT = item.FLOSSPERCENT,
- FMnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
LastupdateDate = DateTime.Now,
CreateDate = DateTime.Now,
+ MnemonicCode = item.FMnemonicCode,
Company = "1000",
- Factory = "1000",
- ColorName = item.FColor
+ Factory = "1000"
};
}
@@ -182,7 +178,8 @@
private bool DeleteItemBatch(SqlSugarScope db, List<MesItems> itemList)
{
var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
+ var deleteByIds = db.Deleteable<MesItems>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
if (deleteByIds > 0)
return true;
@@ -191,29 +188,15 @@
private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
{
- var exists = db.Queryable<MesItems>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
+ db.Deleteable<MesItems>().Where(s => s.Id == entity.Id)
+ .ExecuteCommand();
- return false;
+ var insert = db.Insertable(entity).ExecuteCommand();
+ return insert > 0;
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesItems> itemList)
{
- foreach (var entity in itemList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return itemList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3