From 10f3247a8320da7e1e519c20b8014c65958301c2 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 31 七月 2024 23:17:05 +0800
Subject: [PATCH] 模板变量维护更新
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 312c526..23cc2a3 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -24,7 +24,7 @@
public BAS_PKG_RULE PkgRule { get; set; }
public WipPkg CurPkg { get; set; }
public WipPkgItem CurPkgItem { get; set; }
- public PackingActionOutput CurPrint { get; set; }
+ public PackingActionOutput CurCmd { get; set; }
public int PrintTimes = 0;
public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; }
public List<BAS_LABEL_PV> LabelPV { get; set; }
@@ -44,8 +44,16 @@
NodeAct = nodeAct;
Setting = setting;
#endregion
-
- PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
+ //鎵嬪姩缁撴潫鍖呰涓撶敤锛屼复鏃舵墽琛岃涓�
+ if (setting.IsNullOrEmpty())
+ {
+ PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
+ }
+ //姝ｅ父鏉＄爜杩囩珯鎵ц鍖呰琛屼负
+ else
+ {
+ PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
+ }
//鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
for (int i = 1; i < 10; i++)
{
@@ -153,7 +161,7 @@
data.ExecCode = "Print";
data.PkgLevel = min.PKG_LEVEL;
data.PrintLable = LabelDic[min.PKG_LEVEL];
- CurPrint = data;
+ CurCmd = data;
PrintTimes++;
action.Data.Data = data;
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{min.PKG_LEVEL}灞傚寘瑁匸{min.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[min.PKG_LEVEL].LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
@@ -173,15 +181,18 @@
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
- var pInput = input.Data?.JsonToObject<PackingActionInput>();
- switch (pInput.ExecCode)
+ var pInput = input?.Data?.JsonToObject<PackingActionInput>();
+ switch (pInput?.ExecCode)
{
//Scan锛氭壂鐮侊紝鎵弿褰撳墠鍖呰灞傜骇鐨勬潯鐮�
case "Scan":
+ if (CurCmd.IsNullOrEmpty() || CurCmd.ExecCode == "Scan" || (CurCmd.ExecCode == "Print" && CurCmd.PkgLevel == pInput.PkgLevel))
{
//瀹㈡埛绔壂鎻忔垚鍔�
if (pInput.IsFinish)
{
+ CurCmd = null;
+ PrintTimes = 0;
action = SavePkgData(input, action);
}
//瀹㈡埛绔壂鎻忓け璐�
@@ -197,16 +208,18 @@
break;
//Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�
case "Print":
+ if (CurCmd.ExecCode == "Print")
{
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
//瀹㈡埛绔畬鎴愭墦鍗�
if (pInput.IsFinish)
{
- CurPrint = null;
+ CurCmd = null;
PrintTimes = 0;
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
action.Data.Data = data;
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
@@ -215,29 +228,76 @@
else
{
//濡傛灉鎵撳嵃澶辫触鍒欏皾璇曚笁娆￠噸鏂版墦鍗帮紝濡傛灉閮藉け璐ュ垯閲嶇疆宸ュ簭
- if (PrintTimes < 3 && !CurPrint.IsNullOrEmpty())
+ if (PrintTimes < 3 && !CurCmd.IsNullOrEmpty())
{
PrintTimes++;
- action.Data.Data = CurPrint;
+ action.Data.Data = CurCmd;
//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
{
- CurPrint = null;
+ CurCmd = null;
PrintTimes = 0;
action.IsSuccessed = false;
//action.LocaleMsg = new($"灏濊瘯绗瑊PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL].LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]澶辫触锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PrintFail3Times", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL].LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
- CurPosition.ResetSteps();
+ CurPosition.ResetNode();
}
}
}
break;
// Complete锛氬畬鎴愶紝瀹屾垚鍏ㄩ儴鍖呰鍚庣粨鏉熻涓�
case "Complete":
+ if (CurCmd.ExecCode == "Complete")
{
+ CurCmd = null;
+ PrintTimes = 0;
action = End();
+ }
+ break;
+ // 鎵嬪姩缁撴潫鍖呰锛屼繚瀛樻殏瀛樼殑鍖呰鏁版嵁
+ case null:
+ {
+ CurCmd = null;
+ PrintTimes = 0;
+ FinishLevel = 1;
+ WipPkgItem curItem = CurPkg.Item;
+ while (curItem.PKG_LEVEL > 2)
+ {
+ var next = curItem.Items.FirstOrDefault(q => !q.IsFinished);
+ curItem = next;
+ }
+ CurPkgItem = curItem;
+
+ //鎵嬪姩缁撴潫鍖呰榛樿浠庣浜屽眰鍖呰寮�濮嬮獙璇�
+ var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == 2);
+ //琛屼负璁惧畾鐨凮PTION_1-9鏄寘瑁呬笉鍚屽眰绾х殑鏍囩妯℃澘浠ｇ爜锛屽鏋滀负绌哄垯涓嶉渶瑕佹墦鍗�
+ if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Scan";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
+ action.Data.Data = data;
+ //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.Data = data;
+ //action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{min.PKG_LEVEL}灞傚寘瑁匸{min.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[min.PKG_LEVEL].LABEL_CODE}: {LabelDic[min.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);
+ }
}
break;
default:
@@ -247,7 +307,7 @@
//濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
if (!action.IsSuccessed && NodeAct.NEED_RESET == "Y")
{
- CurPosition.ResetSteps();
+ CurPosition.ResetNode();
}
return action;
}
@@ -364,11 +424,14 @@
curItem = next;
}
//娣诲姞褰撳墠鐨勫寘瑁呮槑缁嗗埌涓婁竴灞傚寘瑁呯殑鏄庣粏鍒楄〃
- curItem.Items.Add(CurPkgItem);
+ if (!curItem.Items.Contains(CurPkgItem))
+ {
+ curItem.Items.Add(CurPkgItem);
+ }
CurPkgItem = curItem;
//娣诲姞鏄庣粏鍚庡垽鏂綋鍓嶅寘瑁呭眰绾х殑鏄庣粏鏁伴噺鏄惁绛変簬鍖呰鏁伴噺锛岃嫢鐩哥瓑鍒欐爣璁板綋鍓嶅寘瑁呭眰绾т负瀹屾垚骞跺皾璇曟墦鍗版爣绛�
- if (CurPkgItem.Items.Count == CurPkgItem.PKG_QTY)
+ if (CurPkgItem.Items.Count(q => q.IsFinished) == CurPkgItem.PKG_QTY || CurStep.IsNullOrEmpty())
{
//琛屼负璁惧畾鐨凮PTION_1-9鏄寘瑁呬笉鍚屽眰绾х殑鏍囩妯℃澘浠ｇ爜锛屽鏋滀负绌哄垯涓嶉渶瑕佹墦鍗�
if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
@@ -376,6 +439,7 @@
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
action.Data.Data = data;
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
@@ -389,7 +453,7 @@
data.ExecCode = "Print";
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
- CurPrint = data;
+ CurCmd = data;
PrintTimes++;
action.Data.Data = data;
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL].LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
@@ -409,7 +473,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = new($"瀹㈡埛绔彁浜ょ殑鍖呰灞傜骇[{pdtl.PKG_LEVEL}]({pdtl.PkgType.PKG_NAME})鏁版嵁涓嶆槸姝ｅ湪澶勭悊鐨勫寘瑁呭眰绾{dtl.PKG_LEVEL}]({dtl.PkgType.PKG_NAME})锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
action.LocaleMsg = new("MES.WorkAction.PackingAction.SaveLevelNotMatchException", pdtl.PKG_LEVEL, pdtl.PkgType.PKG_NAME, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- CurPosition.ResetSteps();
+ CurPosition.ResetNode();
}
}
}
@@ -420,7 +484,7 @@
action.IsSuccessed = false;
//action.LocaleMsg = new($"鎵弿绗瑊dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮乕{input.SN}]鍚庝繚瀛樻暟鎹け璐ワ紝宸ュ簭宸查噸缃紝璇烽噸鏂版壂鎻忚繘绔欎骇鍝佹潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.SavePkgDataException", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, input.SN);
- CurPosition.ResetSteps();
+ CurPosition.ResetNode();
}
return action;
}
@@ -459,10 +523,17 @@
var data = new PackingActionOutput() { PkgInfo = CurPkg };
data.ExecCode = "Complete";
data.PkgLevel = CurPkg.Item.PKG_LEVEL;
+ CurCmd = data;
action.Data.Data = data;
//action.LocaleMsg = new($"绗瑊CurPkg.Item.PKG_LEVEL}灞傚寘瑁匸{CurPkg.Item.PKG_NAME}]宸茬粡鍏ㄩ儴瀹屾垚锛屼繚瀛樺寘瑁呮暟鎹�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageComplete", CurPkg.Item.PKG_LEVEL, CurPkg.Item.PKG_NAME);
+ //鎵嬪姩缁撴潫鍖呰鍒欐爣璁拌涓哄畬鎴�
+ if (CurStep.IsNullOrEmpty())
+ {
+ IsFinished = true;
+ }
+
return action;
}
--
Gitblit v1.9.3