From 77a6ef8c94bd440919e4b925485215ae92190d81 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 23 十月 2024 11:12:00 +0800
Subject: [PATCH] 接口修正
---
MES.Service/Dto/webApi/ErpItemType.cs | 2
MES.Service/service/BasicData/MesUnitManager.cs | 34 +++++-----------
MES.Service/service/BasicData/MesCustomerManager.cs | 14 ++-----
MES.Service/service/BasicData/OrganizeManager.cs | 6 --
MES.Service/service/BasicData/MesSupplierManager.cs | 9 +---
MES.Service/service/BasicData/MesDepotsManager.cs | 13 ++----
MES.Service/service/BasicData/MesItemsManager.cs | 6 --
MES.Service/service/BasicData/SysDepartmentManager.cs | 7 +--
MES.Service/service/BasicData/MesItemTypeManager.cs | 2
9 files changed, 29 insertions(+), 64 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpItemType.cs b/MES.Service/Dto/webApi/ErpItemType.cs
index 69930bd..50268b0 100644
--- a/MES.Service/Dto/webApi/ErpItemType.cs
+++ b/MES.Service/Dto/webApi/ErpItemType.cs
@@ -4,7 +4,7 @@
{
public string? Type { get; set; }
public string Id { get; set; }
- public string? FPARENTID { get; set; }
+ public string? FParentId { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index cb96e29..b470cb1 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -139,7 +139,8 @@
LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000",
- DataType = customer.FDocumentStatus
+ DataType = customer.FDocumentStatus,
+ Type = customer.Type
};
}
@@ -186,19 +187,12 @@
var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- return false;
+ return insert > 0;
}
private bool InsertOrUpdateBatch(SqlSugarScope db,
List<MesCustomer> customerList)
{
- foreach (var entity in customerList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return customerList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index f1c7591..c0ba2db 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -71,8 +71,8 @@
// 鍒犻櫎浠撳簱鐨勬柟娉�
private bool DeleteDepot(SqlSugarScope db, decimal depotId)
{
- var deleteById = db.Deleteable<MesDepots>().In(depotId)
- .ExecuteCommand();
+ var deleteById = db.Deleteable<MesDepots>()
+ .Where(s => s.DepotId == depotId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -195,7 +195,8 @@
{
var ids = depotList.Select(it => it.DepotId).ToArray();
var deleteByIds =
- db.Deleteable<MesDepots>().In(ids).ExecuteCommand();
+ db.Deleteable<MesDepots>()
+ .Where(s => ids.Contains(s.DepotId)).ExecuteCommand();
if (deleteByIds > 0)
return true;
@@ -206,10 +207,6 @@
private bool InsertOrUpdateBatch(SqlSugarScope db,
List<MesDepots> depotList)
{
- foreach (var entity in depotList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return depotList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index d027747..00f6ce3 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -54,7 +54,7 @@
return new MesItemType
{
Id = Convert.ToDecimal(department.Id),
- Pgroup = department.FPARENTID,
+ Pgroup = department.FParentId,
Tcode = department.FNumber,
Tname = department.FName,
Description = department.FDescription,
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index bb2e9a0..7950d63 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -199,10 +199,6 @@
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
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 2cac024..ab29530 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -166,7 +166,8 @@
List<MesSupplier> supplierList)
{
var ids = supplierList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesSupplier>().In(ids).ExecuteCommand();
+ var deleteByIds = db.Deleteable<MesSupplier>()
+ .Where(s=>ids.Contains(s.Id)).ExecuteCommand();
if (deleteByIds > 0)
return true;
@@ -188,10 +189,6 @@
private bool InsertOrUpdateBatch(SqlSugarScope db,
List<MesSupplier> supplierList)
{
- foreach (var entity in supplierList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
+ return supplierList.All(entity => InsertOrUpdate(db, entity));
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 5e71919..afe9e5d 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -108,7 +108,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;
@@ -134,7 +135,8 @@
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ Type = unit.Type
};
}
@@ -164,35 +166,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
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index a9b7cc8..9dac857 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -176,10 +176,6 @@
private bool InsertOrUpdateBatch(SqlSugarScope db,
List<SysOrganization> 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
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 81d2e93..bc88536 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -215,10 +215,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