From e853dd2fecef3a0c446d161248d0498a5a081e66 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 17 十二月 2025 18:49:49 +0800
Subject: [PATCH] SJ,XJ,RKJ优化修改
---
StandardInterface/MES.Service/service/WomcaaManager.cs | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 37adb77..24b41ba 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -49,11 +49,23 @@
private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+ /*if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabs.Count > 0)
db.Deleteable<Womcab>()
- .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+ .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();*/
+
+
+ //20251212 鐒曠編鏀规垚鍗曞彿鍒犻櫎
+ // 鍒犻櫎涓昏〃锛氭寜 Caa001 鍒犻櫎鏃у崟鎹�
+ db.Deleteable<Womcaa>()
+ .Where(s => s.Caa001 == mesWomcaa.Caa001)
+ .ExecuteCommand();
+
+ // 鍒犻櫎瀛愯〃锛氭寜 Cab001 鍒犻櫎鎵�鏈夋棫琛�
+ db.Deleteable<Womcab>()
+ .Where(s => s.Cab001 == mesWomcaa.Caa001)
+ .ExecuteCommand();
//鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
var orUpdate = db.Insertable(mesWomcaa)
@@ -122,7 +134,7 @@
// 鎻愪氦浜嬪姟
db.Ado.CommitTran();
-
+/*
var decimals = mesWomcabs.Select(s => s.Id).ToArray();
var update = true;
@@ -145,7 +157,19 @@
return true;
}
throw new NotImplementedException("鏇存柊澶辫触");
-
+ */
+ //20251212 鐒曠編鏀规垚鍗曞彿鍒犻櫎
+ // 鍒犻櫎涓昏〃锛氭寜 Caa001 鍒犻櫎鏃у崟鎹�
+ db.Deleteable<Womcaa>()
+ .Where(s => s.Caa001 == mesWomcaa.Caa001)
+ .ExecuteCommand();
+
+ // 鍒犻櫎瀛愯〃锛氭寜 Cab001 鍒犻櫎鎵�鏈夋棫琛�
+ db.Deleteable<Womcab>()
+ .Where(s => s.Cab001 == mesWomcaa.Caa001)
+ .ExecuteCommand();
+ return true;
+
}
private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
@@ -278,6 +302,7 @@
Sjxs=dto.SJ_xs,
Nextgx=dto.NEXT_Gx,
Rks=dto.RKS,
+ Khwlbm=dto.KHWLBM,
//娌冨皵鏂板
// WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
//WR_F_SCDD_XH = dto.F_SCDD_XH
@@ -302,8 +327,10 @@
Cab001 = dto.FBillNo, //鍗曟嵁缂栧彿
Cab002 = dto.FSeq, //搴忓彿
Cab003 = dto.FMaterialID, //瀛愰」鐗╂枡缂栫爜
- Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
- MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ // Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ Cab006 = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ MustQty = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ // MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
Cab007 = Convert.ToDecimal(dto.FPickedQty), //宸查鏁伴噺
PositionNo = dto.FPositionNO, //浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, //渚涘簲缁勭粐
--
Gitblit v1.9.3