From 76b825da0c844d984a4d19003b96839e81ce9c37 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 十月 2024 11:26:13 +0800
Subject: [PATCH] 增加雅达专用外箱包装工序
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 804 ++++++++++++++++++++++++++++++++++++++++++++
Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 196 ++++++++++
Tiger.Business.MESTests/MesTests.cs | 5
Tiger.IBusiness.MES/Transaction/IYadaPacking.cs | 43 ++
Tiger.IBusiness.MES/WorkAction/IPrintInStoreLabel.cs | 12
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 4
6 files changed, 1,064 insertions(+), 0 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
new file mode 100644
index 0000000..7d5f8be
--- /dev/null
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -0,0 +1,804 @@
+锘縰sing Rhea.Common;
+using Tiger.IBusiness;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Tiger.Model;
+using Tiger.Model.Entitys.MES.Position;
+using Tiger.Business.MES.WorkAction;
+
+namespace Tiger.Business.MES.Transaction
+{
+ /// <summary>
+ /// 鍖呰宸ュ簭浜嬪姟
+ /// </summary>
+ public class YadaPacking : Position, IYadaPacking
+ {
+ public new IYadaPacking Init(string id, string apiHost, string userCode, string postCode)
+ {
+ base.Init(id, apiHost, userCode, postCode);
+ Logger.Console.Info($"User[{userCode}] start a {this.GetType().Name}[{postCode}] Transaction[ID: {TransID}]");
+ return this;
+ }
+
+ #region Propertys & Variables
+ /// <summary>
+ /// 宸ュ簭褰撳墠鎵ц鐨勬寚浠や唬鐮侊紝鍖呮嫭锛�<br/>
+ /// {null or ""}锛氬伐搴忕┖闂诧紝鎸囦护涓虹┖鍒欒涓哄伐搴忔病鏈夋墽琛屼换浣曟寚浠�<br/>
+ /// NodeSubmit锛氫骇鍝佽繃绔欙紝姝ｅ父浜у搧杩囩珯閫昏緫<br/>
+ /// PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝鎵嬪姩淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�<br/>
+ /// </summary>
+ public string NodeCmd { get; set; }
+ public PackingAction TempPkgAction { get; set; }
+ public bool IsPrintCustomerLabel { get; set; }
+ #endregion Propertys & Variables
+
+ #region Functions
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
+ {
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+ try
+ {
+ if (input.Qty.ToInt32() <= 0)
+ {
+ action.Data.ShortMsg = new("璇疯緭鍏ュ寘瑁呮暟閲�", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.Data.Data = "QtyError";
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"鍖呰鏁伴噺[{input.Qty}]涓嶆纭紝璇烽噸鏂拌緭鍏ユ暟閲忓悗缁х画鍖呰鎿嶄綔");
+ //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.QtyError", input.Qty);
+ return action;
+ }
+ if (input.Options.ContainsKey("IsPrintCustomerLabel"))
+ {
+ IsPrintCustomerLabel = input.Options["IsPrintCustomerLabel"].ToBoolean();
+ }
+ //PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝鎵嬪姩淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
+ if (NodeCmd == "PkgSubmit")
+ {
+ action = TempPkgAction.Submit(input);
+ //濡傛灉琛屼负琚爣璁版垚宸插畬鎴愶紝鍒欓噸缃伐搴�
+ if (TempPkgAction.IsFinished)
+ {
+ action.Data.OperInfo = CurOperInfo(input.Locale);
+ ResetNode();
+ }
+ }
+ //NodeSubmit锛氫骇鍝佽繃绔欙紝姝ｅ父浜у搧杩囩珯閫昏緫
+ else
+ {
+ //宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
+ if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
+ {
+ //鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
+ if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
+ {
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鎻愪氦鏁版嵁
+ action = NodeSubmit(action, input);
+ //鏇存柊宸ュ簭淇℃伅
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
+ }
+ //褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
+ else
+ {
+ var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
+ .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
+ .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
+
+ //鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
+ if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
+ {
+ var curSNs = wosns.Where(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue());
+ if (curSNs.Count() > 1 && curSNs.Any(q => q.SN.TRAY_SN != q.SN.OUTER_SN))
+ {
+ action.Data.ShortMsg = new("璇锋壂鎻忎骇鍝�", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鏉＄爜[{0}]鏄浇鍏锋潯鐮侊紝璇锋壂鎻忚浇鍏蜂腑鐨勪骇鍝佹潯鐮佺户缁寘瑁呮搷浣�");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
+ return action;
+ }
+ var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
+ if (!curPkg.IsNullOrEmpty() && !curPkg.IsFinished && curPkg.WorkBatch != curSNs.First().Batch.BATCH_NO)
+ {
+ action.Data.ShortMsg = new("宸ュ崟鎵规閿欒", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"姝ｅ湪鍖呰宸ュ崟鎵规[{0}]鐨勪骇鍝侊紝璇峰厛瀹屾垚褰撳墠鍖呰鍚庡啀鎵弿鍏朵粬鎵规[{1}]鐨勪骇鍝乕{2}]");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", curPkg.WorkBatch, curSNs.First().Batch.BATCH_NO, input.SN);
+ return action;
+ }
+ if (curSNs.First().Batch.ACT_LINE != CurLine.LINE_CODE)
+ {
+ action.Data.ShortMsg = new("浜х嚎鎶曚骇閿欒", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, curSNs.First().Batch.ACT_LINE);
+ }
+ else
+ {
+ if (CurBatch?.Batch?.ORDER_NO != curSNs.First().Batch.ORDER_NO)
+ {
+ //鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
+ var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = curSNs.First().Batch.ORDER_NO }, curSNs.First().Batch.BATCH_NO);
+ if (!result.IsSuccessed)
+ {
+ action.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = result.IsSuccessed;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+ }
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鏉＄爜杩囩珯
+ action = NodeSubmit(action, input);
+ if (!action.IsSuccessed && !CurWipSNs.Any())
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
+ }
+ }
+ //鏌ユ壘涓嶅埌鏉＄爜宸茬粦瀹氱殑宸ュ崟
+ else
+ {
+ var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault();
+ if (!lastSn.IsNullOrEmpty())
+ {
+ action.Data.ShortMsg = new($"浜у搧{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.SnStatusError", input.SN, lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
+ }
+ else
+ {
+ //娌℃湁褰撳墠宸ュ崟锛屽垯鍏堥�夋嫨宸ュ崟鍚庡啀鎵弿鏉＄爜
+ if (CurBatch.IsNullOrEmpty())
+ {
+ action.Data.ShortMsg = new("鏈�夋嫨宸ュ崟", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
+ }
+ //鏈夊綋鍓嶅伐鍗曚笖涓嶆槸鎶曞叆锛屽垯鎻愮ず鏉＄爜鏈姇鍏ョ敓浜э紝璇峰厛鍘婚绔欐壂鎻�
+ else
+ {
+
+ action.Data.ShortMsg = new("鏈姇鍏ョ敓浜�", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鏉＄爜[{input.SN}]灏氭湭鎶曞叆鐢熶骇锛岃鍏堝幓棣栫珯鎵弿", input.SN);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN);
+ }
+ }
+ }
+ }
+ }
+ //瀹屾垚宸ュ簭鑺傜偣宸ユ鍚庯紝鍚庡紑濮嬫墽琛屽綋鍓嶅伐搴忕殑琛屼负宸ユ
+ else if (IsFinishNodeSteps && !IsFinishAllSteps)
+ {
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+
+ var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();
+ //濡傛灉瀹㈡埛绔繑鍥炵殑褰撳墠宸ユID鎵句笉鍒版湭瀹屾垚鐨勮涓哄伐姝ワ紝鍒欑洿鎺ュ紑濮嬩笅涓�涓涓哄伐姝�
+ if (submitStep.IsNullOrEmpty())
+ {
+ action = BeginNextActionStep(input);
+ }
+ else
+ {
+ action = submitStep.Submit(input);
+ //濡傛灉褰撳墠宸ユ宸插畬鎴愶紝寮�濮嬫墽琛屼笅涓�宸ユ
+ if (action.IsSuccessed && submitStep.IsFinished)
+ {
+ action = BeginNextActionStep(input);
+ }
+ //濡傛灉褰撳墠宸ユ鏈畬鎴�
+ else
+ {
+ //琛屼负鎵ц鍑洪敊锛屽伐姝ヨ閲嶇疆
+ if (Steps.IsNullOrEmpty())
+ {
+ action.LocaleMsg = new(Biz.T(action.LocaleMsg, input.Locale) + Biz.T(Biz.L("MES.Transaction.Position.RescanSN"), input.Locale));
+ }
+ else
+ {
+ action.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ }
+ }
+ }
+ //濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
+ if (IsFinishAllSteps)
+ {
+ action = DoIfFinishAllSteps(action, input.Locale);
+ }
+ else
+ {
+ action.Data.OperInfo = CurOperInfo(input.Locale);
+ }
+ }
+ //娌℃湁鍙墽琛岀殑宸ユ
+ else
+ {
+ action.Data.ShortMsg = new("閲嶇疆鎵弿", ShortMessage.Types.Error);
+ action.Data.OperInfo = CurOperInfo(input.Locale);
+ ResetNode();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.WorkStepException", CurPosition.POST_CODE);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
+ action.Data.OperInfo = CurOperInfo(input.Locale);
+ //action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 宸ュ簭鑺傜偣宸ユ鎻愪氦鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
+ {
+ var curNode = CurBatch.GetNode(PostCode);
+ try
+ {
+ //宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊
+ if (curNode.IsNullOrEmpty())
+ {
+ action.Data.ShortMsg = new("鏈煡宸ュ簭", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宀椾綅[{0}]鍦ㄥ伐鍗昜{1}]宸ヨ壓璺嚎涓壘涓嶅埌瀵瑰簲鐨勫伐搴忥紝璇锋鏌ュ伐鍗曞伐鑹鸿矾绾夸腑宸ュ簭涓庡矖浣嶇殑缁戝畾鍏崇郴鏄惁姝ｇ‘");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
+ return action;
+ }
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
+ //褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
+ if (Steps.IsNullOrEmpty())
+ {
+ BeginAt = DateTime.Now;
+ //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜�
+ var woStatus = CurBatch.CheckCanProduce(curNode, curNodeSetting);
+ if (!woStatus.IsSuccessed)
+ {
+ woStatus.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
+ return woStatus;
+ }
+
+ var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).ToList();
+ if (wipSNs.IsNullOrEmpty())
+ {
+ var wipSN = new MES_WIP_DATA()
+ {
+ SN = input.SN,
+ FLOW_SN = input.SN,
+ STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
+ ITEM_CODE = CurBatch.WO.ITEM_CODE,
+ WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ BATCH_NO = CurBatch.Batch.BATCH_NO,
+ FTY_CODE = CurFactory.FTY_CODE,
+ WS_CODE = CurWorkshop.WS_CODE,
+ LINE_CODE = CurLine.LINE_CODE,
+ POST_CODE = CurPosition.POST_CODE,
+ HOLD_FLAG = "N",
+ REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
+ FINISHED_FLAG = "N",
+ INV_FLAG = "N",
+ DFT_FLAG = "N",
+ DFT_COUNT = 0,
+ };
+ wipSNs.Add(wipSN);
+ }
+
+ //濡傛灉鏉＄爜涓嶆槸褰撳墠宸ュ崟鎴栬�呬骇绾跨殑鍒欐姤閿�
+ if (wipSNs.Any(q => q.WORK_ORDER != CurBatch.WO.ORDER_NO || q.LINE_CODE != CurLine.LINE_CODE))
+ {
+ if (wipSNs.First().LINE_CODE == CurLine.LINE_CODE)
+ {
+ action.Data.ShortMsg = new("宸ュ崟閿欒", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"浜у搧[{CurSN}]涓嶅睘浜庡綋鍓嶅伐鍗曪紝璇峰垏鎹㈠埌宸ュ崟[{wipSNs.First().WORK_ORDER}]鍚庡啀鎵弿");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.WoError", input.SN, wipSNs.First().WORK_ORDER);
+ return action;
+ }
+ else
+ {
+ action.Data.ShortMsg = new("浜х嚎閿欒", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"浜у搧[{CurSN}]宸插湪浜х嚎[{wipSNs.First().LINE_CODE}]鎶曚骇锛岃鍒颁骇绾縖{wipSNs.First().LINE_CODE}]鎵弿");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.LineError", input.SN, wipSNs.First().LINE_CODE);
+ return action;
+ }
+ }
+
+ //闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
+ var canGotoNext = CurBatch.CanGotoNext(input, wipSNs.First(), curNode);
+ if (!canGotoNext.IsSuccessed)
+ {
+ woStatus.Data.ShortMsg = new("杩涚珯閿欒", ShortMessage.Types.Error);
+ return canGotoNext;
+ }
+
+ //璁剧疆褰撳墠鎸囦护涓烘甯镐骇鍝佽繃绔�
+ NodeCmd = "NodeSubmit";
+
+ //缁戝畾鏉＄爜鍒板伐鍗�
+ foreach (var wipSN in wipSNs)
+ {
+ if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))
+ {
+ CurBatch.WoSNs.Add(new()
+ {
+ WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WIP_ID = wipSN.ID,
+ SN = wipSN.SN,
+ FLOW_SN = wipSN.SN,
+ TRAY_SN = wipSN.TRAY_SN,
+ STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
+ });
+ }
+ }
+
+ //鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
+ foreach (var woSN in woSNs)
+ {
+ woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
+ woSN.AUTH_PROD = CurLine.LINE_CODE;
+ woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
+ }
+
+ //鏉＄爜杩囩珯
+ foreach (var wipSN in wipSNs)
+ {
+ wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
+ wipSN.AUTH_PROD = CurLine.LINE_CODE;
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.OK.GetValue();//wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
+ wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
+ wipSN.NODE_ID = curNode.ID;
+ wipSN.NODE_NAME = curNode.NODE_NAME;
+ wipSN.FTY_CODE = CurFactory.FTY_CODE;
+ wipSN.WS_CODE = CurWorkshop.WS_CODE;
+ wipSN.LINE_CODE = CurLine.LINE_CODE;
+ wipSN.POST_CODE = CurPosition.POST_CODE;
+ wipSN.OPER_CODE = curNode.OPER_CODE;
+ wipSN.SEGMENT = curNode.SEGMENT;
+ wipSN.OPERATION_TIME = DateTime.Now;
+ var curShiftPeriod = GetShiftPeriodForNow();
+ if (!curShiftPeriod.IsNullOrEmpty())
+ {
+ wipSN.SFTS_CODE = curShiftPeriod.ShiftSys.SFTS_CODE;
+ wipSN.SFT_CODE = curShiftPeriod.Shift.SFT_CODE;
+ wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
+ }
+ //濡傛灉鏄姇鍏ョ珯
+ if (curNodeSetting.IS_INPUT == "Y")
+ {
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
+ woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
+ wipSN.INLINE_DATE = DateTime.Now;
+ }
+ //濡傛灉鏄骇鍑虹珯
+ if (curNodeSetting.IS_OUTPUT == "Y")
+ {
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
+ woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+ wipSN.OUTLINE_DATE = DateTime.Now;
+ }
+ //濡傛灉鏈夋彁浜や笉鑹�
+ if (!input.DFT_CODE.IsNullOrEmpty())
+ {
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.NG.GetValue();
+ wipSN.DFT_FLAG = "Y";
+ wipSN.DFT_COUNT++;
+ wipSN.DFT_CODE = input.DFT_CODE;
+ var dft = CurBatch.Defects.FirstOrDefault(q => q.DFT_CODE == wipSN.DFT_CODE);
+ var defect = new MES_WIP_DFT()
+ {
+ AUTH_ORG = wipSN.AUTH_ORG,
+ AUTH_PROD = wipSN.LINE_CODE,
+ WIP_ID = wipSN.ID,
+ SN = wipSN.SN,
+ STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
+ ITEM_CODE = wipSN.ITEM_CODE,
+ WORK_ORDER = wipSN.WORK_ORDER,
+ BATCH_NO = wipSN.BATCH_NO,
+ ROT_CODE = wipSN.ROT_CODE,
+ NODE_ID = wipSN.NODE_ID,
+ NODE_NAME = wipSN.NODE_NAME,
+ FTY_CODE = wipSN.FTY_CODE,
+ WS_CODE = wipSN.WS_CODE,
+ LINE_CODE = wipSN.LINE_CODE,
+ POST_CODE = wipSN.POST_CODE,
+ OPER_CODE = wipSN.OPER_CODE,
+ SEGMENT = wipSN.SEGMENT,
+ DFT_CODE = dft.DFT_CODE,
+ DFT_NAME = dft.DFT_NAME,
+ DFT_LEVEL = dft.DFT_LEVEL,
+ FLOW_SN = wipSN.FLOW_SN,
+ TRAY_SN = wipSN.TRAY_SN,
+ INNER_SN = wipSN.INNER_SN,
+ CARTON_SN = wipSN.CARTON_SN,
+ PALLET_SN = wipSN.PALLET_SN,
+ INV_FLAG = wipSN.INV_FLAG,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSN.SFTS_CODE,
+ SFT_CODE = wipSN.SFT_CODE,
+ PRD_CODE = wipSN.PRD_CODE,
+ OBA_BATCH = wipSN.OBA_BATCH,
+ LOCK_BATCH = wipSN.LOCK_BATCH,
+ };
+ CurDefects.Add(defect);
+ }
+ }
+
+ //宸ュ崟寮�宸�
+ CurBatch.StartWorking(UserCode);
+
+ //鎶婂綋鍓嶆潯鐮佸鍔犲埌褰撳墠鏉＄爜鍒楄〃
+ CurWipSNs = wipSNs;
+ CurWipSNHiss.Clear();
+ foreach (var wipSN in wipSNs)
+ {
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛锛圱ransId锛歿TransID}锛�");
+ wipSN.History.Add(his);
+ CurWipSNHiss.Add(his);
+ }
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _woSns = woSNs.Clone();
+ var _wipSns = wipSNs.Clone();
+ var _wipHiss = CurWipSNHiss.Clone();
+ var _defect = CurDefects.Clone();
+ var _curNodeSetting = curNodeSetting.Clone();
+ var _Batch = CurBatch.Batch.Clone();
+
+ //鍒濆鍖栧伐姝ュ垪琛�
+ Steps.Clear();
+ var curStep = new WorkStep(IWorkStep.NodeTypes.Node, this)
+ {
+ Name = "鎵弿浜у搧",
+ Sequence = Steps.Count + 1,
+ Node = curNode,
+ OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
+ DBSubmitAction = () =>
+ {
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Storageable(_woSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+ //濡傛灉鏈変笉鑹垯淇濆瓨
+ if (_defect.Any())
+ {
+ db.Storageable(_defect, UserCode).ExecuteCommand();
+ }
+ //濡傛灉鏄姇鍏ョ珯
+ if (_curNodeSetting.IS_INPUT == "Y")
+ {
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
+ }
+ //濡傛灉鏄骇鍑虹珯
+ if (_curNodeSetting.IS_OUTPUT == "Y")
+ {
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
+ }
+ }
+ };
+ Steps.Add(curStep);
+
+ //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
+
+ //鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
+ try
+ {
+ GenerateSteps(curStep);
+ }
+ catch (System.Exception ex)
+ {
+ ResetNode();
+ //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚涓哄伐姝ョ敓鎴愬紓甯革紝璇锋鏌ュ伐搴忚涓鸿缃�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmit.GenerateStepsException", curNode.NODE_NAME));
+ }
+
+ //瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
+ CurStep = curStep;
+ }
+ else if (!IsFinishNodeSteps)
+ {
+ var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
+
+ //鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙峰鐞嗙浉搴斿伐姝ョ殑澶勭悊閫昏緫
+ switch (curStep.Sequence)
+ {
+ case 2:
+ {
+ //绗簩宸ユ鐨勫鐞嗛�昏緫
+
+
+ //瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
+ curStep.IsFinished = true;
+ curStep.Status = StepStatus.Finished;
+ CurStep = curStep;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ //鏈畬鎴愭墍鏈夊伐姝�
+ if (!IsFinishAllSteps)
+ {
+ //鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
+ if (!IsFinishNodeSteps)
+ {
+ var next = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
+ //璁剧疆鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
+ NextSteps.Clear();
+ NextSteps.Add(next);
+ //鏍规嵁鍚庣画宸ユ杩斿洖ApiAction
+ action.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
+
+ //鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
+ switch (next.Sequence)
+ {
+ case 2:
+ //action.LocaleMsg = new($"璇锋墽琛岀浜屾");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.绗簩姝ユ搷浣滄彁绀�");
+ break;
+ default:
+ break;
+ }
+ }
+ //宸插畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝ワ紝寮�濮嬫墽琛岃涓哄伐姝�
+ else
+ {
+ action = BeginNextActionStep(input);
+ }
+ }
+ //宸插畬鎴愭墍鏈夊伐姝�
+ if (IsFinishAllSteps)
+ {
+ action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
+ action = DoIfFinishAllSteps(action, input.Locale);
+ }
+ }
+ catch (Exception ex)
+ {
+ action.Data.ShortMsg = new("宸ユ寮傚父", ShortMessage.Types.Error);
+ ResetNode();
+ //action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯革紝璇锋鏌ュ伐搴忚妭鐐硅缃�");
+ action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 瀹屾垚鎵�鏈夊伐姝ュ悗鎵ц
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
+ {
+ var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
+ var operInfo = SetOperNodeInfo(CurOperInfo(locale));
+ Action endAction = null;
+
+ //濡傛灉褰撳墠鏉＄爜宸茬粡璧板埌娴佺▼缁堢偣鍒欒褰曟潯鐮佸畬宸�
+ if (operInfo.IsReachedEndNode)
+ {
+ //鏍囪褰撳墠鍖呰淇℃伅涓虹粓鐐圭珯
+ if (!curPkg.IsNullOrEmpty())
+ {
+ curPkg.IsReachedEndNode = true;
+ }
+ //鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
+ var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
+ foreach (var woSN in woSNs)
+ {
+ woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
+ }
+ var curNode = CurBatch.Nodes.First(q => q.OPER_CODE == "EndNode");
+ //鏉＄爜瀹屽伐
+ foreach (var wipSN in CurWipSNs)
+ {
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+ wipSN.NODE_ID = curNode.ID;
+ wipSN.NODE_NAME = curNode.NODE_NAME;
+ wipSN.OPER_CODE = curNode.OPER_CODE;
+ wipSN.SEGMENT = curNode.SEGMENT;
+ wipSN.OPERATION_TIME = DateTime.Now;
+ }
+
+ var wipHiss = new List<MES_WIP_HIS>();
+ foreach (var wipSN in CurWipSNs)
+ {
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛");
+ wipSN.History.Add(his);
+ wipHiss.Add(his);
+ }
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _woSns = woSNs.Clone();
+ var _wipSns = CurWipSNs.Clone();
+ var _wipHiss = wipHiss.Clone();
+ var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item) : new();
+ //淇濆瓨鏁版嵁
+ endAction = () =>
+ {
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Updateable(_woSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME }).ExecuteCommand();
+ db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+ if (_pkgList.Any())
+ {
+ var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var wo = _pkgList.First().WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ 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.OPER_CODE == "EndNode" && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ }
+ };
+ }
+
+ //淇濆瓨鏁版嵁搴�
+ SaveStepsCommitActionToDB(endAction);
+
+ //淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
+ CurOperInfo(locale).InputQty += CurWipSNs.Count;
+ action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };
+ action.Data.OperInfo = operInfo;
+ action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+
+ //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
+ if (action.Data.OperInfo.IsReachedEndNode)
+ {
+ CurBatch.CheckIsComplete(UserCode);
+ }
+
+ //閲嶇疆宸ュ簭
+ ResetNode();
+
+ return action;
+ }
+
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<SubmitOutput>> CompletePkg(ApiAction input)
+ {
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+ try
+ {
+ //PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
+ if (NodeCmd.IsNullOrEmpty("PkgSubmit") == "PkgSubmit" || CurWipSNs.IsNullOrEmpty())
+ {
+ if (Context.ContainsKey("CurPackage"))
+ {
+ TempPkgAction = new PackingAction();
+ TempPkgAction.Init(this);
+
+ var CurPkg = Context["CurPackage"] as WipPkg;
+ int shipQty = input.Data.ToInt32();
+ int curQty = CurPkg.Item.TotalQty;
+ int ruleQty = TempPkgAction.PkgRule.GetTotalQty();
+ //鏈夊～鍑鸿揣鏁伴噺鍒欓獙璇佸綋鍓嶅寘瑁呮暟閲忓繀椤荤瓑浜庯紙鍑鸿揣鏁伴噺/鍖呰瑙勫垯鏁伴噺锛夌殑浣欐暟
+ if (shipQty > 0 && curQty != shipQty % ruleQty)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鍑鸿揣鏁伴噺璁惧畾涓篬{0}]锛岀洰鍓嶅寘瑁呬簡[{1}]锛屽寘瑁呭熬鏁扮殑鏁伴噺蹇呴渶鏄痆{2}]锛岃瑁呭鏁伴噺鍚庡啀缁撴潫鍖呰");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NotMatchShipQty", shipQty, curQty, shipQty % ruleQty);
+ return action;
+ }
+
+ NodeCmd = "PkgSubmit";
+ action = TempPkgAction.Submit(null);
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鎵句笉鍒版殏瀛樼殑鍖呰鏁版嵁锛屾棤闇�鎵嬪姩缁撴潫鍖呰");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NoCurPackage");
+ }
+ }
+ //宸ュ簭澶勪簬鍏朵粬鍛戒护妯″紡锛屼笉鍏佽鎵嬪姩缁撴潫鍖呰
+ else
+ {
+ switch (NodeCmd)
+ {
+ case "NodeSubmit":
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"姝ｅ湪杩涜鏉＄爜[{CurWipSN.SN}]鐨勮繃绔欎笟鍔★紝涓嶅厑璁告墜鍔ㄧ粨鏉熷寘瑁�");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.WorkingOnNodeSubmit", CurSN);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁呭紓甯�");
+ NodeCmd = null;
+ }
+ return action;
+ }
+
+ #endregion Functions
+
+ /// <summary>
+ /// 閲嶇疆褰撳墠宸ユ锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
+ /// </summary>
+ public override void ResetNode()
+ {
+ base.ResetNode();
+ NodeCmd = null;
+ }
+
+ public override bool Close(bool needSaveHistoryLog = false)
+ {
+ //needSaveHistoryLog = true;
+ //淇濆瓨鎿嶄綔鏃ュ織
+
+ this.IsFinished = true;
+ return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
+ }
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
new file mode 100644
index 0000000..545a495
--- /dev/null
+++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -0,0 +1,196 @@
+锘縰sing Rhea.Common;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+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;
+using Tiger.Model.Entitys.MES.Position;
+
+namespace Tiger.Business.MES.WorkAction
+{
+ public class PrintInStoreLabel : IPrintInStoreLabel
+ {
+ #region Propertys & Variables
+ #region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public bool IsFinished { get; set; } = false;
+ public IWorkStep CurStep { get; set; }
+ public IPosition CurPosition { get; set; }
+ public MES_WO_NODE_ACT NodeAct { get; set; }
+ public MES_WO_ACTION Setting { get; set; }
+ #endregion
+ public BAS_LABEL_TEMP Label { get; set; }
+ public List<BAS_LABEL_PV> LabelPV { get; set; }
+ #endregion Propertys & Variables
+
+ #region Functions
+ /// <summary>
+ /// 鍒濆鍖栧伐搴忚涓�
+ /// </summary>
+ /// <returns></returns>
+ public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
+ {
+ #region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ CurStep = curStep;
+ CurPosition = position;
+ NodeAct = nodeAct;
+ Setting = setting;
+ #endregion
+
+ Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
+ LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+
+ CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
+ CurStep.Status = StepStatus.Normal;
+ }
+
+ /// <summary>
+ /// 鑾峰彇琛屼负寮�濮嬬殑鎻愮ず淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public Locale GetBeginMsg()
+ {
+ var msg = new Locale("MES.WorkAction.PrintInStoreLabel.BeginMsg", CurPosition.CurSN, Label.LABEL_CODE, Label.LABEL_NAME);
+ //var msg = new Locale($"寮�濮嬫墦鍗版潯鐮乕{CurPosition.CurWipSN.SN}]鐨勫叆搴撴爣绛綶{Label.LABEL_CODE}: {Label.LABEL_NAME}]");
+ return msg;
+ }
+
+ /// <summary>
+ /// 灏濊瘯寮�濮嬫墽琛屽伐搴忚涓�
+ /// </summary>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
+ {
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+
+ if (CurPosition is YadaPacking && !(CurPosition as YadaPacking).IsPrintCustomerLabel)
+ {
+ action = End(input);
+ }
+ else
+ {
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
+ action.Data.Data = Label;
+
+ //濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("鎵撳嵃寮�濮�");
+ CurStep.Status = StepStatus.Normal;
+ action.IsSuccessed = true;
+ action.Data.ShortMsg = new("鎵撳嵃寮�濮�", ShortMessage.Types.Success);
+ }
+ return action;
+ }
+
+ /// <summary>
+ /// 宸ュ簭琛屼负鎻愪氦鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> Submit(SubmitInput input)
+ {
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+ //鎻愪氦鏁版嵁鎵ц鎴愬姛
+ if (input.Data.ToBoolean())
+ {
+ action = End(input);
+ }
+ //鎻愪氦鏁版嵁鎵ц澶辫触
+ else
+ {
+ CurStep.Message = Biz.L("鎵撳嵃澶辫触");
+ CurStep.Status = StepStatus.Error;
+ action.Data.ShortMsg = new("鎵撳嵃澶辫触", ShortMessage.Types.Failed);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鍏ュ簱鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃澶辫触", Label.LABEL_NAME);
+ action.LocaleMsg = new("MES.WorkAction.PrintInStoreLabel.PrintFail", Label.LABEL_NAME, Label.LABEL_CODE);
+ //濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
+ if (NodeAct.NEED_RESET == "Y")
+ {
+ CurPosition.ResetNode();
+ }
+ }
+ return action;
+ }
+ /// <summary>
+ /// 缁撴潫鎵ц宸ュ簭琛屼负
+ /// </summary>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> End(SubmitInput input)
+ {
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+
+ //璁板綍琛屼负鎿嶄綔璁板綍
+ 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,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
+ SN = wipSn.SN,
+ STATUS = wipSn.STATUS,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
+ TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSn.SFTS_CODE,
+ SFT_CODE = wipSn.SFT_CODE,
+ PRD_CODE = wipSn.PRD_CODE,
+ ACT_TYPE = NodeAct.ACT_TYPE,
+ ACT_SN = wipSn.SN,
+ ACT_VALUE_1 = Label.LABEL_CODE,
+ ACT_VALUE_2 = Label.Variables.ToJson(),
+ ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
+ TRACE_INFO = $"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃鎴愬姛",
+ };
+ if (CurPosition is YadaPacking && !(CurPosition as YadaPacking).IsPrintCustomerLabel)
+ {
+ wipAct.TRACE_INFO = $"鏃犻渶鎵撳嵃鍏ュ簱鏍囩";
+ }
+ wipActs.Add(wipAct);
+ }
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _wipActs = wipActs.Clone();
+ //淇濆瓨鏁版嵁
+ CurStep.DBSubmitAction = () =>
+ {
+ var db = CurPosition.GetCommitDB();
+ db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ };
+
+ IsFinished = true;
+ CurStep.Message = Biz.L("鎵撳嵃瀹屾垚");
+ CurStep.Status = StepStatus.Finished;
+ action.Data.ShortMsg = new("鎵撳嵃瀹屾垚", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"鍏ュ簱鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃鎴愬姛", Label.LABEL_NAME);
+ action.LocaleMsg = new("MES.WorkAction.PrintInStoreLabel.PrintSuccess", Label.LABEL_NAME, Label.LABEL_CODE);
+ return action;
+ }
+
+ #endregion Functions
+ }
+}
diff --git a/Tiger.Business.MESTests/MesTests.cs b/Tiger.Business.MESTests/MesTests.cs
index 37a2a21..a8d5bf0 100644
--- a/Tiger.Business.MESTests/MesTests.cs
+++ b/Tiger.Business.MESTests/MesTests.cs
@@ -14,6 +14,11 @@
[TestMethod()]
public void CommonTest()
{
+ var dic = new Dictionary<string, string>();
+ dic.Add("1", "11");
+ dic.Add("2", "222");
+ var dicStr = dic.ToJson();
+
var date = new DateTime(2021,1,2);
var firstDay = new DateTime(date.Year, 1, 1);
diff --git a/Tiger.IBusiness.MES/Transaction/IYadaPacking.cs b/Tiger.IBusiness.MES/Transaction/IYadaPacking.cs
new file mode 100644
index 0000000..274b6e4
--- /dev/null
+++ b/Tiger.IBusiness.MES/Transaction/IYadaPacking.cs
@@ -0,0 +1,43 @@
+锘縰sing Rhea.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tiger.Model;
+using Tiger.Model.Entitys.MES;
+using Tiger.Model.Entitys.MES.Position;
+
+namespace Tiger.IBusiness
+{
+ public interface IYadaPacking : IPosition
+ {
+ public bool IsPrintCustomerLabel { get; set; }
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氬垵濮嬪寲
+ /// </summary>
+ /// <param name="id"></param>
+ /// <param name="apiHost"></param>
+ /// <param name="userCode"></param>
+ /// <param name="postCode"></param>
+ /// <returns></returns>
+ public new IYadaPacking Init(string id, string apiHost, string userCode, string postCode);
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氶�夋嫨宸ュ崟
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public Task<ApiAction> SelectOrder(WoInput input, string batchNo = "");
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public Task<ApiAction<SubmitOutput>> Submit(SubmitInput input);
+ /// <summary>
+ /// 鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁�
+ /// </summary>
+ /// <returns></returns>
+ public Task<ApiAction<SubmitOutput>> CompletePkg(ApiAction input);
+ }
+}
diff --git a/Tiger.IBusiness.MES/WorkAction/IPrintInStoreLabel.cs b/Tiger.IBusiness.MES/WorkAction/IPrintInStoreLabel.cs
new file mode 100644
index 0000000..c69c5f6
--- /dev/null
+++ b/Tiger.IBusiness.MES/WorkAction/IPrintInStoreLabel.cs
@@ -0,0 +1,12 @@
+锘縰sing Newtonsoft.Json;
+using Rhea.Common;
+using System;
+using Tiger.Model;
+
+namespace Tiger.IBusiness.MES.WorkAction
+{
+ public interface IPrintInStoreLabel : IWorkAction
+ {
+
+ }
+}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index ba389de..2517a72 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -46,6 +46,10 @@
/// </summary>
public string DFT_CODE { get; set; }
/// <summary>
+ /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
+ /// </summary>
+ public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
+ /// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
--
Gitblit v1.9.3