From 5c0a3145a36eb4b1bd46dddb896a182a94109254 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期三, 05 十一月 2025 18:42:05 +0800
Subject: [PATCH] 采购订单计划行添加累计收料数量
---
StandardPda/MES.Service/service/BasicData/MesUnitManager.cs | 135 ++------------------------------------------
1 files changed, 8 insertions(+), 127 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs b/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
index a6cb425..b4c77e3 100644
--- a/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesUnitManager.cs
@@ -43,39 +43,8 @@
public bool SaveList(List<ErpUnit> units)
{
- var list = units.Select(GetMesUnit).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var unitGroup in groupBy)
- switch (unitGroup.Key)
- {
- case "0":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
- 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("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unitGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
+ var result = units.Select(Save).ToList();
+ return result.All(b => b);
}
private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,
@@ -89,15 +58,6 @@
return true;
throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnit(SqlSugarScope db, MesUnit entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
}
private bool DeleteUnit(SqlSugarScope db, decimal unitId)
@@ -117,108 +77,29 @@
Fnumber = unit.FNumber,
Fname = unit.FName,
Funitgroupid = unit.FUnitGroupId,
- Fconvertdenominator = unit.FConvertDenominator,
- Fcurrentunitid = unit.FCurrentUnitId,
- Fconvertnumerator = unit.FConvertNumerator,
Fbaseunit = unit.FBaseUnit,
Froundtype = unit.FRoundType,
Fprecision = unit.FPrecision,
Fdescription = unit.FDescription,
- /// <summary>
- /// 鎺ュ彛瀛楁璋冩暣锛氭爣鍑嗙増鎺ュ彛鏂板 ERP鍗曟嵁鐘舵�� 瀛楁銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細<姹犲崡楠�>
- /// 淇敼鏃ユ湡锛�<2024-12-30>
- /// 淇敼璇存槑锛�
- /// - 鍘熶唬鐮侊細绌�
- /// - 淇敼鍚庯細
- ///FDOCUMENTSTATUS = supplier.FDocumentStatus,
- /// </remarks>
- FDOCUMENTSTATUS = unit.FDocumentStatus,
Fforbidstatus = unit.FForbidStatus,
+ DocumentStatus = unit.FDocumentStatus,
+ BaseUomid = unit.BaseUomid,
+ RatioToBase = unit.RatioToBase,
+ RoundValue = unit.RoundValue,
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
}
- private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,
- string status)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var insertRange = db.Insertable(unitList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
- return deleteByIds > 0;
- }
-
- /// <summary>
- /// "鎻掑叆鎴栨洿鏂扮殑鏂规硶"璋冩暣锛氫慨鏀逛负鍏堝垹闄ゅ啀鎻掑叆銆�
- /// </summary>
- /// <remarks>
- /// 淇敼浜猴細姹犲崡楠�
- /// 淇敼鏃ユ湡锛�2024-12-30
- /// 淇敼璇存槑锛歚
- /// </remarks>
-
- ///鍘熶唬鐮�
- //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;
- //}
-
///鏂颁唬鐮�
private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
{
db.Deleteable<MesUnit>()
- .Where(s => s.Id == entity.Id)
- .ExecuteCommand();
+ .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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3