From fc5b73f8d3f3a37d01057799b298cb90e5955eb2 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 十二月 2024 15:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index e4469c4..488cd68 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -298,8 +298,11 @@
{
action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
action.Data.OperInfo = CurOperInfo(input.Locale);
+ RemoveCurSnFromCurPackage(Context.ContainsKey("CurPackage") ? (Context["CurPackage"] as WipPkg).Item : null);
+ ResetNode();
//action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
+
}
debug.Log(new StackFrame(true), "***** 9", info => { ConsoleExt.WriteLine(info.ToString()); });
return SetOutPutMqttMsg(action, input.Locale);
@@ -401,7 +404,7 @@
//鑾峰彇鍑鸿揣鐘舵��
var ship = U9CDB.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
- int CurShipQty = 0;
+ decimal CurShipQty = 0;
int WaitShipmentCarton = 0;
int WaitShipment = 0;
if (ship.IsNullOrEmpty()) { IsPrintCustomerLabel = false; }
@@ -774,7 +777,7 @@
}
};
}
-
+ //throw new Exception("鍝�");
//淇濆瓨鏁版嵁搴�
SaveStepsCommitActionToDB(endAction);
--
Gitblit v1.9.3