深库位与浅库位出库时，进行浅货位移库不可直接出库

Admin

2 天以前 679893ee68e2f7d422431bb22b665e9217f23410

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -815,6 +815,11 @@
            return BaseDal.QueryFirst(x => x.PalletCode == barcode && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
        }

        public Dt_Task QueryOutTaskByBarcode(string barcode)
        {
            return BaseDal.QueryFirst(x => x.PalletCode == barcode  && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting, TaskOrderBy);
        }

        private string GetIpAddress(string baseIp, string name)
        {
            var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
@@ -841,6 +846,17 @@
            return base.DeleteData(key);
        }


        public WebResponseContent DelteWCSTask(int TaskNum)
        {
            var task = BaseDal.QueryData().Where(x => x.TaskNum == TaskNum).FirstOrDefault();
            if (task == null) return WebResponseContent.Instance.OK();
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            _taskHtyRepository.AddData(taskHty);

            return base.DeleteData(task.TaskId);
        }
        #endregion é‡å†™æ–¹æ³•

        #region
@@ -939,7 +955,7 @@


        //读取申请，给agv下发任务
        public WebResponseContent GetAGVTaskdistribution(string TargetAddress)
        public WebResponseContent GetAGVTaskdistribution(string TargetAddress,string Number)
        {

            WebResponseContent content = new WebResponseContent();
@@ -952,16 +968,41 @@
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddress = wmsBase + completeTask;
                var taskDto = new RequestTaskDto()
                IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1000");
                CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
                DeviceProDTO? deviceProDTOt = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == TargetAddress && x.DeviceProParamName == "ConveyorLineSingal");
                if (conveyorLine.Communicator.Read<short>(deviceProDTOt.DeviceProAddress) == 1)
                {
                    RequestType = "999",
                    Position = TargetAddress,
                };


                var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result;
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                    var wmsIpAddress = wmsBase + completeTask;
                    var taskDto = new RequestTaskDto()
                    {
                        RequestType = "999",
                        Position = TargetAddress,
                    };


                    var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result;
                    content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                    if (content.Status)
                    {
                        List<Dt_Task> tasks = BaseDal.QueryData(x => x.axle_czh == Number);
                        if (tasks.Count > 0)
                        {
                            foreach (var task in tasks)
                            {
                                task.Towhereabouts = TargetAddress;
                            }
                            BaseDal.UpdateData(tasks);
                        }
                    }
                }
                else
                {
                    content.Error();
                }

                return content;
            }
            catch (Exception ex)