From a32d6d34818393555876d4a6c4671e67ecdaf76e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 20:43:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 38654ac..0cd9d6a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -606,13 +606,19 @@
case "GetVarByWo":
return GetLabelVarWo(lv, "");
case "GetLOTNO":
+ string _lotnos = "";
var _orderAction = action is PackingAction ? action as PackingAction : null;
if (_orderAction != null)
{
- var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN);
- return string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
- .Where((q) => snList.Contains(q.FLOW_SN))
- .Select((q) => q.WORK_ORDER).Distinct().ToList());
+ var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN).ToList();
+ if (!snList.Any())
+ {
+ snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
+ }
+ _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
+ .Where((q) => snList.Contains(q.FLOW_SN))
+ .Select((q) => q.WORK_ORDER).Distinct().ToList());
+ return _lotnos;
}
return "";
case "GetNOTES":
--
Gitblit v1.9.3