From c598e4bf57de2b4703d6c0e4d0905c9159273d26 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 06 八月 2024 10:16:18 +0800
Subject: [PATCH] 条码增加托盘批量过站逻辑和包装外箱过站逻辑
---
Tiger.Business.MES/Transaction/PackingNode.cs | 219 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 93 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index b6b5ba4..b6ca249 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -75,25 +75,32 @@
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- var wosn = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
- .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).First();
+ 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))
+ .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
- if (!wosn.IsNullOrEmpty())
+ if (!wosns.IsNullOrEmpty())
{
- if (wosn.Batch.ACT_LINE != CurLine.LINE_CODE)
+ if (wosns.Count > 1 && wosns.Any(q => q.SN.TRAY_SN != q.SN.OUTER_SN))
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"鏉＄爜[{0}]鏄浇鍏锋潯鐮侊紝璇锋壂鎻忚浇鍏蜂腑鐨勪骇鍝佹潯鐮佺户缁寘瑁呮搷浣�");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
+ return action;
+ }
+ if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)
{
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
- action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosn.Batch.ACT_LINE);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosns.First().Batch.ACT_LINE);
return action;
}
else
{
- if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
+ if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO)
{
//鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
- var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
+ var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });
if (!result.IsSuccessed)
{
action.IsSuccessed = result.IsSuccessed;
@@ -199,21 +206,26 @@
return woStatus;
}
//闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
+ var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => (q.SN == input.SN || q.TRAY_SN == input.SN) && q.WORK_ORDER == CurBatch.WO.ORDER_NO).ToList();
+ if (wipSNs.IsNullOrEmpty())
{
- 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,
- 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,
- };
- var canGotoNext = CurBatch.CanGotoNext(input, wipSN, curNode);
+ var wipSN = new MES_WIP_DATA()
+ {
+ 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,
+ 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);
+ }
+ var canGotoNext = CurBatch.CanGotoNext(input, wipSNs.First(), curNode);
if (!canGotoNext.IsSuccessed)
{
return canGotoNext;
@@ -223,70 +235,91 @@
if (Steps.IsNullOrEmpty())
{
//缁戝畾鏉＄爜鍒板伐鍗�
- if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
- {
- CurBatch.WoSNs.Add(new()
- {
- WORK_ORDER = CurBatch.Batch.ORDER_NO,
- SN = input.SN,
- STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
- });
- }
- var woSN = CurBatch.WoSNs.First(q => q.SN == input.SN);
- woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
- woSN.AUTH_PROD = CurLine.LINE_CODE;
- woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
-
- //鏉＄爜杩囩珯
- 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())
+ foreach (var wipSN in wipSNs)
{
- wipSN.SFTS_CODE = curShiftPeriod.ShiftSys.SFTS_CODE;
- wipSN.SFT_CODE = curShiftPeriod.Shift.SFT_CODE;
- wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
+ if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))
+ {
+ CurBatch.WoSNs.Add(new()
+ {
+ WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ SN = wipSN.SN,
+ TRAY_SN = wipSN.TRAY_SN,
+ STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
+ });
+ }
}
- CurBatch.StartWorking(UserCode);
-
- //濡傛灉鏄姇鍏ョ珯
- if (curNode.IS_INPUT == "Y")
- {
- woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
- wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
- wipSN.INLINE_DATE = DateTime.Now;
- }
- //濡傛灉鏄骇鍑虹珯
- if (curNode.IS_OUTPUT == "Y")
- {
- 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;
- }
-
- CurWipSNHis = new MES_WIP_HIS(CurWipSN = wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鐨勬潯鐮乕{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]宸ュ簭[{wipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{wipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
-
- //鍒濆鍖栧伐姝ュ垪琛�
- Steps.Clear();
+
+ //鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.SN == w.SN)).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 (curNode.IS_INPUT == "Y")
+ {
+ var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
+ wipSN.INLINE_DATE = DateTime.Now;
+ }
+ //濡傛灉鏄骇鍑虹珯
+ if (curNode.IS_OUTPUT == "Y")
+ {
+ var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ 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;
+ }
+ }
+
+ //宸ュ崟寮�宸�
+ CurBatch.StartWorking(UserCode);
+
+ //鎶婂綋鍓嶆潯鐮佸鍔犲埌褰撳墠鏉＄爜鍒楄〃
+ CurWipSNs = wipSNs;
+ CurWipSNHiss.Clear();
+ foreach (var wipSN in wipSNs)
+ {
+ CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛"));
+ }
+
+ //鍒濆鍖栧伐姝ュ垪琛�
+ Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
{
Sequence = Steps.Count + 1,
@@ -294,20 +327,20 @@
DBSubmitAction = () =>
{
var db = GetCommitDB();
- db.Storageable(woSN, UserCode).ExecuteCommand();
- db.Storageable(wipSN, UserCode).ExecuteCommand();
- db.Storageable(CurWipSNHis, UserCode).ExecuteCommand();
+ db.Storageable(woSNs, UserCode).ExecuteCommand();
+ db.Storageable(wipSNs, UserCode).ExecuteCommand();
+ db.Storageable(CurWipSNHiss, UserCode).ExecuteCommand();
//濡傛灉鏄姇鍏ョ珯
if (curNode.IS_INPUT == "Y")
{
- db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
- db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
}
//濡傛灉鏄骇鍑虹珯
if (curNode.IS_OUTPUT == "Y")
{
- db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
- db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
}
}
};
@@ -399,8 +432,8 @@
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
- //action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", 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", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ //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.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
//閲嶇疆宸ュ簭
ResetNode();
return action;
@@ -441,7 +474,7 @@
case "NodeSubmit":
action.IsSuccessed = false;
//action.LocaleMsg = new($"姝ｅ湪杩涜鏉＄爜[{CurWipSN.SN}]鐨勮繃绔欎笟鍔★紝涓嶅厑璁告墜鍔ㄧ粨鏉熷寘瑁�");
- action.LocaleMsg = new("MES.Transaction.PackingNode.WorkingOnNodeSubmit", CurWipSN.SN);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.WorkingOnNodeSubmit", CurSN);
break;
default:
break;
--
Gitblit v1.9.3