From 41975878bf0b8d3632d8c5f21714502a57632070 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 23 七月 2025 16:08:39 +0800
Subject: [PATCH] 紧急放行修改
---
StandardInterface/MES.Service/service/CgthSqManager.cs | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/service/CgthSqManager.cs b/StandardInterface/MES.Service/service/CgthSqManager.cs
index da29100..59e979c 100644
--- a/StandardInterface/MES.Service/service/CgthSqManager.cs
+++ b/StandardInterface/MES.Service/service/CgthSqManager.cs
@@ -67,7 +67,8 @@
YsFs = dto.Ys_fs, //楠屾敹鏂瑰紡
Bz = dto.bz, //澶囨敞
Erpid = dto.ERPID, //鍗曟嵁澶磇d
- CreateDate=DateTime.Now,
+ Ydid=dto.yd_id,
+ CreateDate =DateTime.Now,
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
if (single != null) entity.Id = single.Id;
@@ -92,6 +93,7 @@
Eid = dto.eid, //鍗曟嵁澶磇d
Flot=dto.flot, //鎵瑰彿
Fmto=dto.fmoto, //璁″垝璺熻釜鍙�
+ YdflId = dto.ydfl_id, //婧愬崟鍒嗗綍id
Quantity = decimal.TryParse(dto.quantity, out var qtyVal) ? qtyVal : null, //鏁伴噺
};
@@ -113,14 +115,48 @@
private bool UpdateData(SqlSugarScope db, CgthSq mesWomCgth,
List<CgthSqDetail> mesWomcabs)
{
- var decimals = mesWomcabs.Select(s => s.Id).ToArray();
+ //var decimals = mesWomcabs.Select(s => s.Id).ToArray();
+
+ //鎵爜涓嶅厑璁稿垹闄�
+ var hasMaterialOut = db.Queryable<MesInvItemOuts>()
+ .Any(x => x.WorkNo == mesWomCgth.BillNo);
+
+ if (hasMaterialOut)
+ {
+ throw new Exception($"MES鏈夐鏂欒褰曪紝鍗曞彿锛歿mesWomCgth.BillNo}锛屼笉鑳藉垹闄わ紒");
+ }
+ /*
var update = base.DeleteById(mesWomCgth.Id);
var insertOrUpdate = db
.Deleteable<CgthSqDetail>().In(decimals)
.ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate) return true;*/
+ // throw new NotImplementedException("鏇存柊澶辫触");
+
+ var decimals = mesWomcabs
+ ?.Where(x => x.Id.HasValue)
+ .Select(x => x.Id.Value)
+ .ToArray() ?? new decimal[0];
+ var update = true;
+ if (mesWomCgth != null)
+ {
+ if (mesWomCgth.Id != null)
+ {
+ update = base.DeleteById(mesWomCgth.Id);
+ }
+ }
+ var insertOrUpdate = true;
+ if (decimals != null && decimals.Length > 0)
+ {
+ insertOrUpdate = db.Deleteable<CgthSqDetail>().In(decimals).ExecuteCommand() > 0;
+ }
+
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
private bool SaveOrUpdateData(SqlSugarScope db, CgthSq mesWomcaa,
--
Gitblit v1.9.3