From 806b3cb3448ad15a5d563937fdac2ffae37342a7 Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期三, 23 四月 2025 22:11:25 +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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 72b1ea5..160715d 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -408,7 +408,7 @@
                     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();
-                    decimal CurShipQty = 0;
+                    double CurShipQty = 0;
                     int WaitShipmentCarton = 0;
                     int WaitShipment = 0;
                     int oWaitShipmentCarton = 0;

--
Gitblit v1.9.3