1

yangpeixing

2026-02-04 dccc001554c6c5376482df77f929c0d49b258844

 WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs

@@ -454,7 +454,7 @@
                        Materialweight = 0,
                        Wlstatus = (int)InventoryMaterialStatus.合格,
                        Mgeneratetime = DateTime.Now,
                        WarehouseId = warehouse.WarehouseId,
                        WarehouseId = 0,
                        System = inboundOrder.System,
                        Details = new List<Dt_StockInfoDetail>()
                    };
@@ -470,6 +470,14 @@
                    Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();

                    notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.BatchNo == model.LotNo).FirstOrDefault();
                    if (notGroupDetail.MaterielType == 1)
                    {
                        stockInfo.WarehouseId = 6;
                    }
                    else if (notGroupDetail.MaterielType == 2)
                    {
                        stockInfo.WarehouseId = 5;
                    }

                    if (notGroupDetail == null)
                    {
@@ -565,29 +573,6 @@
                var quantities = new List<decimal>();
                var lotNos = new List<string>();
                var materielCodes = new List<string>();

                foreach (var item in saveModel.DelKeys)
                {
                    var delKeyDict = item as IDictionary<string, object>;
                    if (delKeyDict == null)
                    {
                        string json = JsonConvert.SerializeObject(item);
                        delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
                    }

                    // 处理序列号
                    if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) || serialNumberObj == null)
                    {
                        return WebResponseContent.Instance.Error("缺少serialNumber字段或值为空");
                    }

                    string serialNumber = serialNumberObj.ToString();
                    if (string.IsNullOrWhiteSpace(serialNumber))
                    {
                        return WebResponseContent.Instance.Error("serialNumber的值为空");
                    }
                    serialNumbers.Add(serialNumber);
                }
                // 获取仓库信息
                Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
                if (warehouse == null)
@@ -612,8 +597,7 @@
                    .LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
                    .Where((cp, d, o) =>
                        o.OrderNo == orderNo &&
                        o.WarehouseId == warehouse.WarehouseId &&
                        serialNumbers.Contains(cp.BoxCode)
                        o.WarehouseId == warehouse.WarehouseId
                    )
                    .Select((cp, d, o) => cp)
                    .ToList();
@@ -621,28 +605,25 @@
                //float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);


                // 验证查询到的数据数量是否匹配
                if (CPinboundOrderDetails.Count < serialNumbers.Count)
                {
                    return WebResponseContent.Instance.Error($"未找到所有对应的箱号信息，找到{CPinboundOrderDetails.Count}条，期望{serialNumbers.Count}条");
                }

                // 按照箱号分组，用于后续处理
                var cpDetailsByBoxCode = CPinboundOrderDetails
                    .GroupBy(x => x.BoxCode)
                    .ToDictionary(g => g.Key, g => g.ToList());
                var boxCodesToCheck = CPinboundOrderDetails
                    .Select(x => x.BoxCode)
                    .Where(bc => !string.IsNullOrEmpty(bc))
                    .Distinct()
                    .ToList();


                // 3. 查询这些箱号是否已存在于库存中
                var existingStockBoxCodes = _stockRepository.StockInfoRepository.Db
                .Queryable<Dt_StockInfo>()
                .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
                .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
                .Where((s, d, cp) =>
                    serialNumbers.Contains(cp.BoxCode))
                    .Where((s, d, cp) => boxCodesToCheck.Contains(cp.BoxCode) && !string.IsNullOrEmpty(cp.BoxCode))
                .Select((s, d, cp) => cp.BoxCode)
                .Distinct()
                .ToList();

                // 4. 检查是否有重复
                if (existingStockBoxCodes.Any())
                {
                    return WebResponseContent.Instance.Error($"以下箱号已在库存中：{string.Join(",", existingStockBoxCodes)}");
@@ -855,7 +836,7 @@
        }
        #endregion


        #region 弃用
        public WebResponseContent CP1MaterielGroup(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
@@ -868,6 +849,29 @@
                var quantities = new List<decimal>();
                var lotNos = new List<string>();
                var materielCodes = new List<string>();

                foreach (var item in saveModel.DelKeys)
                {
                    var delKeyDict = item as IDictionary<string, object>;
                    if (delKeyDict == null)
                    {
                        string json = JsonConvert.SerializeObject(item);
                        delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
                    }

                    // 处理序列号
                    if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) || serialNumberObj == null)
                    {
                        return WebResponseContent.Instance.Error("缺少serialNumber字段或值为空");
                    }

                    string serialNumber = serialNumberObj.ToString();
                    if (string.IsNullOrWhiteSpace(serialNumber))
                    {
                        return WebResponseContent.Instance.Error("serialNumber的值为空");
                    }
                    serialNumbers.Add(serialNumber);
                }
                // 获取仓库信息
                Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
                if (warehouse == null)
