From c9e3a7f0c154892f2327e300e28af53f81e40ad0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 20 2月 2025 11:03:24 +0800
Subject: [PATCH] 软件加密+ 修复 不断给plc报警的问题
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index e8c37cd..30e9374 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -629,15 +629,25 @@
}
var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
order.PackageNum = packageList.Count();
- order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾�).Count() + 1;
+ //璁＄畻宸蹭笅绾挎暟
+ var xiaList = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾�).ToList();
+ order.UnLinePackageNum = xiaList.Count();
+ if (xiaList.Select(x => x.PackageCode).ToList().Contains(singlePackage.PackageCode) == false)
+ {
+ order.UnLinePackageNum += 1;
+ }
if (order.UnLinePackageNum > order.PackageNum)
{
order.UnLinePackageNum = order.PackageNum;
}
- order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).Count();
+ var ng_xiaList = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).ToList();
+ order.NgPackageNum = ng_xiaList.Count();
if (isNG)
{
- order.NgPackageNum = order.NgPackageNum + 1;
+ if (ng_xiaList.Select(x => x.PackageCode).ToList().Contains(singlePackage.PackageCode) == false)
+ {
+ order.NgPackageNum += 1;
+ }
}
if (order.NgPackageNum > order.PackageNum)
{
@@ -647,10 +657,18 @@
order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
- order.ScanPackageArea = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝ｅ父).Sum(x => Convert.ToDecimal(x.Info13));
- if (isNG == false)
+ var scan_list = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝ｅ父).ToList();
+ order.ScanPackageArea = scan_list.Sum(x => Convert.ToDecimal(x.Info13));
+ //if (isNG == false)
+ //{
+ if (scan_list.Select(x => x.PackageCode).ToList().Contains(singlePackage.PackageCode) == false)
{
- order.ScanPackageArea = order.ScanPackageArea + Convert.ToDecimal(singlePackage.Info13);
+ order.ScanPackageArea += Convert.ToDecimal(singlePackage.Info13);
+ }
+ //}
+ if (order.ScanPackageArea > order.AllPackageArea)
+ {
+ order.ScanPackageArea = order.AllPackageArea;
}
order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
@@ -868,5 +886,24 @@
}
}
+
+ /// <summary>
+ /// 涓�閿竻鐞嗘澘浠堕槦鍒楁暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "OneKeyClearUpiQueue")]
+ [Description("WmsOperationTask/OneKeyClearUpiQueue")]
+ [UnitOfWork]
+ public async Task OneKeyClearUpiQueue()
+ {
+ var upiList = await _mes_Upi_LineQueueRep.AsQueryable().ToListAsync();
+ if (upiList?.Count == 0)
+ {
+ throw Oops.Oh($"娌℃湁鏉夸欢鏁版嵁");
+ }
+ await _mes_Upi_LineQueueRep.DeleteAsync(upiList);
+
+ }
}
--
Gitblit v1.9.3