From c667629f6f7b9cdb15958fc560bd2bf83f36cdf6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 24 12月 2024 11:33:42 +0800
Subject: [PATCH] 22
---
CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs b/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
index 61007ab..b0fd52f 100644
--- a/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
+++ b/CC/iWareCC_ASRS/Common/Helper/MyExtendHelper.cs
@@ -109,18 +109,25 @@
}
order.PackageNum = packageList.Count();
order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).Count();
+ if (order.UnLinePackageNum > order.PackageNum)
+ {
+ order.UnLinePackageNum = order.PackageNum;
+ }
+
order.NgPackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.NG).Count();
+ if (order.NgPackageNum > order.PackageNum)
+ {
+ order.NgPackageNum = order.PackageNum;
+ }
+
order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
order.ScanPackageArea = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝ｅ父).Sum(x => Convert.ToDecimal(x.Info13));
order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
- if (!string.IsNullOrEmpty(qitaoValue))
- {
- order.IsKitting = qitaoValue == "榻愬" ? true : false;
- }
+ /*
var order_unLine = false;
//鏌ヨ涓嬩竴涓寘鏄笉鏄睘浜庤璁㈠崟
var newLineQueue = wmsDB.mes_package_linequeue.OrderBy(x => x.Id).FirstOrDefault();
@@ -149,6 +156,8 @@
order.IsUnline = false;
}
+ //*/
+
if (isAddOrder)
{
wmsDB.mes_order_gather.Add(order);
--
Gitblit v1.9.3