22

schangxiang@126.com

2024-12-04 abf9b6bb33fcfad5b56a17a5d3e99b49782a7316

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/3¡¢DataProcess_RobotBuffer_FinishTaskForOutbound.cs

@@ -52,7 +52,7 @@
                            {
                                var task = wmsDB.wms_rbline_task.Where(x =>
                                 x.TaskNo == obj.R_Outbound_TaskID.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                                && (x.RbTaskType == (int)RbTaskTypeEnum.齐包出库任务 || x.RbTaskType == (int)RbTaskTypeEnum.强制出库任务)
                                ).OrderByDescending(x => x.Id).FirstOrDefault();
                                if (task == null)
                                {
@@ -63,10 +63,10 @@
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        //using (StationServiceClient client = new StationServiceClient())
                                        //{
                                        //    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                        //}
                                        using (StationServiceClient client = new StationServiceClient())
                                        {
                                            var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, false);
                                        }
                                        continue;
                                    }

@@ -79,6 +79,18 @@
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
                                }
                                //更新板件的状态和区域
                                if (task.RbTaskType == (int)RbTaskTypeEnum.齐包出库任务)
                                {
                                    upiObj.UpiStatus = (int)UpiStatusEnum.已齐包;
                                    upiObj.AreaCode = (int)AreaCodeEnum.码垛区域;
                                }
                                else if (task.RbTaskType == (int)RbTaskTypeEnum.强制出库任务)
                                {
                                    upiObj.UpiStatus = (int)UpiStatusEnum.已下线;
                                    upiObj.AreaCode = (int)AreaCodeEnum.下线区域;
                                }

                                //库存减少
                                wms_stock_quan qun = wmsDB.wms_stock_quan.Where(x => x.PlaceCode == task.PlaceCode).FirstOrDefault();
                                wmsDB.wms_stock_quan.Remove(qun);
@@ -93,7 +105,7 @@
                                //给PLC推送任务完成确认信号
                                using (StationServiceClient client = new StationServiceClient())
                                {
                                    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, true);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,OutboundFinishConfirmAsync è¿”回:{res.resMsg}";
@@ -105,12 +117,17 @@
                                    }
                                }

                                WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, $"出缓存库：{task.PlaceCode}," + task.TaskMsg);

                                wmsDB.SaveChanges();
                            }
                        }
                        else
                        {
                
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation, false);
                            }
                        }
                    }
                }