From 309ea7eb73b9ede89386b30147610b81c79b5aeb Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期二, 11 三月 2025 10:35:02 +0800
Subject: [PATCH] 退货单修改
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 25fd102..e4242d8 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -32,7 +32,7 @@
public PackingActionOutput CurCmd { get; set; }
public int PrintTimes = 0;
public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
- public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
+ public List<BAS_PROCESS_VAR> LabelPV { get; set; } = new();
public int FinishLevel = 0;
private bool IsManually => CurStep.IsNullOrEmpty();
#endregion Propertys & Variables
@@ -62,7 +62,7 @@
var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
LabelDic.Add(code.PKG_LEVEL, label);
}
- LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
//濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈変笖鏈寘瑁呭畬鎴愬垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -159,7 +159,7 @@
//鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
- LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
//鑾峰彇鍖呰瑙勫垯鐨勭О閲嶈寖鍥�
PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
//鎶�
@@ -926,6 +926,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
--
Gitblit v1.9.3