From 1f72396c6294b9f78723d786a9b0965414d0601a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 13 九月 2024 15:38:38 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/PackingNode.cs | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 4584680..a178562 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -69,6 +69,9 @@
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鎻愪氦鏁版嵁
action = NodeSubmit(action, input);
//鏇存柊宸ュ簭淇℃伅
if (!action.IsSuccessed)
@@ -86,7 +89,7 @@
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))
- .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
+ .ByAuth(input.AuthOption).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.IsNullOrEmpty())
@@ -100,9 +103,18 @@
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
return action;
}
+ if (Context.ContainsKey("CurPackage") && !Context["CurPackage"].IsNullOrEmpty() && (Context["CurPackage"] as WipPkg).WorkBatch != wosns.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", (Context["CurPackage"] as WipPkg).WorkBatch, wosns.First().Batch.BATCH_NO, CurSN);
+ return action;
+ }
if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)
{
- action.Data.ShortMsg = new("浜х嚎閿欒", ShortMessage.Types.Error);
+ action.Data.ShortMsg = new("浜х嚎鎶曚骇閿欒", ShortMessage.Types.Error);
action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
@@ -123,8 +135,10 @@
return action;
}
}
- //鏉＄爜杩囩珯
- action = NodeSubmit(action, input);
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鏉＄爜杩囩珯
+ action = NodeSubmit(action, input);
if (!action.IsSuccessed && !CurWipSNs.Any())
{
var info = WoContext.GetSnOperInfo(input.SN).Data;
@@ -164,6 +178,9 @@
//瀹屾垚宸ュ簭鑺傜偣宸ユ鍚庯紝鍚庡紑濮嬫墽琛屽綋鍓嶅伐搴忕殑琛屼负宸ユ
else if (IsFinishNodeSteps && !IsFinishAllSteps)
{
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+
var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();
if (submitStep.IsNullOrEmpty())
{
@@ -243,8 +260,8 @@
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.TRAY_SN == input.SN) && q.WORK_ORDER == CurBatch.WO.ORDER_NO).ToList();
+
+ 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()
@@ -311,6 +328,7 @@
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(),
});
@@ -437,7 +455,8 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
{
- Sequence = Steps.Count + 1,
+ Name = "鎵弿浜у搧",
+ Sequence = Steps.Count + 1,
Node = curNode,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
DBSubmitAction = () =>
@@ -570,7 +589,7 @@
/// 鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁�
/// </summary>
/// <returns></returns>
- public async Task<ApiAction<SubmitOutput>> CompletePkg()
+ public async Task<ApiAction<SubmitOutput>> CompletePkg(ApiAction input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
try
@@ -580,10 +599,16 @@
{
if (Context.ContainsKey("CurPackage"))
{
+ int shipQty = input.Data.ToInt32();
+ //鏈夊～鍑鸿揣鏁伴噺鍒欓獙璇佸綋鍓嶅寘瑁呮暟閲忓繀椤荤瓑浜庯紙鍑鸿揣鏁伴噺/鍖呰瑙勫垯鏁伴噺锛夌殑浣欐暟
+ if (shipQty > 0)
+ {
+
+ }
NodeCmd = "PkgSubmit";
TempPkgAction = new PackingAction();
- TempPkgAction.Init(null, this, null, null);
+ TempPkgAction.Init(this);
action = TempPkgAction.Submit(null);
}
else
--
Gitblit v1.9.3