Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

schangxiang@126.com

2024-12-10 8a516270bda96fd7e3afae81421b16937676940c

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs

@@ -22,7 +22,7 @@
{
    public class DataProcess_BZ21
    {
        public static void Hander()
        public static async void Hander()
        {
            var alertMsg = "";
            LogType logType = LogType.DataProcess_BZ21;
@@ -88,7 +88,7 @@

                                //增加校验，如果上一个任务upi跟本次upi一致，就报错 ã€Editby shaocx,2024-12-03】
                                var lastTask = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.合包任务).OrderByDescending(x => x.Id).FirstOrDefault();
                                if (lastTask != null && lastTask.UPI == result)
                                if (lastTask != null && lastTask.Upi == result)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC重发此任务，upi：{result}，系统不能重复处理,此次循环结束";
                                    continue;
@@ -97,6 +97,9 @@
                                var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == result).FirstOrDefault();
                                if (upiObj == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ21_1);

                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},根据UPI:{result}没有找到对象 ";
                                    continue;
                                }
@@ -105,6 +108,9 @@
                                var validteReslt = ValidateIsAllowCut();
                                if (validteReslt == false)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ21_2);

                                    continue;
                                }

@@ -115,7 +121,7 @@
                                papercut.ApiMessage = "";
                                papercut.PushNum = 0;
                                papercut.PushStatus = (int)PushStatusEnum.NotPush;
                                papercut.CreateUserName = papercut.UpdateUserName = "调度系统";
                                papercut.CreateUserName = papercut.UpdateUserName = SysGloble.WCSSystem;
                                papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
                                wmsDB.mes_push_papercut.Add(papercut);

@@ -149,9 +155,9 @@
                                    PushNum = 0,
                                    ApiMessage = "",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "调度系统",
                                    CreateUserName = SysGloble.WCSSystem,
                                    UpdateTime = DateTime.Now,
                                    UpdateUserName = "调度系统",
                                    UpdateUserName = SysGloble.WCSSystem

                                };
                                //新增任务表
@@ -159,7 +165,7 @@
                                {
                                    Id = _id,
                                    TaskNo = plcTaskNo,
                                    UPI = upiObj.UPI,
                                    Upi = upiObj.UPI,
                                    Length = upiObj.Length,
                                    Width = upiObj.Width,
                                    Thk = upiObj.Thk,
@@ -168,9 +174,7 @@
                                    OrderId = upiObj.OrderId,
                                    PackageCode = upiObj.PackageCode,
                                    RbTaskType = (int)RbTaskTypeEnum.合包任务,
                                    RbTaskTypeEnumName = RbTaskTypeEnum.合包任务.ToString(),
                                    TaskStatus = (int)TaskStatusEnum.新建,
                                    TaskStatusName = TaskStatusEnum.新建.ToString(),
                                    TaskMsg = "夹板",
                                    CreateTime = DateTime.Now,
                                    CreateUserName = "CC",