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.Route.cs | 6 +++---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 1 +
Tiger.Business.MES/Transaction/Position.cs | 26 +++++++++++++-------------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index c652c37..0889799 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -420,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;
}
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 7059542..5035f38 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -552,15 +552,15 @@
case "GetSN":
return CurSN;
case "GetBAS_ITEM":
- return WorkBatch.Product.CUST_PROD_CODE;
+ return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
case "GetItemName":
- return WorkBatch.Product.ITEM_NAME;
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
case "GetCustomer":
- return WorkBatch.Batch.Customer.ToJson();
+ return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
case "GetSalesOrder":
- return WorkBatch.WO.SALES_ORDER;
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
case "GetPackNumber":
- return WorkBatch.WO.ORDER_NO;
+ return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
@@ -574,13 +574,13 @@
}
return string.Join("\r\n", minPkgList);
case "GetDescription":
- return WorkBatch.Product.ITEM_DESC;
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
case "GetFengZ":
- return WorkBatch.Product.ExtInfo.Packaging;
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
case "GetPAndO":
- return WorkBatch.WO.SALES_CONTRACT;
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
case "GetLTD":
- return WorkBatch.WO.Customer?.CUST_NAME_CN;
+ return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
case "GetHWDate":
List<string> list = new List<string>();
var _action = action is PackingAction ? action as PackingAction : null;
@@ -626,7 +626,7 @@
}
return "";
case "GetNOTES":
- return WorkBatch.Product.ExtInfo?.Remark;
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
case "GetXH":
return GetCardCode(lvars);
case "GetCardNo":
@@ -634,9 +634,9 @@
case "GetCardTotal":
return "";
case "GetModelSpec": //Model+绌烘牸+SPEC,
- return $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}";
+ return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
case "GetDATE":
- return $"{DateTime.Now.ToString("yyyy/MM/dd")}";
+ return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
default:
return "";
}
@@ -699,7 +699,7 @@
}
else
{
- result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
+ result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
}
return result;
}
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 2e6c16b..ec90c54 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -521,9 +521,9 @@
expableOper.And(x => x.ROT_ID == item.ID);
}
}
-
- expable.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
- expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
+ string _custCode = input.custCode ?? "";
+ expable.And(x => x.PROD_CODE == input.prodCode && (x.CUST_CODE == _custCode));
+ expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == _custCode);
var exp = expable.ToExpression();
var expOper = expableOper.ToExpression();
--
Gitblit v1.9.3