dengjunjie
2025-03-13 90a0c4e0ab42a3574cfb6f9fd3b031dac9e7fb0d
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs
@@ -27,21 +27,6 @@
                string ConveyorLineID = AppSettings.Configuration[nameof(ConveyorLineID)];
                if (!ConveyorLineID.Split(",").Contains(lineDTO.stationCode)) throw new Exception($"未找到输送线编号[{lineDTO.stationCode}]的信息");
                content = TransmissionlineRequest(lineDTO);
                //switch (lineDTO.stationCode)
                //{
                //    case "102":
                //        content = TransmissionlineRequest(lineDTO);
                //        break;
                //    case "Z1":
                //    case "Z2":
                //    case "Z3":
                //    case "X1":
                //    case "X2":
                //    case "X3":
                //        content = ProductionlineRequest(lineDTO);
                //        break;
                //    default: throw new Exception("未定义站台:" + lineDTO.stationCode);
                //}
            }
            catch (Exception ex)
            {
@@ -112,8 +97,18 @@
                //{
                //    throw new Exception($"当前入库站台[{lineDTO.stationCode}]已有一条任务");
                //}
                var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt());
                var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
                if (task == null) throw new Exception($"未找到托盘号[{lineDTO.Barcode}]的入库任务");
                if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
                {
                    task.NextAddress = "1004";
                    task.CurrentAddress = lineDTO.stationCode;
                    task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
                    BaseDal.UpdateData(task);
                    return content;
                }
                if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt()) throw new Exception($"未找到托盘号[{lineDTO.Barcode}]的入库任务");
                //if (task.TaskState != (int)InTaskStatusEnum.AGV_InFinish) throw new Exception($"托盘号[{lineDTO.Barcode}]的入库任务状态不匹配");
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
@@ -122,16 +117,17 @@
                Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
                if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//检测条件需更改!!!!!!!!!!
                if (/*lineDTO.Spec != 1 ||*/ lineDTO.Weight > 1500)//检测条件需更改!!!!!!!!!!
                {
                    task.NextAddress = "101";
                    //task.NextAddress = "101";
                    task.TaskState = (int)InTaskStatusEnum.InException;
                    task.Remark = $"托盘[{lineDTO.Barcode}]信息不合格";
                    task.Remark = $"托盘[{lineDTO.Barcode}]超重";
                    //task.Remark = $"托盘[{lineDTO.Barcode}]信息不合格";
                    //stockInfo.StockStatus = StockStatusEmun.入库撤销.ObjToInt();
                }
                else
                {
                    task.NextAddress = "104";
                    task.NextAddress = "1004";
                    task.CurrentAddress = lineDTO.stationCode;
                    task.Remark = string.Empty;
                    task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;