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/WomcaaManager.cs | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 9de5e9d..bd15c94 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -48,7 +48,7 @@
}) > 0;
}
- private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
+ private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
@@ -63,16 +63,16 @@
//鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
var orUpdate = db.Insertable(mesWomcaa)
.IgnoreColumns(true).ExecuteCommand() > 0;
-
+
//鎵归噺鎻掑叆鏁版嵁搴撴椂蹇界暐绌哄瓧娈�
var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
- // 瀹氫箟杈撳叆鍙傛暟
+ // 瀹氫箟杈撳叆鍙傛暟
var inputParam = mesWomcaa.Erpid;
// // 2024-12-09瀹氫箟杈撳嚭鍙傛暟
- var outputResult = new SugarParameter("p_flag", null,
+ var outputResult = new SugarParameter("p_flag", null,
DbType.Int32, ParameterDirection.Output,
4000);
var outputMessage = new SugarParameter("p_text", null,
@@ -86,11 +86,12 @@
outputMessage
};
- // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA1(:P_ID,:p_flag,:p_text); END;",
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ 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();
@@ -107,20 +108,16 @@
var decimals = mesWomcabs.Select(s => s.Id).Distinct().ToArray();
var update = false;
- if (mesWomcaa.Id != null)
- {
- update = base.DeleteById(mesWomcaa.Id);
- }
+ if (mesWomcaa.Id != null) update = base.DeleteById(mesWomcaa.Id);
- var array = decimals.Where(s => s.HasValue).Select(s => s.Value).ToArray();
+ var array = decimals.Where(s => s.HasValue).Select(s => s.Value)
+ .ToArray();
var insertOrUpdate = false;
if (array.Length > 0)
- {
insertOrUpdate = db
.Deleteable<Womcab>().In(decimals)
.ExecuteCommand() > 0;
- }
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
@@ -159,7 +156,7 @@
SrcBillType = dto.FSrcBillType, /// 婧愬崟绫诲瀷
SrcBillNo = dto.FSrcBillNo, /// 婧愬崟缂栧彿
SrcBillentryseq = dto.FSrcBillEntrySeq, /// 婧愬崟鍒嗗綍琛屽彿
- SaleOrderNo = dto.FSaleOrderNo, /// 闇�姹傚崟鎹彿
+ SaleOrderNo = dto.F_XIFG_Text_qtr, /// 閿�鍞鍗曞彿
SaleOrderEntryseq = dto.FSaleOrderEntrySeq, /// 闇�姹傚崟鎹鍙�
ForceCloserid = dto.FForceCloserId, /// 缁撴浜�
CloseType = dto.FCloseType, /// 缁撴绫诲瀷
@@ -173,7 +170,7 @@
? Convert.ToDecimal(dto.PLAN_SEQ)
: null, /// ERP婧愬崟琛屽彿
Caa020 = dto.PLAN_NUM, /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
- Caa015 = dto.F_UNW_Text_xsddh, /// 閿�鍞鍗曞彿
+ Caa015 = dto.FSaleOrderNo, /// 闇�姹傚崟鎹彿
Caa024 = !string.IsNullOrEmpty(dto.Caa024)
? Convert.ToDecimal(dto.Caa024)
: null, //宸插叆搴撴暟閲�
@@ -191,7 +188,8 @@
//? Convert.ToDecimal(dto.FStockInQuaAuxQty)
// : null,//鍚堟牸鍝佸叆搴撴暟閲�
ErpUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), //褰撳墠鏃堕棿
- FbillNo = dto.F_XIFG_Text_zzjxqd //缁勭粐闂撮渶姹傚崟
+ FbillNo = dto.F_XIFG_Text_zzjxqd, //缁勭粐闂撮渶姹傚崟
+ Moid = Convert.ToDecimal(dto.moid) /// 鐢熶骇璁㈠崟鍒嗗綍鍐呭槢
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -224,20 +222,29 @@
: null, /// 缁勬垚鐢ㄩ噺 */
//Cab009 = dto.FUnitID,/// 鍗曚綅
//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, /// 渚涘簲缁勭粐
IssuingOrganization = dto.FSUPPLYORG, /// 鍙戞枡缁勭粐
@@ -262,11 +269,12 @@
CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
PackingListNumber = dto.F_XIFG_Text_apv, /// 鍖呰鍗曞彿
MainProduct = dto.F_XIFG_Base_re5, /// 涓讳骇鍝�
- MainProductQty = Convert.ToDecimal(dto.F_XIFG_Qty_apv), /// 涓讳骇鍝佹暟閲�
+ MainProductQty =
+ Convert.ToDecimal(dto.F_XIFG_Qty_apv), /// 涓讳骇鍝佹暟閲�
ParentItemName = dto.F_XIFG_Base_apv, /// 鐖堕」鐗╂枡鍚嶇О
Cab020 = !string.IsNullOrEmpty(dto.FACTUALPICKOTY)
? Convert.ToDecimal(dto.FACTUALPICKOTY)
- : null, //瀹為鏁伴噺
+ : null //瀹為鏁伴噺
};
var entity = Db.Queryable<Womcab>()
--
Gitblit v1.9.3