From 2f1e779af4d2ce4e38afb5b98f4a5198afc54a9d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 14 十月 2024 15:04:30 +0800
Subject: [PATCH] 获取工单模板变量优化
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index ff45619..c652c37 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -171,6 +171,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)
{
@@ -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)
@@ -353,12 +380,12 @@
try
{
QueryAble<BAS_LABEL_VAR_WO> query = new();
- if (input.WorkOrder.IsNullOrEmpty())
- {
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
- return result;
- }
+ //if (input.WorkOrder.IsNullOrEmpty())
+ //{
+ // result.IsSuccessed = false;
+ // result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ // return result;
+ //}
var labeltemp = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE.Equals(input.LabelId) || q.ID.Equals(input.LabelId)).First();
if (labeltemp == null)
{
@@ -366,13 +393,24 @@
result.LocaleMsg = new($"妯℃澘涓嶅瓨鍦紒");
return result;
}
- var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
- var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => q.WORK_ORDER.Equals(input.WorkOrder) && q.LABEL_ID.Equals(labeltemp.ID));
+ var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
+ && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
+ && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
+ && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
+ var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
+ .Where(q => q.LABEL_ID.Equals(labeltemp.ID))
+ .WhereIF(!input.WorkOrder.IsNullOrEmpty(), q => q.WORK_ORDER.Equals(input.WorkOrder))
+ .WhereIF(!input.ProdCode.IsNullOrEmpty(), q=>q.PROD_CODE.Equals(input.ProdCode))
+ .WhereIF(!input.CustCode.IsNullOrEmpty(), q => q.PROD_CODE.Equals(input.CustCode));
query.page = await queryable.ToPageAsync(input.pageIndex, input.pageSize);
//濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炲垵濮嬫暟鎹�
if (query.page.totals == 0)
{
- query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToPageAsync(input.pageIndex, input.pageSize);
+ query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
+ && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
+ && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
+ && q.LABEL_ID.Equals(labeltemp.ID))
+ .ToPageAsync(input.pageIndex, input.pageSize);
query.Items = query.page.data;
}
//濡傛灉鍒濆鍙橀噺鏁板ぇ浜庡伐鍗曡缃殑鍙橀噺鏁�
--
Gitblit v1.9.3