From 3ec309bd5ae489b09a4ad978d12c851c2b1fbee2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 11:24:34 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 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 adb6ebe..24e07d7 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"
@@ -36,7 +36,7 @@
{
if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
{
- var rgvLocation = StationLocationEnum.BZ39.ToString();
+ var rgvLocation = StationLocationEnum.BZ30.ToString();
using (WmsDBModel wmsDB = new WmsDBModel())
{
@@ -55,32 +55,36 @@
var configValues = configValue.Split('|');
var packageCode = configValues[0];
var qitaoValue = configValues[1];//榻愬 涓嶉綈濂�
-
+ bool iscomplete = false;
+ if (qitaoValue.Equals("榻愬"))
+ {
+ iscomplete = true;
+ }
//TODO:鎺ㄩ�佺粰PLC 鍘诲摢涓柟鍚戯紵
- /*
+
using (StationServiceClient client = new StationServiceClient())
{
- var res = await client.ChangeModeAsync((int)EDevice.Station, (int)RbRunModeEnum.鍏ュ簱妯″紡, rgvLocation);
+ var res = client.WriteQiTaoInfo((int)EDevice.Station, rgvLocation, iscomplete);
if (!res.result)
{
- SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 澶辫触,ChangeModeAsync 杩斿洖:{res.resMsg}";
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鏄惁榻愬澶辫触,ChangeModeAsync 杩斿洖:{res.resMsg}";
continue;
}
else
{
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 鎴愬姛,ChangeModeAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鏄惁榻愬 鎴愬姛,ChangeModeAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
}
- //*/
+ //
//鏇存柊鍊�
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)
@@ -97,13 +101,60 @@
}
//鏂板涓嬬嚎璁板綍
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;
record.OpRemark = "涓嬬嚎";
wmsDB.mes_package_unline_record.Add(record);
+ //澶勭悊琛� 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;
+ //鍒ゆ柇璇ヨ鍗曟槸鍚﹀凡涓嬬嚎
+ if (order.PackageNum == order.UnLinePackageNum)
+ {
+ order.IsUnline = true;
+ }
+ else
+ {
+ order.IsUnline = false;
+ }
+
+ if (isAddOrder)
+ {
+ wmsDB.mes_order_gather.Add(order);
+ }
+
wmsDB.SaveChanges();
}
--
Gitblit v1.9.3