From f2d9adf4e26b1173a51387ad203a33cf617454a0 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 25 九月 2024 18:39:34 +0800
Subject: [PATCH] 获取工单批次的数量汇总
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index f5bbfbd..789e0be 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -209,7 +209,7 @@
else
{
//璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[min.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[min.PKG_LEVEL]);
+ LabelDic[min.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[min.PKG_LEVEL], this);
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Print";
@@ -374,7 +374,7 @@
else
{
//璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Print";
@@ -443,8 +443,20 @@
//鎵嬪姩缁撴潫鍖呰榛樿浠庣浜屽眰鍖呰寮�濮嬮獙璇�
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == 2);
- //琛屼负璁惧畾鐨凮PTION_1-9鏄寘瑁呬笉鍚屽眰绾х殑鏍囩妯℃澘浠ｇ爜锛屽鏋滀负绌哄垯涓嶉渶瑕佹墦鍗�
- if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
+ if (dtl.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Weighing";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
+ CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("涓婄О绉伴噸"));
+ action.Data.Data = data;
+ action.Data.ShortMsg = new("涓婄О绉伴噸", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"璇锋妸澶栧寘瑁呬笂绉扮О閲�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing");
+ }
+ //鏍规嵁鍖呰涓嶅悓灞傜骇鐨勬爣绛炬ā鏉夸唬鐮侊紝濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
+ else if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
{
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Scan";
@@ -459,7 +471,7 @@
else
{
//璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Print";
@@ -542,6 +554,7 @@
//鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屼繚瀛樺寘瑁呮暟鎹埌鏁版嵁搴�
else
{
+ CurPkg.Item = CurPkgItem;
action = CompletePkg();
}
}
@@ -552,7 +565,27 @@
if (pInput.PkgLevel == dtl.PKG_LEVEL)
{
CurPkgItem.IsFinished = true;
- CurPkgItem.Package = new()
+ CurPkgItem.Package = IsManually ? new()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ SN = pInput.PkgSN,
+ PKG_TYPE = dtl.PkgType.PKG_NAME,
+ ITEM_CODE = CurPkgItem.Items.First().Package.ITEM_CODE,
+ QTY = CurPkgItem.Items.Sum(q => q.Package.QTY),
+ UNIT = dtl.PkgType.PKG_NAME,
+ WORK_ORDER = CurPkgItem.Items.First().Package.WORK_ORDER,
+ BATCH_NO = CurPkgItem.Items.First().Package.BATCH_NO,
+ ROT_CODE = CurPkgItem.Items.First().Package.ROT_CODE,
+ NODE_ID = CurPkgItem.Items.First().Package.NODE_ID,
+ NODE_NAME = CurPkgItem.Items.First().Package.NODE_NAME,
+ FTY_CODE = CurPkgItem.Items.First().Package.FTY_CODE,
+ WS_CODE = CurPkgItem.Items.First().Package.WS_CODE,
+ LINE_CODE = CurPkgItem.Items.First().Package.LINE_CODE,
+ POST_CODE = CurPkgItem.Items.First().Package.POST_CODE,
+ OPER_CODE = CurPkgItem.Items.First().Package.OPER_CODE,
+ SEGMENT = CurPkgItem.Items.First().Package.SEGMENT,
+ } : new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
@@ -651,7 +684,7 @@
else
{
//璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Print";
@@ -794,6 +827,7 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浜у搧鏉＄爜[{string.Join("锛�", CurPosition.CurSN)}]鍖呰瀹屾垚",
};
wipActs.Add(wipAct);
--
Gitblit v1.9.3