From 799a463b41e84aa265f109035c08892614ea9fd8 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 24 七月 2025 21:12:32 +0800
Subject: [PATCH] 首检排序
---
MES.Service/service/WomcaaWWManager.cs | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index 8ca6ac1..5afc3bd 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -47,7 +47,8 @@
}) > 0;
}
- private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabss)
+ private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabss)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
@@ -58,16 +59,16 @@
//var orUpdate = base.Insert(mesWomcaa);
//var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabss);
-
+
//鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
var orUpdate = db.Insertable(mesWomcaa)
.IgnoreColumns(true).ExecuteCommand() > 0;
-
+
//鎵归噺鎻掑叆鏁版嵁搴撴椂蹇界暐绌哄瓧娈�
var baOrUpdate = db.Insertable(mesWomcabss).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
-
+
// 瀹氫箟杈撳叆鍙傛暟
var inputParam = mesWomcaa.Erpid;
@@ -87,17 +88,18 @@
};
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA1(:P_ID,:p_flag,:p_text); END;",
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA1(:P_ID,:p_flag,:p_text); END;",
// new SugarParameter("P_ID", inputParam, DbType.Decimal)
parameters.ToArray());
-
+
// 2024-12-09鑾峰彇杈撳嚭鍙傛暟鐨勫��
var resultValue = outputResult.Value?.ToString();
var messageValue = outputMessage.Value?.ToString();
// 2024-12-09 Console.WriteLine(messageValue);
if ("1".Equals(resultValue)) throw new Exception(messageValue);
-
+
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -110,7 +112,7 @@
var insertOrUpdate = db
.Deleteable<Womcab>().In(decimals)
.ExecuteCommand() > 0;
-
+
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -209,7 +211,9 @@
// Caa024 = !string.IsNullOrEmpty(dto.FStockInQuaAuxQty)
// ? Convert.ToDecimal(dto.FStockInQuaAuxQty)
// : null, //鍚堟牸鍝佸叆搴撴暟閲�
- ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") //褰撳墠鏃堕棿
+ ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), //褰撳墠鏃堕棿
+ FbillNo = dto.F_XIFG_Text_zzjxqd, //缁勭粐闂撮渶姹傚崟
+ Moid = Convert.ToDecimal(dto.moid) /// 鐢熶骇璁㈠崟鍒嗗綍鍐呭槢
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -241,20 +245,29 @@
? Convert.ToDecimal(dto.FStdQty)
: null, /// 缁勬垚鐢ㄩ噺 */
//2024-11-15 14锛�05 鐢ㄦ枡娓呭崟鍏嬭浆鍗冨厠
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) && int.TryParse(dto.FUnitID, out int unitId)
- ? (unitId == 10097 ? Convert.ToDecimal(dto.FNeedQty) / 1000 : Convert.ToDecimal(dto.FNeedQty))
- : (decimal?)null,
- Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) && int.TryParse(dto.FUnitID, out int pickedQty)
- ? (pickedQty == 10097
- ? Convert.ToDecimal(dto.FPickedQty) / 1000
- : Convert.ToDecimal(dto.FPickedQty))
- : (decimal?)null,
- Cab009 = int.TryParse(dto.FUnitID, out int unitId1)
- ? (unitId1 == 10097 ? (10095).ToString() : (Convert.ToDecimal(dto.FUnitID)).ToString())
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) &&
+ int.TryParse(dto.FUnitID, out var unitId)
+ ? unitId == 10097
+ ? Convert.ToDecimal(dto.FNeedQty) / 1000
+ : Convert.ToDecimal(dto.FNeedQty)
: null,
- Cab012 = !string.IsNullOrEmpty(dto.FStdQty) && int.TryParse(dto.FUnitID, out int fStdQty)
- ? (fStdQty == 10097 ? Convert.ToDecimal(dto.FStdQty) / 1000 : Convert.ToDecimal(dto.FStdQty))
- : (decimal?)null,
+ Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) &&
+ int.TryParse(dto.FUnitID, out var pickedQty)
+ ? pickedQty == 10097
+ ? Convert.ToDecimal(dto.FPickedQty) / 1000
+ : Convert.ToDecimal(dto.FPickedQty)
+ : null,
+ Cab009 = int.TryParse(dto.FUnitID, out var unitId1)
+ ? unitId1 == 10097
+ ? 10095.ToString()
+ : Convert.ToDecimal(dto.FUnitID).ToString()
+ : null,
+ Cab012 = !string.IsNullOrEmpty(dto.FStdQty) &&
+ int.TryParse(dto.FUnitID, out var fStdQty)
+ ? fStdQty == 10097
+ ? Convert.ToDecimal(dto.FStdQty) / 1000
+ : Convert.ToDecimal(dto.FStdQty)
+ : null,
PositionNo = dto.FPositionNO, /// 浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, /// 渚涘簲缁勭粐
@@ -287,7 +300,7 @@
FMaterialType = dto.FMaterialType, /// 瀛愰」绫诲瀷
Cab020 = !string.IsNullOrEmpty(dto.FACTUALPICKOTY)
? Convert.ToDecimal(dto.FACTUALPICKOTY)
- : null, //瀹為鏁伴噺
+ : null //瀹為鏁伴噺
};
var entity = Db.Queryable<Womcab>()
--
Gitblit v1.9.3