From 3a6f7cb36dff0ec99edddbb53078947fcf08a47e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 19 七月 2025 09:32:15 +0800
Subject: [PATCH] 1.用料清单变更
---
MES.Service/service/WomcaaManager.cs | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index d681ae4..cb30102 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,7 +23,8 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FBillNo);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -67,8 +68,24 @@
.IgnoreColumnsNull()
.ExecuteCommand() > 0;
- if (orUpdate && baOrUpdate) return true;
+ // if (orUpdate && baOrUpdate)
+ // throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+
+ if (orUpdate && baOrUpdate)
+ {
+ // 璋冪敤瀛樺偍杩囩▼鏇存柊鐢ㄦ枡娓呭崟
+ 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())
+ });
+ return true;
+ }
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+
+
}
private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
@@ -84,12 +101,12 @@
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string PPBOMNO)
{
var entity = new Womcaa
{
Erpid = Convert.ToInt32(dto.Id), /// ERPID
- Caa001 = dto.FBillNo, /// 鍗曞彿
+ Caa001 = PPBOMNO, /// 鍗曞彿
Caa021 = dto.FWorkShopID, /// 宸ヤ綔杞﹂棿
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
@@ -106,7 +123,9 @@
PlanId = dto.FPlannerID, /// 璁″垝鍛�
Caa010 = dto.FPlanStartDate, /// 棰勮寮�宸ユ椂闂�
Caa011 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿
- Caa005 = dto.FConveyDate, /// 寮�鍗曟棩鏈�
+ 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, /// 璁″垝璺熻釜鍙�
@@ -143,7 +162,10 @@
// PackingListNumber = dto.F_XIFG_Text_yrr, /// 鍖呰鍗曞彿
// CustomerName = dto.F_XIFG_Text_qtr1, /// 瀹㈡埛鍚嶇О
// Customer = dto.F_XIFG_Base_83g1, /// 瀹㈡埛
- Caa0111 = dto.FPlanFinishDate /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ //Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
+ SynchronousDate = DateTime.Now
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -168,7 +190,7 @@
? Convert.ToDecimal(dto.FNeedQty)
: null, /// 闇�棰嗙敤閲�
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
- ? Convert.ToInt32(dto.FPickedQty)
+ ? Convert.ToDecimal(dto.FPickedQty)
: null, /// 宸查鐢ㄩ噺
PositionNo = dto.FPositionNO, /// 浣嶇疆鍙�
SupplyOrganization = dto.FChildSupplyOrgId, /// 渚涘簲缁勭粐
@@ -195,7 +217,8 @@
Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
- MustQty = Convert.ToDecimal(dto.FMustQty)
+ MustQty = Convert.ToDecimal(dto.FMustQty),
+ Typeb = dto.TypeB
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
--
Gitblit v1.9.3