From 8fb64d646e4a8bf929fdfeb7382d15ed0e7900eb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 13:43:38 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
index d33b27f..cbfcc0f 100644
--- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
@@ -55,6 +55,7 @@
var configValues = configValue.Split('|');
var packageCode = configValues[0];
var qitaoValue = configValues[1];//榻愬 涓嶉綈濂�
+ var _UnlinePerson = configValues[2];
bool iscomplete = false;
if (qitaoValue.Equals("榻愬"))
{
@@ -80,11 +81,11 @@
//鏇存柊鍊�
bz30Config.Value = "";
- var gahter = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
- if (gahter != null)
+ var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
+ if (package != null)
{
- gahter.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
- gahter.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+ package.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+ package.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
}
var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
foreach (var item in upiList)
@@ -99,9 +100,78 @@
{
wmsDB.mes_package_linequeue.Remove(lineQueue);
}
+
+
+ //澶勭悊琛� mes_order_gather
+ var isAddOrder = false;
+ var packageList = wmsDB.mes_package_gather.Where(x => x.Info5 == package.Info5).ToList();
+ if (packageList == null || packageList?.Count == 0)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"娌℃湁鎵惧埌鐢熶骇鍗曞彿{package.Info5}鐨勬眹鎬绘暟鎹�";
+ continue;
+ }
+ var order = wmsDB.mes_order_gather.Where(x => x.Info5 == package.Info5).FirstOrDefault();
+ if (order != null)
+ {
+
+ }
+ else
+ {
+ order = new mes_order_gather()
+ {
+ Id = Yitter.IdGenerator.YitIdHelper.NextId(),
+ Info5 = package.Info5,
+ OrderId = package.OrderId,
+ PlanNo = package.PlanNo,
+ };
+ isAddOrder = true;
+ }
+ order.PackageNum = packageList.Count();
+ order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.宸蹭笅绾�).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.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
+ order.IsKitting = qitaoValue == "榻愬" ? true : false;
+
+ var order_unLine = false;
+ //鏌ヨ涓嬩竴涓寘鏄笉鏄睘浜庤璁㈠崟
+ var newLineQueue = wmsDB.mes_package_linequeue.OrderBy(x => x.Id).FirstOrDefault();
+ if (newLineQueue != null && newLineQueue.Info5 != order.Info5)
+ {
+ //琛ㄧず鏄� 鍒囨崲 鏂拌鍗曚簡锛岃璁㈠崟瑕佹洿鏂颁负 宸蹭笅绾裤��
+ order_unLine = true;
+ }
+ else
+ {
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order.PackageNum == order.UnLinePackageNum)
+ {
+ order_unLine = true;
+ }
+ }
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order_unLine)
+ {
+ order.IsUnline = true;
+ order.UnlineTime = DateTime.Now;
+ order.UnlinePerson = _UnlinePerson;
+ }
+ else
+ {
+ order.IsUnline = false;
+ }
+
+ if (isAddOrder)
+ {
+ wmsDB.mes_order_gather.Add(order);
+ }
+
+
//鏂板涓嬬嚎璁板綍
mes_package_unline_record record = new mes_package_unline_record();
- record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(gahter);
+ record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(package);
record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
record.CreateTime = DateTime.Now;
record.UpdateTime = DateTime.Now;
--
Gitblit v1.9.3