From 33f1ccf15665ea01069253626934da81e63eff01 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 23 十月 2024 15:40:33 +0800
Subject: [PATCH] 采购订单接口更新
---
MES.Service/Modes/MesRohInData.cs | 2 +-
MES.Service/service/BasicData/MesRohInManager.cs | 56 ++++++++++----------------------------------------------
2 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 89f1efe..140639d 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -313,7 +313,7 @@
/// 涓婚敭ID
/// </summary>
[SugarColumn(ColumnName = "ID")]
- public int Id { get; set; }
+ public long Id { get; set; }
/// <summary>
/// ERP绯荤粺涓殑ID
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index ddfda86..5d60550 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -36,58 +36,20 @@
}) > 0;
}
- // 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesRohIn mesRohIn,
- List<MesRohInData> mesRohInDatas, string FBILLTYPE)
- {
- switch (FBILLTYPE)
- {
- case "A":
- {
- var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
-
- if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id);
-
- if (decimals.Length > 0)
- db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand();
-
- var insert = base.Insert(mesRohIn);
- var insertRange =
- rohInDataManager.InsertRange(mesRohInDatas);
-
- if (insert && insertRange) return true;
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
- case "B":
- {
- var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
- if (base.DeleteById(mesRohIn.Id) && db
- .Deleteable<MesRohInData>().In(decimals)
- .ExecuteCommand() > 0)
- {
- var insert = base.Insert(mesRohIn);
- var insertRange =
- rohInDataManager.InsertRange(mesRohInDatas);
-
- if (insert && insertRange) return true;
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- break;
- }
- }
-
- throw new NotImplementedException("閲囪喘璁㈠崟绫诲瀷閿欒");
- }
// 鏇存柊鏁版嵁鐨勬柟娉�
private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
- var update = base.DeleteById(mesRohIn.Id);
+
+ var update = db.Deleteable<MesRohIn>()
+ .Where(a => a.Id == mesRohIn.Id)
+ .ExecuteCommand() > 0;
+
var insertOrUpdate = db
- .Deleteable<MesRohInData>().In(decimals)
+ .Deleteable<MesRohInData>()
+ .Where(s => decimals.Contains(s.Id))
.ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
@@ -98,7 +60,9 @@
private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn,
List<MesRohInData> mesRohInDatas)
{
- if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id);
+ if (mesRohIn.Id != null)
+ db.Deleteable<MesRohIn>().Where(s => s.Id == mesRohIn.Id)
+ .ExecuteCommand();
if (mesRohInDatas.Count > 0)
db.Deleteable<MesRohInData>()
--
Gitblit v1.9.3