From b58756299889ddfa643a7b34ac99635603f04a82 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 21 十一月 2024 21:27:19 +0800
Subject: [PATCH] 出货单信息获取更新
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 79d769a..f907770 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -11,6 +11,7 @@
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Business.MES.WorkAction;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES.Transaction
{
@@ -64,10 +65,11 @@
{
IsPrintCustomerLabel = input.Options["IsPrintCustomerLabel"].ToBoolean();
}
- if (input.Options.ContainsKey("ShippingOrder"))
- {
- ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";
- }
+
+ //if (input.Options.ContainsKey("ShippingOrder"))
+ //{
+ // ShippingOrder = IsPrintCustomerLabel ? input.Options["ShippingOrder"].ToString() : "";
+ //}
//PkgSubmit锛氭墜鍔ㄧ粨鏉熷寘瑁咃紝鎵嬪姩淇濆瓨鏆傚瓨鐨勫寘瑁呮暟鎹�
if (NodeCmd == "PkgSubmit")
{
@@ -381,6 +383,11 @@
//璁剧疆褰撳墠鎸囦护涓烘甯镐骇鍝佽繃绔�
NodeCmd = "NodeSubmit";
+ //
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc == CurBatch.WO.ORDER_NO && q.Status == 2 && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now)).First();
+ ShippingOrder = ship.ShipDoc;
+
//缁戝畾鏉＄爜鍒板伐鍗�
foreach (var wipSN in wipSNs)
{
--
Gitblit v1.9.3