From 790032df98d586627a771159d5b6c7646e3fff35 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 07 十二月 2024 23:18:29 +0800
Subject: [PATCH] 入库单更新
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 83b2e39..163aa8c 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -186,7 +186,6 @@
pars[1].Direction = System.Data.ParameterDirection.Output;
pars[2].Direction = System.Data.ParameterDirection.Output;
Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
- //response.LocaleMsg = new(pars[2].Value.ToString());
if (pars[1].Value.ToInt32() == 0)
{
Logger.Default.Info($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
@@ -586,7 +585,7 @@
//濡傛灉鏌ヤ笉鍒板氨鍘昏涓烘棩蹇楁煡
if (labelPrint.IsNullOrEmpty() && input.ReqType == 1)
{
- printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN.Equals(woSn.OUTER_SN) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
+ printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN.Equals(woSn.OUTER_SN) && q.ACT_VALUE_4 == "Customer" && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3)).First()?.ACT_VALUE_3 ?? "";
}
else if (labelPrint.IsNullOrEmpty() && input.ReqType == 2)
{
@@ -703,40 +702,37 @@
try
{
//寰楀埌宸ュ崟鏉＄爜璁板綍
- var woSns = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.OUTER_SN == code).ToListAsync();
+ var cartonSn = code.Split('|')[0];
+ var woSns = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.OUTER_SN == cartonSn).ToListAsync();
if (woSns.Count == 0)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
return result;
}
- var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER ).IncludesAllFirstLayer().FirstAsync();
+ var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER ).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q._ItemInfos).FirstAsync();
if (wo == null)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"鏉＄爜瀵瑰簲鐨勫伐鍗曚笉瀛樺湪");
return result;
}
+ //鍒ゆ柇宸ュ崟鏄惁宸茬粡鍏ㄩ儴鍏ュ簱
+
+
InStoreInfo inStoreInfo = new() {
ErpProdInBth= new() {
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
- ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
- SCAN_QTY = woSns.Count
- },
- ProdInBatch = new()
- {
- WORK_ORDER = wo.ORDER_NO,
SALES_ORDER = wo.SALES_ORDER,
- BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
- PLAN_QTY = wo.PLAN_QTY,
- SCAN_QTY = woSns.Count
+ SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
+ SCAN_QTY = woSns.Count,
+ IS_HANDLED = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
},
InStoreScanInfo = new() {
- SN = code,
+ SN = cartonSn,
SALES_ORDER = wo.SALES_ORDER,
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
--
Gitblit v1.9.3