From 06d6ba0da4d9036bf3eeab8a7cbef8df89565606 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 17:19:05 +0800
Subject: [PATCH] BZ01 齐包优化
---
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 61 +++++++++++-------------------
1 files changed, 23 insertions(+), 38 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 76a29ee..527392a 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"
@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.Remoting.Messaging;
using System.ServiceModel.Configuration;
using System.Text;
using System.Threading;
@@ -34,7 +35,8 @@
SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
+ //if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
+ if (SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ30.ToString();
@@ -55,6 +57,7 @@
var configValues = configValue.Split('|');
var packageCode = configValues[0];
var qitaoValue = configValues[1];//榻愬 涓嶉綈濂�
+ var _UnlinePerson = configValues[2];
bool iscomplete = false;
if (qitaoValue.Equals("榻愬"))
{
@@ -99,52 +102,33 @@
{
wmsDB.mes_package_linequeue.Remove(lineQueue);
}
- //鏂板涓嬬嚎璁板綍
- mes_package_unline_record record = new mes_package_unline_record();
- 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)
+ var errmsg = "";
+ var result = MyExtendHelper.HandlerOrderGather(wmsDB, package, qitaoValue, _UnlinePerson, out errmsg);
+ if (result == false)
{
- SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"娌℃湁鎵惧埌鐢熶骇鍗曞彿{package.Info5}鐨勬眹鎬绘暟鎹�";
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = errmsg;
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 (isAddOrder)
+ //鏂板涓嬬嚎璁板綍
+ //鍒ゆ柇濡傛灉鍖呭凡缁忎笅绾夸簡锛屽氨涓嶅啀鍐欏叆涓嬬嚎璁板綍浜�
+ var existPackObj = wmsDB.mes_package_unline_record.Where(x => x.PackageCode == package.PackageCode).FirstOrDefault();
+ if (existPackObj == null)
{
- 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>(package);
+ record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ record.CreateTime = DateTime.Now;
+ record.UpdateTime = DateTime.Now;
+ record.OpRemark = "涓嬬嚎";
+ wmsDB.mes_package_unline_record.Add(record);
}
+
+ WmsRecordUpiProcessHandler.SaveWmsRecordPackageProcess(wmsDB, package, "BZ30", "榻愬楠岃瘉");
wmsDB.SaveChanges();
@@ -160,5 +144,6 @@
}
}
+
}
}
--
Gitblit v1.9.3