From 5fbbfd1593ea09c4126f03c7520bf317de50f1bb Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 07 十一月 2024 16:54:17 +0800
Subject: [PATCH] 重打更新
---
Tiger.Model.Net/Entitys/SYS/V_USER_MENU.cs | 9 +++++----
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 2 +-
Tiger.Business.MES/Transaction/Position.cs | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 060c6bd..ef77125 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -579,7 +579,7 @@
//濡傛灉鏌ヤ笉鍒板氨鍘昏涓烘棩蹇楁煡
if (labelPrint.IsNullOrEmpty() && input.ReqType == 1)
{
- printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN.Equals(woSn.SN) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
+ printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN.Equals(woSn.OUTER_SN) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
}
else if (labelPrint.IsNullOrEmpty() && input.ReqType == 2)
{
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index fa372a2..9fb9a34 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -608,7 +608,7 @@
{
qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
}
- return $"{qtylist.Count}PCS";
+ return $"{qtylist.Count}";
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
case "GetInput":
diff --git a/Tiger.Model.Net/Entitys/SYS/V_USER_MENU.cs b/Tiger.Model.Net/Entitys/SYS/V_USER_MENU.cs
index 81161c0..04400c8 100644
--- a/Tiger.Model.Net/Entitys/SYS/V_USER_MENU.cs
+++ b/Tiger.Model.Net/Entitys/SYS/V_USER_MENU.cs
@@ -66,10 +66,11 @@
/// 鑿滃崟鍚嶇О
/// </summary>
public string MENU_NAME { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string HALF_CHECK { get; set; }
+ public string PATH { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string HALF_CHECK { get; set; }
#endregion
#region 铏氭嫙灞炴��
--
Gitblit v1.9.3