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

liuying

2024-11-28 6c5a7bd1a9342d8e6792773aef3d62588a60714d

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

@@ -53,18 +53,30 @@
                                var task = wmsDB.wms_rbline_task.Where(x =>
                                 x.TaskNo == obj.R_SurrouondTaskNo.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.夹板任务
                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();
                                ).OrderByDescending(x=>x.Id).FirstOrDefault();
                                if (task == null)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},根据 R_InboundNumber:{obj.R_InboundNumber}没有找到已下发的任务 ";
                                    continue;
                                }
                                else
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        //给PLC推送任务完成确认信号
                                        using (StationServiceClient client = new StationServiceClient())
                                        {
                                            var res = client.SetSurroundTaskFinishAck((int)EDevice.Station, true, rgvLocation);
                                        }
                                        continue;
                                    }
                                }
                                var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == task.PackageCode).ToList();
                                if (upiobj .Count>0)
                                if (upiobj.Count > 0)
                                {
                                    foreach (var item in upiobj)
                                    {
                                        item.UpiStatus = 4;
                                        item.UpiStatus = (int)UpiStatusEnum.已合包;
                                    }
                                }
                                task.TaskStatus = (int)TaskStatusEnum.已完成;
@@ -90,6 +102,23 @@
                                wmsDB.SaveChanges();
                            }
                        }
                        else
                        {
                            //给PLC推送任务完成确认信号
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                var res = client.SetSurroundTaskFinishAck((int)EDevice.Station, false, rgvLocation);
                                //if (!res.result)
                                //{
                                //    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-下发码板任务 å¤±è´¥,SetPalletizingTaskFinishAck è¿”回:{res.resMsg}";
                                //    continue;
                                //}
                                //else
                                //{
                                //    Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发入库任务 æˆåŠŸ,SetPalletizingTaskFinishAck，参数: ç«™ç‚¹{rgvLocation}");
                                //}
                            }
                        }
                    }
                }
                catch (Exception ex)