From 2c453c7fdbe6cdf81353b129023a3d35f982821d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 07 十一月 2024 00:55:22 +0800
Subject: [PATCH] 重打更新
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 90 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 4e0bfd3..45d96aa 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Tiger.Business.MES.Transaction;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
@@ -228,6 +229,13 @@
data.ExecCode = "Print";
data.PkgLevel = min.PKG_LEVEL;
data.PrintLable = LabelDic[min.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -396,6 +404,13 @@
data.ExecCode = "Print";
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -493,6 +508,13 @@
data.ExecCode = "Print";
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -562,6 +584,7 @@
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
CurPkgItem.Package.ACT_ID = NodeAct.ID;
+ CurPkgItem.Package.ACT_NAME = NodeAct.ACT_NAME;
CurPkgItem.Package.FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN;
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -625,6 +648,7 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN,
};
FinishLevel++;
@@ -712,6 +736,13 @@
data.ExecCode = "Print";
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -753,27 +784,6 @@
CurPosition.ResetNode();
}
return action;
- }
-
- public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)
- {
- List<MES_WIP_PKG> list = new();
- if (parent.Items.Any())
- {
- foreach (var item in parent.Items)
- {
- item.Package.PARENT_SN = parent.Package?.SN;
- list.AddRange(GetMinPackageList(item));
- }
- }
- else
- {
- if (!parent.Package.IsNullOrEmpty())
- {
- list.Add(parent.Package);
- }
- }
- return list;
}
public ApiAction<SubmitOutput> CompletePkg()
@@ -856,6 +866,10 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_RESULT = "Y",
+ ACT_VALUE_1 = CurPkg.IsFinished ? "Y" : "N",
+ ACT_VALUE_2 = CurPkg.ToJson(),
+ ACT_VALUE_3 = CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "",
+ ACT_VALUE_4 = "Customer",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浜у搧鏉＄爜[{string.Join("锛�", CurPosition.CurSN)}]鍖呰瀹屾垚",
};
@@ -881,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))
@@ -915,6 +929,7 @@
if (CurPkg.IsFinished)
{
var _pkgList = CurPosition.GetPackageList(CurPkg.Item).Clone();
+ var _lastWipID = CurPosition.LastWipSNs?.FirstOrDefault()?.ID;
//鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
CurPosition.NeedTemporaryStoreDBCommitAction = false;
@@ -930,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)
@@ -938,21 +953,36 @@
.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>(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() : ""))
+ .SetColumns(q => q.ACT_VALUE_4 == "Customer")
+ .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>(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)
+ .SetColumns(q => q.ACT_VALUE_4 == "InStore")
+ .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))
@@ -960,7 +990,7 @@
}
});
//濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
- if (CurPkg.IsReachedEndNode)
+ //if (CurPkg.IsReachedEndNode)
{
CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
}
--
Gitblit v1.9.3