From f4ce2bcaa377c5fe869c0e8f0e1640cee3f8a400 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 04 十一月 2024 14:47:50 +0800
Subject: [PATCH] 增加在线产品异常下线功能
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 7d5f8be..360084e 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -323,6 +323,7 @@
HOLD_FLAG = "N",
REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
FINISHED_FLAG = "N",
+ UNBIND_FLAG = "N",
INV_FLAG = "N",
DFT_FLAG = "N",
DFT_COUNT = 0,
@@ -685,7 +686,7 @@
var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
var wo = _pkgList.First().WORK_ORDER;
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
- db.Updateable<MES_WIP_HIS>()
+ db.Updateable<MES_WIP_HIS>(UserCode)
.SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
.SetColumns(q => q.INNER_SN == q.CARTON_SN)
.SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
@@ -728,14 +729,14 @@
try
{
//PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
- if (NodeCmd.IsNullOrEmpty("PkgSubmit") == "PkgSubmit" || CurWipSNs.IsNullOrEmpty())
+ if (NodeCmd.IsNullOrEmpty() && CurWipSNs.IsNullOrEmpty())
{
- if (Context.ContainsKey("CurPackage"))
+ var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
+ if (CurPkg?.IsFinished == false)
{
TempPkgAction = new PackingAction();
TempPkgAction.Init(this);
- var CurPkg = Context["CurPackage"] as WipPkg;
int shipQty = input.Data.ToInt32();
int curQty = CurPkg.Item.TotalQty;
int ruleQty = TempPkgAction.PkgRule.GetTotalQty();
--
Gitblit v1.9.3