From 0c1a03e880bbf795b771a9c8ee4b7b271c262b58 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 12 九月 2025 14:23:56 +0800
Subject: [PATCH] 切换验收数据库
---
MES.Service/service/WomcaaManager.cs | 96 ++++++++++++++++++-----------------------------
1 files changed, 37 insertions(+), 59 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 9a109f5..178f20c 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,10 +23,8 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
-
var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FBillNo);
- var mesWomcabs =
- MapErpCABtoWomcab(wom.ErpCabs);
+ var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs);
return UseTransaction(db =>
{
@@ -38,35 +36,29 @@
case "4":
//kyy 2024-09-13 鍙樻洿
case "5":
- return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException($"type娌℃湁{womErpCaa.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
{
if (StringUtil.CheckGuid(mesWomcaa.Guid))
+ {
base.DeleteById(mesWomcaa.Guid);
-
+ }
if (mesWomcabs.Count > 0)
- db.Deleteable<Womcab>()
- .Where(s => s.Pid == mesWomcaa.Erpid).ExecuteCommand();
-
+ {
+ db.Deleteable<Womcab>().Where(s => s.Pid == mesWomcaa.Erpid).ExecuteCommand();
+ }
//鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
- var orUpdate = db.Insertable(mesWomcaa)
- .IgnoreColumns(true).ExecuteCommand() > 0;
+ var orUpdate = db.Insertable(mesWomcaa).IgnoreColumns(true).ExecuteCommand() > 0;
//鎵归噺鎻掑叆蹇界暐绌哄瓧娈�
- var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
- .IgnoreColumnsNull()
- .ExecuteCommand() > 0;
+ var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1).IgnoreColumnsNull().ExecuteCommand() > 0;
// if (orUpdate && baOrUpdate)
// throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -75,11 +67,10 @@
{
// 璋冪敤瀛樺偍杩囩▼鏇存柊鐢ㄦ枡娓呭崟
db.Ado.ExecuteCommand("exec [dbo].[prc_update_womdab] @outMsg output,@outSum output,@inEdtUserGuid,@inCaaGuid",
- new {
- outMsg = (string)null, // 杈撳嚭鍙傛暟
- outSum = (int?)null, // 杈撳嚭鍙傛暟
- inEdtUserGuid = new Guid("11111111-1111-1111-1111-111111111111"),
- inCaaGuid = new Guid(mesWomcaa.Guid.ToString())
+ new { outMsg = (string)null, // 杈撳嚭鍙傛暟
+ outSum = (int?)null, // 杈撳嚭鍙傛暟
+ inEdtUserGuid = new Guid("11111111-1111-1111-1111-111111111111"),
+ inCaaGuid = new Guid(mesWomcaa.Guid.ToString())
});
return true;
}
@@ -88,16 +79,16 @@
}
- private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs)
{
var decimals = mesWomcabs.Select(s => s.Guid).ToArray();
var update = base.DeleteById(mesWomcaa.Guid);
- var insertOrUpdate = db
- .Deleteable<Womcab>().In(decimals)
- .ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -116,22 +107,17 @@
Caa023 = dto.FStatus, /// 鐘舵�� 瀹屽伐锛屾湭瀹屽伐
Caa006 = dto.FMaterialId, /// 浜у搧缂栫爜
Caa009 = dto.FUnitId, /// 鍗曚綅
- Caa012 = !string.IsNullOrEmpty(dto.FQty)
- ? Convert.ToDecimal(dto.FQty)
- : null, /// 鏁伴噺
+ Caa012 = !string.IsNullOrEmpty(dto.FQty) ? Convert.ToDecimal(dto.FQty) : null, /// 鏁伴噺
WorkGroupId = dto.FWorkGroupId, /// 璁″垝缁�
PlanId = dto.FPlannerID, /// 璁″垝鍛�
Caa010 = dto.FPlanStartDate, /// 棰勮寮�宸ユ椂闂�
Caa011 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿
- Caa005 = DateTime.TryParse(dto.FConveyDate, out var conveyDate)
- ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate.ToString())
- : null, /// 寮�鍗曟棩鏈�
+ Caa005 = DateTime.TryParse(dto.FConveyDate, out var conveyDate) ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate.ToString()) : null, /// 寮�鍗曟棩鏈�
StockInlimith = dto.FStockInLimitH, /// 鍏ュ簱涓婇檺
StockInlimitl = dto.FStockInLimitL, /// 鍏ュ簱涓嬮檺
Mtono = dto.FMTONO, /// 璁″垝璺熻釜鍙�
Lot = dto.FLot, /// 鎵瑰彿
Caa013 = dto.FBomId, /// BOM鐗堟
-
CreateType = dto.FCreateType, /// 鐢熸垚鏂瑰紡
SrcBillType = dto.FSrcBillType, /// 婧愬崟绫诲瀷
SrcBillNo = dto.FSrcBillNo, /// 婧愬崟缂栧彿
@@ -142,13 +128,8 @@
CloseType = dto.FCloseType, /// 缁撴绫诲瀷
SrcSplitBillno = dto.FSrcSplitBillNo, /// 婧愭媶鍒嗚鍗曠紪鍙�
Caa016 = dto.FDESCRIPTION, /// 澶囨敞
-
- Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
- ? Convert.ToInt32(dto.PLAN_ID)
- : null, /// ERP婧愬崟ID
- Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
- ? Convert.ToInt32(dto.PLAN_SEQ)
- : null, /// ERP婧愬崟琛屽彿
+ Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID) ? Convert.ToInt32(dto.PLAN_ID) : null, /// ERP婧愬崟ID
+ Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ) ? Convert.ToInt32(dto.PLAN_SEQ) : null, /// ERP婧愬崟琛屽彿
Caa020 = dto.PLAN_NUM, /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
//Caa015 = dto.F_UNW_Text_xsddh, /// 閿�鍞鍗曞彿
ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// 鐢熶骇缁勭粐ID
@@ -171,7 +152,10 @@
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
- if (single != null) entity.Guid = single.Guid;
+ if (single != null)
+ {
+ entity.Guid = single.Guid;
+ }
return entity;
}
@@ -188,12 +172,8 @@
Cab001 = dto.FBillNo, /// 宸ュ崟鍗曞彿
Cab002 = Convert.ToInt32(dto.FSeq), /// 搴忓彿
Cab003 = dto.FMaterialID, /// 鏉愭枡缂栫爜
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
- ? Convert.ToDecimal(dto.FNeedQty)
- : null, /// 闇�棰嗙敤閲�
- Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
- ? Convert.ToDecimal(dto.FPickedQty)
- : null, /// 宸查鐢ㄩ噺
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) ? Convert.ToDecimal(dto.FNeedQty) : null, /// 闇�棰嗙敤閲�
+ Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) ? Convert.ToDecimal(dto.FPickedQty) : null, /// 宸查鐢ㄩ噺
PositionNo = dto.FPositionNO, /// 浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, /// 渚涘簲缁勭粐
IssuingOrganization = dto.FSUPPLYORG, /// 鍙戞枡缁勭粐
@@ -205,15 +185,12 @@
// Cab008 = dto.F_UNW_Text_tpgy, /// 宸ヨ壓
Cab009 = dto.FUnitID, /// 鍗曚綅
SupplyType = dto.FSupplyType, /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
- Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
- ? Convert.ToDecimal(dto.FStdQty)
- : null, /// 缁勬垚鐢ㄩ噺
+ Cab012 = !string.IsNullOrEmpty(dto.FStdQty) ? Convert.ToDecimal(dto.FStdQty) : null, /// 缁勬垚鐢ㄩ噺
Cab014 = dto.FIsKeyItem, /// 鏄惁鏇挎枡
Numerator = dto.FNumerator, /// 鍒嗗瓙
Denominator = dto.FDenominator, /// 鍒嗘瘝
Pid = Convert.ToInt32(dto.PID), /// ERP澶碔D
Eid = Convert.ToInt32(dto.Id), /// ERP ID
-
Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
@@ -223,7 +200,6 @@
Typeb = dto.TypeB,
LW_WLBGY = dto.F_WPVT_TEXT_RE5
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
- //
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
// PackingListNumber = dto.F_XIFG_Text_apv, /// 鍖呰鍗曞彿
// MainProduct = dto.F_XIFG_Base_re5, /// 涓讳骇鍝�
@@ -232,9 +208,11 @@
// ParentItemName = dto.F_XIFG_Base_apv /// 鐖堕」鐗╂枡鍚嶇О
};
- var entity = Db.Queryable<Womcab>()
- .Where(s => s.Eid == womcab.Eid).Single();
- if (entity != null) womcab.Guid = entity.Guid;
+ var entity = Db.Queryable<Womcab>() .Where(s => s.Eid == womcab.Eid).Single();
+ if (entity != null)
+ {
+ womcab.Guid = entity.Guid;
+ }
womcabList.Add(womcab);
}
--
Gitblit v1.9.3