From 07a89d9d534aab73d4e7a4812a0d78312af72b58 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 14 十月 2024 15:41:14 +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 | 29 ++++++++++++++++++++---------
Tiger.Business.MES/Transaction/Position.cs | 18 +++++++++---------
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs | 2 ++
3 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index d8f1046..c652c37 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -380,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)
{
@@ -393,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;
}
//濡傛灉鍒濆鍙橀噺鏁板ぇ浜庡伐鍗曡缃殑鍙橀噺鏁�
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 2429dad..ee00d86 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -592,15 +592,15 @@
}
return $"{qtylist.Count}PCS";
case "GetModel":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
- case "GetInput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
- case "GetOutput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
- case "GetPower":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
- case "GetAccuracy":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
+ case "GetInput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
+ case "GetOutput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
+ case "GetPower":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
+ case "GetAccuracy":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
case "GetVarByWo":
return GetLabelVarWo(lv, "");
default:
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
index c387d10..d1e62ce 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
@@ -19,6 +19,8 @@
public class BizLabelVarWoInput
{
public string WorkOrder { get; set; }
+ public string CustCode { get; set; }
+ public string ProdCode { get; set; }
public string LabelId { get; set; }
public int draw { get; set; }
--
Gitblit v1.9.3