From bc9a1fc998caa26ad1ea7f2f235757b74eab69e2 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 13 十月 2024 01:19:58 +0800
Subject: [PATCH] 返回包装信息更新
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index f5bbfbd..b296a5a 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -1,4 +1,5 @@
-锘縰sing Rhea.Common;
+锘縰sing Microsoft.CodeAnalysis.Differencing;
+using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -209,7 +210,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";
@@ -218,6 +219,7 @@
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
+ action.IsSuccessed = true;
action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{min.PKG_LEVEL}灞傚寘瑁匸{min.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
@@ -225,7 +227,7 @@
}
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
- action.IsSuccessed = true;
+ //action.IsSuccessed = true;
return action;
}
@@ -253,6 +255,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜鎵弿澶辫触锛岃閲嶆柊鎵弿绗瑊dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanFail", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
+ CurPosition.ResetNode();
return action;
}
//楠岃瘉褰撳墠鍖呰鏉＄爜鏄惁宸茬粡琚壂鎻忚繃
@@ -264,17 +267,18 @@
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{pInput.PkgSN}]鏃犻渶閲嶅鎵弿锛岃鎵弿绗瑊dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanRepeat", pInput.PkgSN, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
+ CurPosition.ResetNode();
return action;
}
//瀹㈡埛绔壂鎻忔垚鍔�
CurCmd = null;
PrintTimes = 0;
action = SavePkgData(input, action);
- if (action.IsSuccessed)
- {
- CurStep?.SetStatusMessage(StepStatus.Success, Biz.L("鎵弿鎴愬姛"));
- action.Data.ShortMsg = new("鎵弿鎴愬姛", ShortMessage.Types.Success);
- }
+ //if (action.IsSuccessed)
+ //{
+ // CurStep?.SetStatusMessage(StepStatus.Success, Biz.L("鎵弿鎴愬姛"));
+ // action.Data.ShortMsg = new("鎵弿鎴愬姛", ShortMessage.Types.Success);
+ //}
}
break;
//Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�
@@ -374,7 +378,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 +447,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 +475,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 +558,7 @@
//鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屼繚瀛樺寘瑁呮暟鎹埌鏁版嵁搴�
else
{
+ CurPkg.Item = CurPkgItem;
action = CompletePkg();
}
}
@@ -552,7 +569,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 +688,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";
@@ -711,6 +748,27 @@
{
item.Package.PARENT_SN = parent.Package?.SN;
list.AddRange(GetPackageList(item));
+ }
+ return list;
+ }
+
+ 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;
}
@@ -794,6 +852,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);
@@ -835,10 +894,13 @@
else
{
var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
+
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = false;
//淇濆瓨鏁版嵁
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
+ CurPosition.SaveStepsCommitActionToDB(() =>
{
+ var db = CurPosition.GetCommitDB();
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
@@ -860,11 +922,6 @@
}
}
});
- if (!dbTran.IsSuccess)
- {
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
}
if (CurPkg.IsFinished)
--
Gitblit v1.9.3