From bf84ef23de798e6509394a1424cc9f6cc0307c65 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 20 十一月 2024 15:09:18 +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 | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index dc47684..562f8fa 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -36,6 +36,7 @@
public string NodeCmd { get; set; }
public PackingAction TempPkgAction { get; set; }
public bool IsPrintCustomerLabel { get; set; }
+ public string ShippingOrder { get; set; }
#endregion Propertys & Variables
#region Functions
@@ -49,19 +50,23 @@
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.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();
+ }
+ if (input.Options.ContainsKey("ShippingOrder"))
+ {
+ ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";
}
//PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝鎵嬪姩淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
if (NodeCmd == "PkgSubmit")
@@ -318,7 +323,7 @@
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).Where(q => q.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).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).Where(q => q.FINISHED_FLAG != "Y").ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
@@ -418,6 +423,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.SHIPPING_ORDER = ShippingOrder;
var curShiftPeriod = GetShiftPeriodForNow();
if (!curShiftPeriod.IsNullOrEmpty())
{
@@ -438,7 +444,7 @@
{
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.STATUS = MES_WIP_DATA.STATUSs.Output.GetValue();
wipSN.OUTLINE_DATE = DateTime.Now;
}
//濡傛灉鏈夋彁浜や笉鑹�
@@ -672,7 +678,7 @@
//鏉＄爜瀹屽伐
foreach (var wipSN in CurWipSNs)
{
- wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+ wipSN.FINISHED_FLAG = "Y";
wipSN.NODE_ID = curNode.ID;
wipSN.NODE_NAME = curNode.NODE_NAME;
wipSN.OPER_CODE = curNode.OPER_CODE;
--
Gitblit v1.9.3