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/WorkAction/PackingAction.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 6b1447e..ee6f046 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -895,28 +895,28 @@
var actID = _pkgList.First().ACT_ID;
var wo = _pkgList.First().WORK_ORDER;
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
+ db.Updateable<MES_WIP_DATA>(CurPosition.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)
.Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.ID))
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
- db.Updateable<MES_WIP_HIS>()
+ db.Updateable<MES_WIP_HIS>(CurPosition.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)
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
- db.Updateable<MES_WIP_ACT>()
+ db.Updateable<MES_WIP_ACT>(CurPosition.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)
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
+ db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
.SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
.Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.WIP_ID))
@@ -945,7 +945,7 @@
var actID = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).ACT_ID;
var wo = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).WORK_ORDER;
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
+ db.Updateable<MES_WIP_DATA>(CurPosition.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)
@@ -953,20 +953,20 @@
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
var endOperCode = CurPkg.IsReachedEndNode ? "EndNode" : "NotReachedEndNode";
- db.Updateable<MES_WIP_HIS>()
+ db.Updateable<MES_WIP_HIS>(CurPosition.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)
.Where(q => q.WORK_ORDER == wo && (q.NODE_ID == nodeID || q.OPER_CODE == endOperCode) && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
- db.Updateable<MES_WIP_ACT>()
+ db.Updateable<MES_WIP_ACT>(CurPosition.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)
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
- db.Updateable<MES_WIP_ACT>()
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
.SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))
.SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())
.SetColumns(q => q.ACT_VALUE_3 == (CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : ""))
@@ -974,7 +974,7 @@
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && q.WIP_ID == _lastWipID)
.ExecuteCommand();
var InStoreLabel = CurPkg.IsFinished ? CurPkg.InStoreLabel?.ToJson() : "";
- db.Updateable<MES_WIP_ACT>()
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
.SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))
.SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())
.SetColumns(q => q.ACT_VALUE_3 == InStoreLabel)
@@ -982,7 +982,7 @@
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == CurPkg.InStoreActID && q.WIP_ID == _lastWipID)
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
+ db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
.SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
.Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.WIP_ID))
--
Gitblit v1.9.3