1

wankeda

2026-01-22 f27080d8476a177b809045d1f036a24dac782ba5

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -297,181 +297,90 @@
                }
                if (warehouse.WarehouseCode.Contains("CP"))
                {
                    Dt_NewOutboundOrder newOutboundOrder = BaseDal.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();

                    Dt_Production production1 = new Dt_Production();
                    if (newOutboundOrder != null)
                    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)
                    {
                        if (newOutboundOrder.OutWareHouse != warehouse.WarehouseCode)
                        if (string.IsNullOrWhiteSpace(item.Remark))
                        {
                            return WebResponseContent.Instance.Error($"仓库不一致");
                            continue;
                        }
                        else
                        string[] remarkEntries = item.Remark.Split(
                            new[] { ';' },
                            StringSplitOptions.RemoveEmptyEntries
                        );

                        foreach (var entry in remarkEntries)
                        {
                            OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                            orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
                            var details = orderAddDTO1.Details.FirstOrDefault();
                            Dt_NewOutboundOrderDetail outboundOrderDetail = new Dt_NewOutboundOrderDetail()
                            {
                                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 = newOutboundOrder.Id,
                                Creater = "WMS",
                                CreateDate = DateTime.Now,
                                Remark = details.Remark,
                                SupplierBatch = details.SupplierBatch,
                                OrinalLocation = details.OrinalLocation,
                            };
                            _newOutboundOrderDetailRepository.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 "制造单号":
                                                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 = outboundOrderDetail.Id;
                                    _productionRepository.AddData(production1);
                                }
                            }
                        }
                    }
                    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_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)
                        {
                            if (string.IsNullOrWhiteSpace(item.Remark))
                            {
                                continue;
                            }
                            string[] remarkEntries = item.Remark.Split(
                                new[] { ';' },
                            string[] keyValuePairs = entry.Split(
                                new[] { ',' },
                                StringSplitOptions.RemoveEmptyEntries
                            );

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

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

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

                                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();
                    }
                    _unitOfWorkManage.CommitTran();

                }
                else
                {
@@ -1175,10 +1084,6 @@
                    if (item.Details.Count <= 0)
                    {
                        return content.Error($"未找到{item.PalletCode}库存明细数据");
                    }
                    if (item.System.Contains("SMOM"))
                    {
                        return content.Error($"SMOM系统库存数据不可手动盘点，托盘号{item.PalletCode}");
                    }
                    Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
                    if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && item.StockStatus == StockStatusEmun.入库完成.ObjToInt())