From 9baffa8a8a5c9fbdda690544132b95db9196cc88 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 15:22:08 +0800
Subject: [PATCH] 22

---
 CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs b/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
index 2551277..61007ab 100644
--- a/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
+++ b/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
@@ -99,17 +99,27 @@
                     Info5 = package.Info5,
                     OrderId = package.OrderId,
                     PlanNo = package.PlanNo,
+
+                    CreateTime = DateTime.Now,
+                    UpdateTime = DateTime.Now,
+                    CreateUserName = SysGloble.WCSSystem,
+                    UpdateUserName = SysGloble.WCSSystem
                 };
                 isAddOrder = true;
             }
             order.PackageNum = packageList.Count();
             order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).Count();
+            order.NgPackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.NG).Count();
             order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
 
             order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
-            order.ScanPackageArea = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).Sum(x => Convert.ToDecimal(x.Info13));
+            order.ScanPackageArea = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝e父).Sum(x => Convert.ToDecimal(x.Info13));
             order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
-            order.IsKitting = qitaoValue == "榻愬" ? true : false;
+
+            if (!string.IsNullOrEmpty(qitaoValue))
+            {
+                order.IsKitting = qitaoValue == "榻愬" ? true : false;
+            }
 
             var order_unLine = false;
             //鏌ヨ涓嬩竴涓寘鏄笉鏄睘浜庤璁㈠崟

--
Gitblit v1.9.3