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/MesUnitManager.cs | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 5e71919..1223f7e 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -23,14 +23,11 @@
if (UpdateUnitStatus(db, entity.Id, "B"))
return 1;
break;
- case "2":
- if (InsertUnit(db, entity))
- return 1;
- break;
case "3":
if (DeleteUnit(db, entity.Id))
return 1;
break;
+ case "2":
case "4":
if (InsertOrUpdate(db, entity))
return 1;
@@ -63,14 +60,11 @@
if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
- if (!InsertUnitBatch(db, unitGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
case "3":
if (!DeleteUnitBatch(db, unitGroup.Value))
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
+ case "2":
case "4":
if (!InsertOrUpdateBatch(db, unitGroup.Value))
throw new NotImplementedException("鍚屾澶辫触");
@@ -108,7 +102,8 @@
private bool DeleteUnit(SqlSugarScope db, decimal unitId)
{
- var deleteById = db.Deleteable<MesUnit>().In(unitId).ExecuteCommand();
+ var deleteById = db.Deleteable<MesUnit>()
+ .Where(s => s.Id == unitId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -123,7 +118,7 @@
Fnumber = unit.FNumber,
Fname = unit.FName,
Funitgroupid = unit.FUnitGroupId,
- Fconvertdenominator = unit.FConvertDenominator,
+ Fconvertdenominator = Convert.ToDouble(unit.ConvertDenominator),
Fcurrentunitid = unit.FCurrentUnitId,
Fconvertnumerator = unit.FConvertNumerator,
Fbaseunit = unit.FBaseUnit,
@@ -134,7 +129,8 @@
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ Type = unit.Type
};
}
@@ -164,35 +160,21 @@
private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
{
var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
+ var deleteByIds = db.Deleteable<MesUnit>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
return deleteByIds > 0;
}
private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
- var exists = db.Queryable<MesUnit>().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;
- }
-
- return false;
+ db.Deleteable<MesUnit>()
+ .Where(s => s.Id == entity.Id).ExecuteCommand();
+ var insert = db.Insertable(entity).ExecuteCommand();
+ return insert > 0;
}
private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
{
- foreach (var entity in unitList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return unitList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3