From 54d77af16404853acc0a977c9185f50ee22c2bbf Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 18 十月 2024 09:22:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index e8397d3..0889799 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -172,8 +172,10 @@
result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
}
//濡傛灉鎴愬姛锛屾牴鎹潯浠跺紓姝ヤ繚瀛樺伐鑹鸿矾绾垮埌浜у搧鐨勫鎴�
- if (result.IsSuccessed && input.IfToCust) {
- Work.DoAsync(() => {
+ 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 = "" });
@@ -183,11 +185,11 @@
//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.Customer.CUST_NAME_CN}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
+ 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.Customer.CUST_NAME_CN}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
+ Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
}
}
catch (Exception ex)
@@ -378,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)
{
@@ -391,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;
}
//濡傛灉鍒濆鍙橀噺鏁板ぇ浜庡伐鍗曡缃殑鍙橀噺鏁�
@@ -407,6 +420,7 @@
{
if (queryable.ToList().Any(q => q.VAR_NAME == item.VAR_NAME))
{
+ item.ID = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.ID;
item.WORK_ORDER = input.WorkOrder;
item.VAR_VALUE = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.VAR_VALUE;
}
--
Gitblit v1.9.3