@@ -892,7 +896,8 @@
                    .LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
                    .Where((cp, d, o) =>
                        o.OrderNo == orderNo &&
                        o.WarehouseId == warehouse.WarehouseId
                        o.WarehouseId == warehouse.WarehouseId &&
                        serialNumbers.Contains(cp.BoxCode)
                    )
                    .Select((cp, d, o) => cp)
                    .ToList();
@@ -900,25 +905,28 @@
                //float totalQty = CPinboundOrderDetails.Sum(x => x.QtyOfpcs);


                // 验证查询到的数据数量是否匹配
                if (CPinboundOrderDetails.Count < serialNumbers.Count)
                {
                    return WebResponseContent.Instance.Error($"未找到所有对应的箱号信息，找到{CPinboundOrderDetails.Count}条，期望{serialNumbers.Count}条");
                }

                // 按照箱号分组，用于后续处理
                var boxCodesToCheck = CPinboundOrderDetails
                    .Select(x => x.BoxCode)
                    .Where(bc => !string.IsNullOrEmpty(bc))
                    .Distinct()
                    .ToList();
                var cpDetailsByBoxCode = CPinboundOrderDetails
                    .GroupBy(x => x.BoxCode)
                    .ToDictionary(g => g.Key, g => g.ToList());


                // 3. 查询这些箱号是否已存在于库存中
                var existingStockBoxCodes = _stockRepository.StockInfoRepository.Db
                    .Queryable<Dt_StockInfo>()
                    .LeftJoin<Dt_StockInfoDetail>((s, d) => s.Id == d.StockId)
                    .LeftJoin<Dt_StockInfoDetailCP>((s, d, cp) => d.Id == cp.StockDetailId)
                    .Where((s, d, cp) => boxCodesToCheck.Contains(cp.BoxCode) && !string.IsNullOrEmpty(cp.BoxCode))
                .Where((s, d, cp) =>
                    serialNumbers.Contains(cp.BoxCode))
                    .Select((s, d, cp) => cp.BoxCode)
                    .Distinct()
                    .ToList();

                // 4. 检查是否有重复
                if (existingStockBoxCodes.Any())
                {
                    return WebResponseContent.Instance.Error($"以下箱号已在库存中：{string.Join(",", existingStockBoxCodes)}");
@@ -1127,6 +1135,7 @@

            return content;
        }
        #endregion

        public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];

@@ -1289,19 +1298,18 @@

        public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
        {

            if (warehouse.WarehouseCode == WarehouseEnum.SC01_DW.ObjToString())
            if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString())
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
                if (palletTypeInfo == null)
                {
                    throw new Exception($"托盘号错误");
                }
                return palletTypeInfo.PalletType;
            }
            if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ObjToString())
            else
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 3));
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
                if (palletTypeInfo == null)
                {
                    throw new Exception($"托盘号错误");
@@ -1573,6 +1581,7 @@
                                {
                                    OrderId = orderDetail1.OrderId,
                                    MaterielCode = item.MaterielCode,
                                    MaterielType=item.MaterielType,
                                    BatchNo = item.BatchNo,
                                    OrderQuantity = item.OrderQuantity,
                                    ReceiptQuantity = 0,
@@ -1592,6 +1601,7 @@
                        {
                            Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
                            {
                                MaterielType = item.MaterielType,
                                MaterielCode = item.MaterielCode,
                                BatchNo = item.BatchNo,
                                OrderQuantity = item.OrderQuantity,
@@ -1622,46 +1632,12 @@
                                System = model.System,
                                Details = new List<Dt_InboundOrderDetail> { orderDetail }
                            };
                            //switch (model.OrderType)//单据类型
                            //{
                            //    case 1:
                            //        inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
                            //        break;
                            //    case 3:
                            //        inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
                            //        break;
                            //    case 6:
                            //        inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
                            //        break;
                            //    default:
                            //        break;
                            //};
                            Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

                        }
                    }
                }
                _unitOfWorkManage.CommitTran();
                content = WebResponseContent.Instance.OK();
                //InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
                //orderAddDTO1.OrderNo = orderAddDTO.AsnNo;
                //orderAddDTO1.UpperOrderNo = orderAddDTO.AsnNo;
                //orderAddDTO1.OutWareHouse = orderAddDTO.InWarehouse;
                //orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
                //orderAddDTO1.InoutType = orderAddDTO.OrderType;
                //orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
                //orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<InboundOrderDetailAddDTO>();
                //#region 验证数据
                //(bool, string, object?) result = CheckInboundOrderAddData(orderAddDTO1);
                //if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
                //#endregion

                //Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO1);
                //inboundOrder.OrderStatus = InboundStatusEnum.未开始.ObjToInt();
                //inboundOrder.Creater = "WMS";
                //inboundOrder.CreateDate = DateTime.Now;
                //bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

            }
            catch (Exception ex)
            {