From d2f14f6bb44c6dd19cc0816a033452b6de56184b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 06 四月 2025 18:09:45 +0800
Subject: [PATCH] 增加备料任务调用U9接口方法
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 488cd68..160715d 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -302,7 +302,7 @@
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);
@@ -403,10 +403,15 @@
debug.Log(new StackFrame(true), "***** 11", info => { ConsoleExt.WriteLine(info.ToString()); });
//鑾峰彇鍑鸿揣鐘舵��
- var ship = U9CDB.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
- decimal CurShipQty = 0;
+ //var ship = U9CDB.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
+ var ships = U9CDB.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO).ToList();
+ var shippingOrders = ships.Where(q=> q.Status != 2).Select(x=>x.ShipDoc).ToList();
+ var oldShipment = ships.Any(q => q.Status != 2) ? ships.Where(x => x.Status != 2).Sum(t => t.ShipQty) : 0;
+ var ship = ships.Where(q => q.Status == 2 && q.BusinessDate.Date == DateTime.Now.Date).FirstOrDefault();
+ double CurShipQty = 0;
int WaitShipmentCarton = 0;
int WaitShipment = 0;
+ int oWaitShipmentCarton = 0;
if (ship.IsNullOrEmpty()) { IsPrintCustomerLabel = false; }
else
{
@@ -416,14 +421,17 @@
var list = MainDB.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars).AsEnumerable().ToList();
if (!list.IsNullOrEmpty())
{
+ var sublist = list.Where(q=> shippingOrders.Contains(q["SHIPPING_ORDER"]) && q["ProdDate"].ToString() != "Whole").ToList();
+ oWaitShipmentCarton = sublist.IsNullOrEmpty() ? 0 : sublist.Sum(q => q["WaitShipmentCarton"].ToInt32());
var batchCount = list.Where(q => q["ProdDate"].ToString() == "Whole").FirstOrDefault();
- WaitShipmentCarton = batchCount["WaitShipmentCarton"].ToInt32();
+ WaitShipmentCarton = batchCount["WaitShipmentCarton"].ToInt32()- oWaitShipmentCarton;
WaitShipment = batchCount["WaitShipment"].ToInt32();
- IsPrintCustomerLabel = batchCount.IsNullOrEmpty() ? IsPrintCustomerLabel : batchCount["WaitShipment"].ToInt32() >= ship.ShipQty ? false : true;
+ IsPrintCustomerLabel = batchCount.IsNullOrEmpty() ? IsPrintCustomerLabel : batchCount["WaitShipment"].ToInt32() - oldShipment >= ship.ShipQty ? false : true;
}
}
ShippingOrder = IsPrintCustomerLabel ? ship?.ShipDoc ?? "" : "";
//缂撳瓨鍑鸿揣鏁伴噺
+ Context.SetOrAdd("CuroldShipment", oldShipment);
Context.SetOrAdd("CurShipQty", CurShipQty);
//缂撳瓨鍑鸿揣绠辨暟
Context.SetOrAdd("CurWaitShipmentCarton", WaitShipmentCarton);
@@ -472,6 +480,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
wipSN.SHIPPING_ORDER = ShippingOrder;
wipSN.UNBIND_FLAG = "N";
var curShiftPeriod = GetShiftPeriodForNow();
@@ -738,6 +747,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
}
var wipHiss = new List<MES_WIP_HIS>();
@@ -761,7 +771,7 @@
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.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, q.OPERATION_END }).ExecuteCommand();
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
if (_pkgList.Any())
{
@@ -944,7 +954,7 @@
try
{
var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
- var LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+ var LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
var printLb = SetLabelVariables(LabelPV, label, new PackingAction(), CurPkg);
action.Data = new PackingActionOutput()
@@ -973,7 +983,8 @@
action.Data = new ShipingInfo()
{
IsPrintCustomerLabel = IsPrintCustomerLabel,
- ShipQty = Context.GetOrDefault("CurWaitShipment").ToInt32() >= Context.GetOrDefault("CurShipQty").ToInt32() ? CurBatch.Batch.PLAN_QTY - Context.GetOrDefault("CurShipQty").ToInt32() : Context.GetOrDefault("CurShipQty").ToInt32()
+ OldShipQty = Context.GetOrDefault("CuroldShipment").ToInt32(),
+ ShipQty = Context.GetOrDefault("CurWaitShipment").ToInt32() - Context.GetOrDefault("CuroldShipment").ToInt32() >= Context.GetOrDefault("CurShipQty").ToInt32() ? CurBatch.Batch.PLAN_QTY - Context.GetOrDefault("CuroldShipment").ToInt32() - Context.GetOrDefault("CurShipQty").ToInt32() : Context.GetOrDefault("CurShipQty").ToInt32()
};
}
catch (Exception ex)
--
Gitblit v1.9.3