鲁丽木业包装线
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
schangxiang@126.com
2024-12-03 a5acf83d77d56723125d8bdbe06e03db16a7c38d 
 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs


@@ -78,12 +78,21 @@


                            using (WmsDBModel wmsDB = new WmsDBModel())


                            {


                                //要是有已下发的任务，就不要执行


                                var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB, result);


                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);


                                if (!isValidate)


                                {


                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";


                                    continue;


                                }




                                //增加校验，如果上一个任务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)


                                {


                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC重发此任务，upi：{result}，系统不能重复处理,此次循环结束";


                                    continue;


                                }




                                var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == result).FirstOrDefault();


                                if (upiObj == null)


                                {


@@ -95,7 +104,7 @@


                                var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);


                                papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();


                                papercut.ApiMessage = "";


                                papercut.PushNum = 1;


                                papercut.PushNum = 0;


                                papercut.PushStatus = (int)PushStatusEnum.NotPush;


                                papercut.CreateTime = papercut.UpdateTime = DateTime.Now;


                                wmsDB.mes_push_papercut.Add(papercut);


@@ -128,12 +137,12 @@


                                    PackageCode = upiObj.PackageCode,


                                    PushStatus = 0,


                                    PushNum = 0,


                                    ApiMessage = "待推送",


                                    ApiMessage = "",


                                    CreateTime = DateTime.Now,


                                    CreateUserName = "CC",


                                    UpdateTime = DateTime.Now,


                                    UpdateUserName = "CC",


                                    CreateOrgName = "11"




                                };


                                //新增任务表


                                var task = new wms_rbline_task()