From c476c9cf07c1b1920cc4bf51f60a78f5768c30fa Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 23 十二月 2024 19:41:33 +0800
Subject: [PATCH] 实体变化引起变更
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index d4055c7..75a63f5 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()}");
@@ -292,6 +291,14 @@
_woBatch.ACT_LINE = input.ActLine;
_woBatch.CHANGE_USER = input.UserId;
_woBatch.CHANGE_TIME = DateTime.Now;
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Release.GetValue();
+ }
+ else
+ {
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Init.GetValue() && !Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.STATUS > BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).Any())
+ {
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Init.GetValue();
+ }
}
}
else
@@ -312,6 +319,10 @@
else
{
db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
+ }
+ if (!_wo.IsNullOrEmpty())
+ {
+ db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
}
});
if (!dbTran.IsSuccess)
@@ -586,7 +597,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)
{
@@ -631,12 +642,12 @@
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "Customer"
} : new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "InStoreLabel"
};
result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
@@ -711,7 +722,7 @@
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;
@@ -725,20 +736,12 @@
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,
+ SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
SCAN_QTY = woSns.Count,
- STATUS = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
+ IS_HANDLED = "N" //Y-宸茬敓鎴愶紝N-鏈敓鎴愶紝F-澶辫触
},
InStoreScanInfo = new() {
SN = cartonSn,
@@ -757,5 +760,28 @@
}
return result;
}
+
+ #region 鎻愪氦鍓嶉�氱敤鏂规硶
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<CheckCodeOutput>> CheckCode(string code)
+ {
+ var action = new ApiAction<CheckCodeOutput>($"妫�鏌ユ潯鐮亄code}鎴愬姛", new CheckCodeOutput());
+ try
+ {
+ action.Data.Position = DbCache.Cache.Position[code];
+ action.Data.WorkOrder = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == code).FirstAsync();
+ action.Data.Defect = DbCache.Cache.Defect[code];
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
+ }
+ return action;
+ }
+ #endregion
}
}
--
Gitblit v1.9.3