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/SysDepartmentManager.cs | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 764532e..ca70322 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.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;
@@ -28,14 +27,11 @@
if (UpdateDepartmentStatus(db, entity.Id, "B")) // 绂佺敤閮ㄩ棬
return 1;
break;
- case "2":
- if (InsertDepartment(db, entity)) // 鎻掑叆鏂伴儴闂�
- return 1;
- break;
case "3":
if (DeleteDepartment(db, entity.Id)) // 鍒犻櫎閮ㄩ棬
return 1;
break;
+ case "2":
case "4":
if (InsertOrUpdateDepartment(db, entity)) // 鎻掑叆鎴栨洿鏂伴儴闂�
return 1;
@@ -76,8 +72,8 @@
// 鍒犻櫎閮ㄩ棬鐨勬柟娉�
private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
{
- var deleteById = db.Deleteable<SysDepartment>().In(departmentId)
- .ExecuteCommand();
+ var deleteById = db.Deleteable<SysDepartment>()
+ .Where(s => s.Id == departmentId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -88,21 +84,11 @@
private bool InsertOrUpdateDepartment(SqlSugarScope db,
SysDepartment entity)
{
- var exists = db.Queryable<SysDepartment>().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<SysDepartment>()
+ .Where(s => s.Id == entity.Id).ExecuteCommand();
- return false;
+ var insert = db.Insertable(entity).ExecuteCommand();
+ return insert > 0;
}
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
@@ -157,16 +143,12 @@
departmentGroup.Value, "B")) // 鎵归噺绂佺敤閮ㄩ棬
throw new NotImplementedException("绂佺敤澶辫触");
break;
- case "2":
- if (!InsertDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鎻掑叆閮ㄩ棬
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
case "3":
if (!DeleteDepartmentBatch(db,
departmentGroup.Value)) // 鎵归噺鍒犻櫎閮ㄩ棬
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
+ case "2":
case "4":
if (!InsertOrUpdateDepartmentBatch(db,
departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂�
@@ -213,7 +195,9 @@
{
var ids = departmentList.Select(it => it.Id).ToArray();
var deleteByIds =
- db.Deleteable<SysDepartment>().In(ids).ExecuteCommand();
+ db.Deleteable<SysDepartment>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+
if (deleteByIds > 0)
return true;
@@ -224,10 +208,7 @@
private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
List<SysDepartment> departmentList)
{
- foreach (var entity in departmentList)
- if (!InsertOrUpdateDepartment(db, entity))
- return false;
-
- return true;
+ return departmentList.All(
+ entity => InsertOrUpdateDepartment(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3