From 869738d1cdf4385203e7a5fc5e4f2735e9840d46 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 00:25:14 +0800
Subject: [PATCH] 优化工序逻辑
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 377 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 239 insertions(+), 138 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 09fad06..22a62cc 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;
@@ -28,9 +29,10 @@
public WipPkgItem CurPkgItem { get; set; }
public PackingActionOutput CurCmd { get; set; }
public int PrintTimes = 0;
- public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
+ public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
public int FinishLevel = 0;
+ private bool IsManually => CurStep.IsNullOrEmpty();
#endregion Propertys & Variables
#region Functions
@@ -51,15 +53,16 @@
PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
//鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
- var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>();
+ var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>() ?? new List<WipPkgItem>();
foreach (var code in codes)
{
var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
LabelDic.Add(code.PKG_LEVEL, label);
}
LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
- //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈夊垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
- if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
+
+ //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈変笖鏈寘瑁呭畬鎴愬垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
+ if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
{
CurPkg = (CurPosition.Context["CurPackage"] as WipPkg).Clone();
}
@@ -79,7 +82,7 @@
IS_MIN_PKG = max.PkgType.IS_MIN_PKG,
PKG_LEVEL = max.PKG_LEVEL,
PKG_QTY = max.PKG_QTY,
- LABEL_CODE = LabelDic[max.PKG_LEVEL]?.LABEL_CODE,
+ LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
}
};
WipPkgItem child = null;
@@ -94,7 +97,7 @@
IS_MIN_PKG = dtl.PkgType.IS_MIN_PKG,
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
- LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
+ LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
};
if (!child.IsNullOrEmpty())
{
@@ -106,6 +109,13 @@
if (!child.IsNullOrEmpty())
{
CurPkg.Item.Items.Add(child);
+ }
+
+ //鍒犻櫎宸ュ簭涓婁笅鏂囦腑鐨勫寘瑁呰褰�
+ if (CurPosition.Context.ContainsKey("CurPackage"))
+ {
+ CurPosition.Context.Remove("CurPackage");
+ CurPosition.Context.Remove("CurLabelDic");
}
}
//鑾峰彇鏄惁鍖呰瀹屽悗闇�瑕佺О閲�
@@ -181,8 +191,20 @@
action.LocaleMsg = GetBeginMsg();
var min = PkgRule.Details.OrderBy(q => q.PKG_LEVEL).First();
+ if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Weighing";
+ data.PkgLevel = min.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");
+ }
//鏍规嵁鍖呰涓嶅悓灞傜骇鐨勬爣绛炬ā鏉夸唬鐮侊紝濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
- if (LabelDic[min.PKG_LEVEL].IsNullOrEmpty())
+ else if (LabelDic[min.PKG_LEVEL].IsNullOrEmpty())
{
input.Data = new PackingActionInput()
{
@@ -196,7 +218,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";
@@ -205,6 +227,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}]");
@@ -212,7 +235,7 @@
}
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
- action.IsSuccessed = true;
+ //action.IsSuccessed = true;
return action;
}
@@ -240,10 +263,11 @@
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;
}
//楠岃瘉褰撳墠鍖呰鏉＄爜鏄惁宸茬粡琚壂鎻忚繃
- if (GetPackageList(CurPkg.Item).Any(q => q.SN == pInput.PkgSN))
+ if (CurPosition.GetPackageList(CurPkg.Item).Any(q => q.SN == pInput.PkgSN))
{
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
CurStep?.SetStatusMessage(StepStatus.Error, Biz.L("鎵弿閿欒"));
@@ -251,17 +275,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锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�
@@ -283,7 +308,7 @@
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
+ }
//瀹㈡埛绔墦鍗板け璐�
else
{
@@ -318,7 +343,7 @@
if (!pInput.WeightInfo.IsNullOrEmpty() && pInput.WeightInfo.Weight > 0)
{
//楠岃瘉閲嶉噺鏁版嵁鏄惁绗﹀悎璁剧疆濂界殑閲嶉噺鑼冨洿
- if (!PkgProd.IsNullOrEmpty() && (pInput.WeightInfo.Weight < PkgProd.MIN_WEIGHT || PkgProd.MIN_WEIGHT < pInput.WeightInfo.Weight))
+ if (!PkgProd.IsNullOrEmpty() && ((pInput.WeightInfo.Weight < PkgProd.MIN_WEIGHT && !IsManually) || PkgProd.MAX_WEIGHT < pInput.WeightInfo.Weight))
{
action.IsSuccessed = false;
CurStep?.SetStatusMessage(StepStatus.Error, Biz.L("閲嶉噺瓒呴檺"));
@@ -347,37 +372,35 @@
{
//濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
- {
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Scan";
- data.PkgLevel = dtl.PKG_LEVEL;
- CurCmd = data;
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Scan";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵弿鏍囩"));
action.Data.Data = data;
- action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
- //action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
- action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
- else
- {
- //璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
-
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Print";
- data.PkgLevel = dtl.PKG_LEVEL;
- data.PrintLable = LabelDic[dtl.PKG_LEVEL];
- CurCmd = data;
- PrintTimes++;
+ action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
+ //action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
+ }
+ else
+ {
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
+
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Print";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ CurCmd = data;
+ PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
action.Data.Data = data;
- action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
- //action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
- action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
- }
+ action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
+ //action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
+ action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
+ }
}
-
-
}
else
{
@@ -432,8 +455,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";
@@ -448,7 +483,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";
@@ -521,17 +556,49 @@
CurPkgItem.Package.POST_CODE = CurPosition.CurWipSNs.First().POST_CODE;
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
+ CurPkgItem.Package.ACT_ID = NodeAct.ID;
FinishLevel++;
- action = SavePkgData(input, action);
+ //瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
+ if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL))
+ {
+ //褰撳墠澶勭悊鐨勫寘瑁呭眰绾у凡缁忓鐞嗗畬锛岀户缁線涓婁繚瀛�
+ action = SavePkgData(input, action);
+ }
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屼繚瀛樺寘瑁呮暟鎹埌鏁版嵁搴�
+ else
+ {
+ CurPkg.Item = CurPkgItem;
+ action = CompletePkg();
+ }
}
//澶勭悊鍏朵粬鍖呰灞傜骇鏁版嵁
- else
+ else
{
//瀹㈡埛绔彁浜ょ殑鍖呰灞傜骇绛変簬褰撳墠澶勭悊鐨勫寘瑁呭眰绾�
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,
@@ -551,6 +618,7 @@
POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
+ ACT_ID = NodeAct.ID,
};
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -592,12 +660,12 @@
//娣诲姞褰撳墠鐨勫寘瑁呮槑缁嗗埌涓婁竴灞傚寘瑁呯殑鏄庣粏鍒楄〃
if (!curItem.Items.Contains(CurPkgItem))
{
- curItem.Items.Add(CurPkgItem);
+ curItem.Items.Add(CurPkgItem);
}
CurPkgItem = curItem;
//娣诲姞鏄庣粏鍚庡垽鏂綋鍓嶅寘瑁呭眰绾х殑鏄庣粏鏁伴噺鏄惁绛変簬鍖呰鏁伴噺锛岃嫢鐩哥瓑鍒欐爣璁板綋鍓嶅寘瑁呭眰绾т负瀹屾垚骞跺皾璇曟墦鍗版爣绛�
- if (CurPkgItem.Items.Count(q => q.IsFinished) == CurPkgItem.PKG_QTY || CurStep.IsNullOrEmpty())
+ if (CurPkgItem.Items.Count(q => q.IsFinished) == CurPkgItem.PKG_QTY || IsManually)
{
//鎵撳嵃鍓嶇О閲嶏細濡傛灉褰撳墠鐨勫寘瑁呮槑缁嗙殑涓婁竴灞傚寘瑁呭璞℃槸鏈�澶栧眰鍖呰涓旈渶瑕佺О閲嶆椂锛屽厛绉伴噸锛屽悎鏍煎悗鍦ㄥ彂鍗版垨鑰呮壂鎻忔渶澶栧眰鍖呰鏍囩
if (CurPkgItem.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)
@@ -611,39 +679,39 @@
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";
- data.PkgLevel = dtl.PKG_LEVEL;
- CurCmd = data;
+ //濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
+ if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Scan";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵弿鏍囩"));
action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
- else
- {
- //璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
-
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Print";
- data.PkgLevel = dtl.PKG_LEVEL;
- data.PrintLable = LabelDic[dtl.PKG_LEVEL];
- CurCmd = data;
- PrintTimes++;
+ }
+ else
+ {
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
+
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Print";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ CurCmd = data;
+ PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
- action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
- }
+ action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
+ }
}
}
//褰撳墠鍖呰灞傜骇鐨勬槑缁嗘暟閲忔湭杈惧埌鍖呰鏁伴噺锛屽垯瀹屾垚鏈鎵弿锛岀瓑寰呬笅涓骇鍝佽繘绔�
@@ -679,17 +747,23 @@
return action;
}
- private List<MES_WIP_PKG> GetPackageList(WipPkgItem parent)
+ public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)
{
List<MES_WIP_PKG> list = new();
- if (!parent.Package.IsNullOrEmpty())
+ if (parent.Items.Any())
{
- list.Add(parent.Package);
+ foreach (var item in parent.Items)
+ {
+ item.Package.PARENT_SN = parent.Package?.SN;
+ list.AddRange(GetMinPackageList(item));
+ }
}
- foreach (var item in parent.Items)
+ else
{
- item.Package.PARENT_SN = parent.Package?.SN;
- list.AddRange(GetPackageList(item));
+ if (!parent.Package.IsNullOrEmpty())
+ {
+ list.Add(parent.Package);
+ }
}
return list;
}
@@ -709,7 +783,7 @@
action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageComplete", CurPkg.Item.PKG_LEVEL, CurPkg.Item.PKG_NAME);
//鎵嬪姩缁撴潫鍖呰鍒欐爣璁拌涓哄畬鎴�
- //if (CurStep.IsNullOrEmpty())
+ //if (IsManually)
//{
// IsFinished = true;
//}
@@ -731,14 +805,15 @@
CurPkg.Item.Package.WEIGHT = CurPkg.WeightInfo.Weight;
CurPkg.Item.Package.WEIGHT_UNIT = CurPkg.WeightInfo.Unit;
}
-
+
//涓嶆槸鎵嬪姩缁撴潫鍖呰鍒欎繚瀛樿涓烘搷浣滆褰�
- if (!CurStep.IsNullOrEmpty())
+ if (!IsManually)
{
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
foreach (var wipSn in CurPosition.CurWipSNs)
{
+
var wipAct = new MES_WIP_ACT()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -773,6 +848,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);
@@ -780,7 +856,7 @@
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
- var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
+ var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item) : new();
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
@@ -792,93 +868,118 @@
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList)
- {
- //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
- .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 == pkg.WORK_ORDER && q.SN == pkg.SN)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
- .ExecuteCommand();
- }
+ var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var nodeID = _pkgList.First().NODE_ID;
+ var actID = _pkgList.First().ACT_ID;
+ var wo = _pkgList.First().WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
+ db.Updateable<MES_WIP_DATA>()
+ .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>()
+ .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>()
+ .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>()
+ .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))
+ .ExecuteCommand();
}
};
}
else
{
- var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
- //淇濆瓨鏁版嵁
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
+ if (CurPkg.IsFinished)
{
- if (_pkgList.Any())
+ var _pkgList = CurPosition.GetPackageList(CurPkg.Item);
+
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = false;
+ //淇濆瓨鏁版嵁
+ CurPosition.SaveStepsCommitActionToDB(() =>
{
- db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList)
+ var db = CurPosition.GetCommitDB();
+ if (_pkgList.Any())
{
+ db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
+ var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var nodeID = _pkgList.First().NODE_ID;
+ var actID = _pkgList.First().ACT_ID;
+ var wo = _pkgList.First().WORK_ORDER;
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
db.Updateable<MES_WIP_DATA>()
.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 == pkg.WORK_ORDER && q.SN == pkg.SN)
+ .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ var endOperCode = CurPkg.IsReachedEndNode ? "EndNode" : "NotReachedEndNode";
+ db.Updateable<MES_WIP_HIS>()
+ .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>()
+ .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>()
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
.SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
+ .Where(q => q.WORK_ORDER == wo && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
}
+ });
+ //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
+ if (CurPkg.IsReachedEndNode)
+ {
+ CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
}
- });
- if (!dbTran.IsSuccess)
- {
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
}
}
- if (CurPkg.IsFinished)
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ //鏈�澶栧眰鍖呰鏈畬鎴愬寘瑁咃紝鍒欐妸宸ュ簭涓殏瀛樻爣璁拌涓簍rue锛屽緟鍏ㄩ儴鍖呰瀹屾垚鍐嶇粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = !CurPkg.IsFinished;
+ //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓�
+ if (CurPosition.Context.ContainsKey("CurPackage"))
{
- //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
- CurPosition.NeedTemporaryStoreDBCommitAction = false;
- //鍒犻櫎宸ュ簭涓婁笅鏂囦腑鐨勫寘瑁呰褰�
- CurPosition.Context.Remove("CurPackage");
- CurPosition.Context.Remove("CurLabelDic");
- //action.LocaleMsg = new($"鏉＄爜[{CurPkg.Item.Package?.SN}]鍖呰瀹屾垚");
- action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPkg.Item.Package.SN);
+ CurPosition.Context["CurPackage"] = CurPkg;
+ CurPosition.Context["CurLabelDic"] = LabelDic;
}
else
{
- //鏈�澶栧眰鍖呰鏈畬鎴愬寘瑁咃紝鍒欐妸宸ュ簭涓殏瀛樻爣璁拌涓簍rue锛屽緟鍏ㄩ儴鍖呰瀹屾垚鍐嶇粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
- CurPosition.NeedTemporaryStoreDBCommitAction = true;
- //濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓�
- if (CurPosition.Context.ContainsKey("CurPackage"))
- {
- CurPosition.Context["CurPackage"] = CurPkg;
- CurPosition.Context["CurLabelDic"] = LabelDic;
- }
- else
- {
- CurPosition.Context.Add("CurPackage", CurPkg);
- CurPosition.Context.Add("CurLabelDic", LabelDic);
- }
- //action.LocaleMsg = new($"鏉＄爜[{CurPosition.CurSN}]鍖呰瀹屾垚");
- action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPosition.CurSN);
+ CurPosition.Context.Add("CurPackage", CurPkg);
+ CurPosition.Context.Add("CurLabelDic", LabelDic);
}
+ //action.LocaleMsg = new($"鏉＄爜[{CurPosition.CurSN}]鍖呰瀹屾垚");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPosition.CurSN);
IsFinished = true;
CurStep?.SetStatusMessage(StepStatus.Finished, Biz.L("鍖呰瀹屾垚"));
action.Data.ShortMsg = new("鍖呰瀹屾垚", ShortMessage.Types.Success);
-
+
return action;
}
--
Gitblit v1.9.3