1

wankeda

2026-01-22 f27080d8476a177b809045d1f036a24dac782ba5

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -47,6 +47,10 @@
                if (stockInfo != null)
                {
                    Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                    if (locationInfo == null)
                    {
                        throw new Exception("未找到出库库位");
                    }
                    Dt_Task dt_Task = BaseDal.QueryFirst(x => x.SourceAddress == locationInfo.LocationCode || x.TargetAddress == locationInfo.LocationCode);
                    if (dt_Task != null)
                    {
@@ -61,30 +65,58 @@
                    Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
                    if (roadwayInfo != null)
                    {
                        Dt_Task task = new()
                        if (roadwayInfo.RoadwayNo.Contains("CP"))
                        {
                            PalletType = stockInfo.PalletType,
                            OrderNo = stockInfoDetail.OrderNo,
                            CurrentAddress = locationInfo.LocationCode,
                            Grade = 0,
                            Creater = "WMS",
                            PalletCode = stockInfo.PalletCode,
                            NextAddress = roadwayInfo.OutSCStationCode,
                            Roadway = locationInfo.RoadwayNo,
                            SourceAddress = locationInfo.LocationCode,
                            TargetAddress = "",
                            TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                            TaskType = taskType.ObjToInt(),
                            Depth = locationInfo.Depth,
                            WarehouseId = stockInfo.WarehouseId,
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        if (taskType != TaskTypeEnum.OutEmpty)
                        {
                            task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                            task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                            Dt_Task task = new()
                            {
                                PalletType = stockInfo.PalletType,
                                OrderNo = stockInfoDetail.OrderNo,
                                CurrentAddress = locationInfo.LocationCode,
                                Grade = 0,
                                Creater = "WMS",
                                PalletCode = stockInfo.PalletCode,
                                NextAddress = roadwayInfo.OutSCStationCode,
                                Roadway = locationInfo.RoadwayNo,
                                SourceAddress = locationInfo.LocationCode,
                                TargetAddress = "",
                                TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                                TaskType = taskType.ObjToInt(),
                                Depth = locationInfo.Depth,
                                WarehouseId = stockInfo.WarehouseId,
                                TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                                MaterielCode = stockInfoDetail.MaterielCode,
                                Quantity = (float)stockInfoDetail.StockQuantity
                            };
                            tasks.Add(task);
                        }
                        tasks.Add(task);
                        else
                        {
                            Dt_Task task = new()
                            {
                                PalletType = stockInfo.PalletType,
                                OrderNo = stockInfoDetail.OrderNo,
                                CurrentAddress = locationInfo.LocationCode,
                                Grade = 0,
                                Creater = "WMS",
                                PalletCode = stockInfo.PalletCode,
                                NextAddress = roadwayInfo.OutSCStationCode,
                                Roadway = locationInfo.RoadwayNo,
                                SourceAddress = locationInfo.LocationCode,
                                TargetAddress = "",
                                TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
                                TaskType = taskType.ObjToInt(),
                                Depth = locationInfo.Depth,
                                WarehouseId = stockInfo.WarehouseId,
                                TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                            };
                            if (taskType != TaskTypeEnum.OutEmpty)
                            {
                                task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
                                task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
                            }
                            tasks.Add(task);
                        }

                    }
                }

@@ -120,7 +152,16 @@
            List<Dt_LocationInfo>? locationInfos = null;
            //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
            {
                (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
                (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = new();
                if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
                {
                   result = _outboundService.OutboundOrderDetailService.DWANDYSAssignStockOutbound(outboundOrderDetails);
                }
                else
                {
                   result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                }
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
@@ -131,7 +172,7 @@
                        (int)OrderTypeEnum.反拣出库单 => TaskTypeEnum.ReverseOut,
                        _ => new TaskTypeEnum()
                    };
                    tasks = GetTasks(result.Item1,typeEnum);
                    tasks = GetTasks(result.Item1, typeEnum);
                    tasks.ForEach(x =>
                    {
                        x.OrderNo = outboundOrder.OrderNo;
@@ -254,36 +295,209 @@
                {
                    return WebResponseContent.Instance.Error($"未找到该仓库信息");
                }
                Dt_OutboundOrder oldOuboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();
                Dt_Production production = new Dt_Production();
                if (oldOuboundOrder != null)
                if (warehouse.WarehouseCode.Contains("CP"))
                {
                    if (oldOuboundOrder.OutWareHouse != warehouse.WarehouseCode)

                    Dt_Production production1 = new Dt_Production();
                    OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                    orderAddDTO1.OrderNo = orderAddDTO.No;
                    orderAddDTO1.UpperOrderNo = orderAddDTO.No;
                    orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
                    orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode ?? "工单发料";
                    orderAddDTO1.InoutType = orderAddDTO.OrderType ?? InoutTypeEnum.WorkFeed.ToString();
                    orderAddDTO1.OrderType = orderAddDTO.InoutType;
                    orderAddDTO1.System = orderAddDTO.System;
                    IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
                    orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                    #region 验证数据
                    (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
                    if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                    #endregion
                    Dt_NewOutboundOrder inboundOrder = _mapper.Map<Dt_NewOutboundOrder>(orderAddDTO1);
                    inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                    inboundOrder.Creater = "WMS";
                    inboundOrder.CreateDate = DateTime.Now;
                    inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
                    _unitOfWorkManage.BeginTran();
                    bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

                    foreach (var item in orderAddDTO1.Details)
                    {
                        return WebResponseContent.Instance.Error($"仓库不一致");
                        if (string.IsNullOrWhiteSpace(item.Remark))
                        {
                            continue;
                        }
                        string[] remarkEntries = item.Remark.Split(
                            new[] { ';' },
                            StringSplitOptions.RemoveEmptyEntries
                        );

                        foreach (var entry in remarkEntries)
                        {
                            string[] keyValuePairs = entry.Split(
                                new[] { ',' },
                                StringSplitOptions.RemoveEmptyEntries
                            );

                            foreach (var kvp in keyValuePairs)
                            {
                                int colonIndex = kvp.IndexOf(':');
                                if (colonIndex <= 0 || colonIndex >= kvp.Length - 1)
                                {
                                    continue;
                                }

                                string key = kvp.Substring(0, colonIndex).Trim();
                                string value = kvp.Substring(colonIndex + 1).Trim();

                                switch (key)
                                {
                                    case "制造单号":
                                        production1.ProductionNo = value;
                                        break;
                                    case "制造部件":
                                        production1.ManufacturingCo = value;
                                        break;
                                    case "出库数量":
                                        if (decimal.TryParse(value, out decimal outQuantity))
                                        {
                                            production1.OutQuantity = outQuantity;
                                        }
                                        else
                                        {
                                            Console.WriteLine($"出库数量格式错误：{value}（应为数值，如14.0000）");
                                        }
                                        break;
                                    default:
                                        Console.WriteLine($"未知键名：{key}（对应值：{value}，跳过该键值对）");
                                        break;
                                }

                            }
                            production1.Creater = "WMS";
                            production1.OrderId = inboundOrder.Details.FirstOrDefault().Id;
                            _productionRepository.AddData(production1);
                        }
                    }
                    _unitOfWorkManage.CommitTran();

                }
                else
                {
                    Dt_OutboundOrder oldOuboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();
                    Dt_Production production = new Dt_Production();
                    if (oldOuboundOrder != null)
                    {
                        if (oldOuboundOrder.OutWareHouse != warehouse.WarehouseCode)
                        {
                            return WebResponseContent.Instance.Error($"仓库不一致");
                        }
                        else
                        {
                            OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                            orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                            var details = orderAddDTO1.Details.FirstOrDefault();
                            Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
                            {
                                LPNNo = details.LPNNo,
                                BatchNo = details.BatchNo,
                                MaterielCode = details.MaterielCode,
                                MaterielName = details.MaterielName,
                                MaterieSpec = details.MaterieSpec,
                                OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                                OrderQuantity = details.OrderQuantity,
                                LinId = details.LinId,
                                OrderId = oldOuboundOrder.Id,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                                Remark = details.Remark,
                                SupplierBatch = details.SupplierBatch
                            };
                            _outboundOrderDetailRepository.AddData(outboundOrderDetail);
                            foreach (var item in orderAddDTO1.Details)
                            {
                                if (string.IsNullOrWhiteSpace(item.Remark))
                                {
                                    continue;
                                }
                                string[] remarkEntries = item.Remark.Split(
                                    new[] { ';' },
                                    StringSplitOptions.RemoveEmptyEntries
                                );

                                foreach (var entry in remarkEntries)
                                {
                                    string[] keyValuePairs = entry.Split(
                                        new[] { ',' },
                                        StringSplitOptions.RemoveEmptyEntries
                                    );

                                    foreach (var kvp in keyValuePairs)
                                    {
                                        int colonIndex = kvp.IndexOf(':');
                                        if (colonIndex <= 0 || colonIndex >= kvp.Length - 1)
                                        {
                                            continue;
                                        }

                                        string key = kvp.Substring(0, colonIndex).Trim();
                                        string value = kvp.Substring(colonIndex + 1).Trim();

                                        switch (key)
                                        {
                                            case "制造单号":
                                                production.ProductionNo = value;
                                                break;
                                            case "制造部件":
                                                production.ManufacturingCo = value;
                                                break;
                                            case "出库数量":
                                                if (decimal.TryParse(value, out decimal outQuantity))
                                                {
                                                    production.OutQuantity = outQuantity;
                                                }
                                                else
                                                {
                                                    Console.WriteLine($"出库数量格式错误：{value}（应为数值，如14.0000）");
                                                }
                                                break;
                                            default:
                                                Console.WriteLine($"未知键名：{key}（对应值：{value}，跳过该键值对）");
                                                break;
                                        }

                                    }
                                    production.Creater = "WMS";
                                    production.OrderId = outboundOrderDetail.Id;
                                    _productionRepository.AddData(production);
                                }
                            }
                        }
                    }
                    else
                    {
                        OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                        orderAddDTO1.OrderNo = orderAddDTO.No;
                        orderAddDTO1.UpperOrderNo = orderAddDTO.No;
                        orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
                        orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode ?? "工单发料";
                        orderAddDTO1.InoutType = orderAddDTO.OrderType ?? InoutTypeEnum.WorkFeed.ToString();
                        orderAddDTO1.OrderType = orderAddDTO.InoutType;
                        orderAddDTO1.System = orderAddDTO.System;
                        IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
                        orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                        var details = orderAddDTO1.Details.FirstOrDefault();
                        Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
                        {
                            LPNNo = details.LPNNo,
                            BatchNo = details.BatchNo,
                            MaterielCode = details.MaterielCode,
                            MaterielName = details.MaterielName,
                            MaterieSpec = details.MaterieSpec,
                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                            OrderQuantity = details.OrderQuantity,
                            LinId = details.LinId,
                            OrderId = oldOuboundOrder.Id,
                            Creater = "WMS",
                            CreateDate = DateTime.Now,
                            Remark = details.Remark,
                            SupplierBatch = details.SupplierBatch
                        };
                        _outboundOrderDetailRepository.AddData(outboundOrderDetail);
                        #region 验证数据
                        (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
                        if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                        #endregion
                        Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
                        inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                        inboundOrder.Creater = "WMS";
                        inboundOrder.CreateDate = DateTime.Now;
                        inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

                        foreach (var item in orderAddDTO1.Details)
                        {
                            if (string.IsNullOrWhiteSpace(item.Remark))
@@ -338,96 +552,14 @@

                                }
                                production.Creater = "WMS";
                                production.OrderId = outboundOrderDetail.Id;
                                production.OrderId = inboundOrder.Details.FirstOrDefault().Id;
                                _productionRepository.AddData(production);
                            }
                        }
                        _unitOfWorkManage.CommitTran();
                    }
                }
                else
                {
                    OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                    orderAddDTO1.OrderNo = orderAddDTO.No;
                    orderAddDTO1.UpperOrderNo = orderAddDTO.No;
                    orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
                    orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode?? "工单发料";
                    orderAddDTO1.InoutType = orderAddDTO.OrderType ?? InoutTypeEnum.WorkFeed.ToString();
                    orderAddDTO1.OrderType = orderAddDTO.InoutType;
                    orderAddDTO1.System = orderAddDTO.System;
                    IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
                    orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                    #region 验证数据
                    (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
                    if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                    #endregion
                    Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
                    inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                    inboundOrder.Creater = "WMS";
                    inboundOrder.CreateDate = DateTime.Now;
                    inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
                    _unitOfWorkManage.BeginTran();
                    bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                    
                    foreach (var item in orderAddDTO1.Details)
                    {
                        if (string.IsNullOrWhiteSpace(item.Remark))
                        {
                            continue;
                        }
                        string[] remarkEntries = item.Remark.Split(
                            new[] { ';' },
                            StringSplitOptions.RemoveEmptyEntries
                        );

                        foreach (var entry in remarkEntries)
                        {
                            string[] keyValuePairs = entry.Split(
                                new[] { ',' },
                                StringSplitOptions.RemoveEmptyEntries
                            );

                            foreach (var kvp in keyValuePairs)
                            {
                                int colonIndex = kvp.IndexOf(':');
                                if (colonIndex <= 0 || colonIndex >= kvp.Length - 1)
                                {
                                    continue;
                                }

                                string key = kvp.Substring(0, colonIndex).Trim();
                                string value = kvp.Substring(colonIndex + 1).Trim();

                                switch (key)
                                {
                                    case "制造单号":
                                        production.ProductionNo = value;
                                        break;
                                    case "制造部件":
                                        production.ManufacturingCo = value;
                                        break;
                                    case "出库数量":
                                        if (decimal.TryParse(value, out decimal outQuantity))
                                        {
                                            production.OutQuantity = outQuantity;
                                        }
                                        else
                                        {
                                            Console.WriteLine($"出库数量格式错误：{value}（应为数值，如14.0000）");
                                        }
                                        break;
                                    default:
                                        Console.WriteLine($"未知键名：{key}（对应值：{value}，跳过该键值对）");
                                        break;
                                }
                                
                            }
                            production.Creater = "WMS";
                            production.OrderId = inboundOrder.Details.FirstOrDefault().Id;
                            _productionRepository.AddData(production);
                        }
                    }
                    _unitOfWorkManage.CommitTran();
                }


                content = WebResponseContent.Instance.OK();
@@ -462,23 +594,25 @@
                inboundOrder.OrderType = OutOrderTypeEnum.OutInventory.ObjToInt();
                inboundOrder.Creater = "WMS";
                inboundOrder.CreateDate = DateTime.Now;

                Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
                Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
                List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
                StockSelectViewDTO stockSelectViewDTO = new()
                foreach (var item in inboundOrder.Details)
                {
                    OrderNo = orderAddDTO1.OrderNo,
                    MaterielCode = outboundOrderDetail.MaterielCode,
                    MaterielName = outboundOrderDetail.MaterielName,
                    UseableQuantity = outboundOrderDetail.OrderQuantity,
                    BatchNo = outboundOrderDetail.BatchNo,
                    LinId = outboundOrderDetail.LinId,
                };

                    StockSelectViewDTO stockSelectViewDTO = new()
                    {
                        OrderNo = orderAddDTO1.OrderNo,
                        MaterielCode = item.MaterielCode,
                        MaterielName = item.MaterielName,
                        UseableQuantity = item.OrderQuantity,
                        BatchNo = item.BatchNo,
                        LinId = item.LinId,
                    };
                    stockSelectViews.Add(stockSelectViewDTO);
                }
                _unitOfWorkManage.BeginTran();
                bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
                stockSelectViews.Add(stockSelectViewDTO);
                GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);

                GenerateOutboundTasks(inboundOrder.Id, stockSelectViews);
                _unitOfWorkManage.CommitTran();
                content = WebResponseContent.Instance.OK();
            }
@@ -611,7 +745,15 @@
                }
                _unitOfWorkManage.CommitTran();
                //将任务推送到WCS
                PushTasksToWCS(tasks);

                if (tasks.FirstOrDefault().Roadway.Contains("SC01_BC"))
                {
                    PushTasksToWCS(tasks);
                }
                else
                {
                    PushTasksWCS(tasks);
                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -784,7 +926,7 @@
                foreach (int key in keys)
                {

                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
                   (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
@@ -795,17 +937,27 @@
                    }
                    if (result.Item4 != null && result.Item4.Count > 0)
                    {
                        outStockLockInfos.AddRange(result.Item4);
                        outStockLockInfos.AddRange(result.Item4); 
                    }
                    if (result.Item5 != null && result.Item5.Count > 0)
                    {
                        locationInfos.AddRange(result.Item5);
                        if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
                        {
                            locationInfos.AddRange(result.Item5.Distinct());
                        }
                        else
                        {
                            locationInfos.AddRange(result.Item5);
                        }
                    }
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks.AddRange(result.Item1);
                    }

                    if(locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
                    {
                        break;
                    }

                }