From 049fc9943d3baf55c64faf5fbd0e944c58c80a2b Mon Sep 17 00:00:00 2001 From: zyf <1071160500@qq.com> Date: 星期五, 06 六月 2025 10:15:02 +0800 Subject: [PATCH] 入库检更新工单完工时间 --- MES.Service/service/WomcaaManager.cs | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs index 8e52cfb..b72a183 100644 --- a/MES.Service/service/WomcaaManager.cs +++ b/MES.Service/service/WomcaaManager.cs @@ -4,6 +4,7 @@ using SqlSugar; namespace MES.Service.service; +using DbType = System.Data.DbType; public class WomcaaManager : Repository<Womcaa> { @@ -16,6 +17,7 @@ public bool SaveList(List<ErpWOM> rohIns) { var result = rohIns.Select(Save).ToList(); + return result.All(b => b); } @@ -34,7 +36,6 @@ return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; case "2": case "4": - case "5": return SaveOrUpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; @@ -56,8 +57,18 @@ var orUpdate = base.Insert(mesWomcaa); var baOrUpdate = _womcabManager.InsertRange(mesWomcabs); + + var inputParam = mesWomcaa.Erpid; + + // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼ + Db.Ado.ExecuteCommand( + "BEGIN PRC_UPDATE_DAA(:P_ID); END;", + new SugarParameter("P_ID", inputParam, + DbType.Decimal)); + if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�"); + } private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, @@ -79,7 +90,9 @@ { Erpid = Convert.ToDecimal(dto.Id), Caa001 = dto.FBillNo, - Caa021 = dto.FWorkShopID, + Caa021 = dto.FWorkShopID0, + RoutingId = dto.FRoutingId, + WorkShopId = dto.FREMWorkShopId, DepotCode = dto.FStockId, CreateDate = dto.FDate, Caa004 = dto.FBillType, @@ -99,6 +112,7 @@ Mtono = dto.FMTONO, Lot = dto.FLot, Caa013 = dto.FBomId, + Caa015 = dto.F_UNW_Text_xsddh, CreateType = dto.FCreateType, SrcBillType = dto.FSrcBillType, SrcBillNo = dto.FSrcBillNo, @@ -108,10 +122,11 @@ ForceCloserid = dto.FForceCloserId, CloseType = dto.FCloseType, SrcSplitBillno = dto.FSrcSplitBillNo, - Caa016 = dto.FDESCRIPTION, + Caa016 = dto.FMemoItem, Caa018 = Convert.ToDecimal(dto.planId), Caa019 = Convert.ToDecimal(dto.planSeq), - Caa020 = dto.planNum + Caa020 = dto.planNum, + Fmoentryid = Convert.ToDecimal(dto.FMOENTRYID) }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); @@ -128,12 +143,12 @@ { var womcab = new Womcab { - Erpid = Convert.ToDecimal(dto.FENTRYID), + Erpid = Convert.ToDecimal(dto.ID), Cab001 = dto.FBillNo, Cab002 = dto.FSeq, - Cab003 = dto.FMaterialID, - Cab006 = !string.IsNullOrEmpty(dto.FNeedQty) - ? Convert.ToDecimal(dto.FNeedQty) + Cab003 = dto.FMaterialID2, + Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2) + ? Convert.ToDecimal(dto.FNeedQty2) : null, Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) ? Convert.ToDecimal(dto.FPickedQty) @@ -153,7 +168,9 @@ Cab014 = dto.FIsKeyItem, Numerator = dto.FNumerator, Denominator = dto.FDenominator, - Eid = Convert.ToDecimal(dto.FID) + Eid = Convert.ToDecimal(dto.PID), + SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty), + SCRAPRATE = Convert.ToDecimal(dto.FScrapRate) }; var entity = Db.Queryable<Womcab>() -- Gitblit v1.9.3