From bf84ef23de798e6509394a1424cc9f6cc0307c65 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 20 十一月 2024 15:09:18 +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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 9fb9a34..88b16c2 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -606,7 +606,7 @@
}
if (curAction is PrintInStoreLabel)
{
- qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
}
return $"{qtylist.Count}";
case "GetModel":
@@ -626,10 +626,11 @@
var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
if (_orderAction != null)
{
- var snList = _orderAction.CurPkg.Item.GetMinPackageList().Select(q => q.FLOW_SN).ToList();
+ //var snList = _orderAction.CurPkg.Item.GetMinPackageList().Select(q => q.FLOW_SN).ToList();
+ var snList = _orderAction.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
if (!snList.Any())
{
- snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
+ snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
}
_lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
.Where((q) => snList.Contains(q.FLOW_SN))
@@ -769,7 +770,8 @@
if (action is PackingAction)
{
var pkg = action as PackingAction;
- minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ //minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = pkg.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
itemCode = pkg.CurPkg.CustSN?.ITEM_CODE;
weight = pkg.CurPkg.WeightInfo.Weight;
unit = pkg.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
@@ -777,7 +779,8 @@
if (action is PrintInStoreLabel)
{
var print = action as PrintInStoreLabel;
- minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ //minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = print.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
itemCode = print.CurPkg.CustSN?.ITEM_CODE;
weight = print.CurPkg.WeightInfo.Weight;
unit = print.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
--
Gitblit v1.9.3