From 4cd27bf0a86f6afcc969b0a872b444a4bcd534c6 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 14 十月 2024 01:06:12 +0800
Subject: [PATCH] 工单工艺路线返回客户工艺路线
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index a09f5cd..d8f1046 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -140,7 +140,7 @@
result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡瀛樺湪宸ュ崟鎵规[{_batch.BATCH_NO}]鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
return result;
}
- WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ //WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
input.Wo.RELEASE_TIME = DateTime.Now;
input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
@@ -170,6 +170,33 @@
{
result.IsSuccessed = false;
result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ //濡傛灉鎴愬姛锛屾牴鎹潯浠跺紓姝ヤ繚瀛樺伐鑹鸿矾绾垮埌浜у搧鐨勫鎴�
+ if (result.IsSuccessed && input.IfToCust)
+ {
+ Work.DoAsync(() =>
+ {
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = input.Wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
+ 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()}");
+ }
+ else
+ {
+ Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ });
}
}
catch (Exception ex)
@@ -207,7 +234,7 @@
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.ROUTE_STATUS }).ExecuteCommand();
+ db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.ROUTE_STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -241,7 +268,7 @@
_woBatch.STATUS = input.Status < 0 ? _woBatch.STATUS : input.Status;
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
{
- WoContext.RemoveBatch(input.WoBatch);
+ //WoContext.RemoveBatch(input.WoBatch);
}
//濡傛灉鏄笅鍙�
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
@@ -270,11 +297,11 @@
//濡傛灉鏄笅鍙�
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
{
- db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE }).ExecuteCommand();
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
}
else
{
- db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS }).ExecuteCommand();
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
}
});
if (!dbTran.IsSuccess)
--
Gitblit v1.9.3