鲁丽木业包装线
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zongzhibin
2024-11-23 52ea328589f08585046bd519e4c57e5dce24e1dd 
 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_RobotBuffer_FinishTask.cs


@@ -39,11 +39,19 @@


                        var rgvLocation = StationLocationEnum.BZ39.ToString();


                        var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();


                        if (obj.R_InboundFinish)


                        //if (true)//模拟


                        {


                            var result = obj.R_InboundNumber;


                            if (string.IsNullOrEmpty(result))


                            //var result = obj.R_InboundNumber;


                            //if (string.IsNullOrEmpty(result))


                            //{


                            //    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- å…¥åº“库位号是空的,此次循环结束";


                            //    continue;


                            //}


                            //obj.R_Inbound_TaskID = 17797;//模拟


                            var result2 = obj.R_Inbound_TaskID;


                            if (result2 == 0)


                            {


                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- å…¥åº“库位号是空的,此次循环结束";


                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- å…¥åº“任务号是空的,此次循环结束";


                                continue;


                            }




@@ -51,7 +59,8 @@


                            var qitaoReault = false;


                            using (WmsDBModel wmsDB = new WmsDBModel())


                            {


                                var task = wmsDB.wms_rbline_task.Where(x => x.PlaceCode == obj.R_InboundNumber


                                var task = wmsDB.wms_rbline_task.Where(x =>


                                 x.TaskNo == obj.R_Inbound_TaskID.ToString()


                                && x.RbTaskType == (int)RbTaskTypeEnum.入库任务


                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();


                                if (task == null)


@@ -73,6 +82,8 @@


                                    Id = Yitter.IdGenerator.YitIdHelper.NextId(),


                                    Upi = upiCode,


                                    PlanNo = task.PlanNo,


                                    DetailName = upiObj.DetailName,


                                    OrderId = task.OrderId,


                                    CreateTime = DateTime.Now,


                                    CreateUserName = "CC",


                                    InTime = DateTime.Now,


@@ -98,7 +109,7 @@


                                //给PLC推送任务完成确认信号


                                using (StationServiceClient client = new StationServiceClient())


                                {


                                    var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, rgvLocation);


                                    var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);


                                    if (!res.result)


                                    {


                                        SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-下发入库任务 å¤±è´¥,InboundFinishConfirmAsync è¿”回:{res.resMsg}";