1

yangpeixing

2026-01-19 c6f6be2d942214580e61c2647c846d7e11e06f48

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -886,6 +886,158 @@
                            }
                        }
                    }
                    else if (warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
                    {
                        Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
                        //Dt_InboundOrderDetail? inboundOrderDetail = null;
                        //出库入库逻辑
                        if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                            // 根据托盘明细获取对应的入库单明细
                            List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();

                            // 处理多个库存明细的情况
                            foreach (var stockDetail in dt_StockInfo.Details)
                            {
                                if (!string.IsNullOrEmpty(stockDetail.OrderNo))
                                {
                                    var detail = inboundOrder.Details.FirstOrDefault(x => x.LinId == stockDetail.LinId && x.BatchNo == stockDetail.BatchNo);

                                    if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
                                    {
                                        inboundOrderDetails.Add(detail);
                                    }
                                }
                            }
                            if (!inboundOrderDetails.Any())
                            {
                                return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
                            }
                            // 更新入库单明细状态
                            foreach (var inboundOrderDetail in inboundOrderDetails)
                            {
                                // 检查该明细是否已全部入库
                                decimal totalStockQuantity = dt_StockInfo.Details
                                    .Where(x => x.LinId == inboundOrderDetail.LinId && x.BatchNo == inboundOrderDetail.BatchNo)
                                    .Sum(x => x.StockQuantity);

                                decimal orderQuantity = Convert.ToDecimal(inboundOrderDetail.OrderQuantity);
                                decimal receiptQuantity = Convert.ToDecimal(inboundOrderDetail.ReceiptQuantity);
                                decimal overInQuantity = Convert.ToDecimal(inboundOrderDetail.OverInQuantity);

                                // 更新收货数量
                                inboundOrderDetail.OverInQuantity = totalStockQuantity += overInQuantity;

                                // 检查是否全部完成
                                if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                }
                                else
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
                                }
                            }
                            ///更新库存状态
                            dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            // 更新库存明细状态
                            dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());
                            try
                            {
                                _unitOfWorkManage.BeginTran();

                                // 更新任务状态
                                UpdateTaskStatus(task);

                                // 更新货位状态
                                UpdateLocationStatus(dt_LocationInfo, lastStatus);

                                // 更新库存信息
                                UpdateStockInfo(dt_StockInfo);

                                // 添加记录
                                AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);

                                // 更新入库单明细
                                if (inboundOrderDetails.Any())
                                {
                                    BaseDal.Db.Updateable(inboundOrderDetails).ExecuteCommand();

                                    // 检查入库单是否全部完成
                                    bool allCompleted = inboundOrder.Details.All(x =>
                                        x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());

                                    if (allCompleted)
                                    {
                                        inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                                    }
                                    else
                                    {
                                        inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                                    }
                                }

                                // 更新入库单
                                UpdateInboundOrder(inboundOrder, inboundOrderDetails.FirstOrDefault());

                                // 单据数量全部上架完成，处理WMS回传
                                if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
                                {
                                    if(inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt())
                                    {
                                        bool allCompleted = inboundOrder.Details.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
                                        if (allCompleted)
                                        {
                                            foreach (var detail in inboundOrder.Details)
                                            {
                                                FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
                                            }
                                        }
                                    }
                                }
                                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
                                {

                                }
                                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                                {
                                    SendAllocateInfoToWMS(task, inboundOrder, dt_StockInfo);
                                }

                                _unitOfWorkManage.CommitTran();
                                return WebResponseContent.Instance.OK();
                            }
                            catch (Exception ex)
                            {
                                _unitOfWorkManage.RollbackTran();
                                throw new Exception($"入库处理失败：{ex.Message}", ex);
                            }

                        }
                        if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
                        {
                            return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
                        }
                        if (task.TaskType == TaskTypeEnum.InInventory.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                            dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            // 更新库存明细状态
                            dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());
                            _unitOfWorkManage.BeginTran();
                            UpdateTaskStatus(task);
                            UpdateLocationStatus(dt_LocationInfo, lastStatus);
                            UpdateStockInfo(dt_StockInfo);
                            AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
                            _unitOfWorkManage.CommitTran();
                            return WebResponseContent.Instance.OK();

                        }

                    }
                    else
                    {
                        Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
@@ -1779,6 +1931,41 @@
                            return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
                        }
                    }
                    else if(warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
                    {
                        Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                        .Where(x => x.OrderNo == task.OrderNo)
                        .Includes(x => x.Details)
                        .First();

                        if (inboundOrder == null) return WebResponseContent.Instance.Error("未找到出库单信息");

                        Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
                        foreach(var detail in stockInfo.Details)
                        {
                            outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                            .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo)
                            .First();
                            if(outboundOrderDetail != null) break;

                        }

                        if (outboundOrderDetail.LocationName != null && outboundOrderDetail.LocationName != "")
                        {
                          foreach(var detail in stockInfo.Details)
                          {
                                outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                                .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo && x.LocationName == stockInfo.LocationCode)
                                .First();
                                if (outboundOrderDetail != null) break;
                           }
                        }

                        if (outboundOrderDetail == null) return WebResponseContent.Instance.Error("未找到出库单信息");
                        DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetail);
                        // 3. 执行核心出库逻辑
                        return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetail, inboundOrder);
                    }
                    else
                    {
                        Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
@@ -1872,7 +2059,14 @@
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

                // 更新库存状态 回库单
                if(locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
                {
                    AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
                }
                else
                {
                AddRetrueOrder(stockInfo, inboundOrder);
                }

                // 区分单据数据来源更新货位状态
                if (inboundOrder.System == null)
@@ -1951,6 +2145,39 @@
                {
                    inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.出库中.ObjToInt();
                    inboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
                }
            }
            if (inboundOrder.Details.Count == overCount)
            {
                inboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
            }
        }

        //低温、药水
        private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
        {
            string BatchNo = inboundOrderDetail.BatchNo;
            int overCount = inboundOrder.Details.Where(x => x.BatchNo == BatchNo).Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
            //inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);

            foreach (var item in stockInfo.Details)
            {
                if (inboundOrderDetail == null) continue;

                if(inboundOrderDetail.BatchNo == item.BatchNo)
                {
                    inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;

                    if (inboundOrderDetail.OverOutQuantity == inboundOrderDetail.OrderQuantity)
                    {
                        inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                        overCount++;
                    }
                    else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
                    {
                        inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.出库中.ObjToInt();
                        inboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
                    }
                }
            }
            if (inboundOrder.Details.Count == overCount)
@@ -2221,8 +2448,7 @@
        private void AddRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
        {
            Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
           .Where(x => x.StockId == stockInfo.Id)
           .First();
           .Where(x => x.StockId == stockInfo.Id).First();
            if (stockInfoDetail == null)
            {
                throw new Exception("建立回库单时，未找到该库存信息");
@@ -2282,6 +2508,95 @@
                    DeleteAndMoveIntoHtStockStatus(stockInfo);
                }
            }


        }

        //低温、药水回库单
        private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
        {

            List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
           .Where(x => x.StockId == stockInfo.Id).ToList();

            Dt_ReturnOrder? lastReturnOrder = null; 
            foreach (var stockInfoDetail in stockInfoDetails)
            {
                if (stockInfoDetail == null)
                {
                    throw new Exception("建立回库单时，未找到该库存信息");
                }
                if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
                {
                    Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
                    if (returnOrder == null)
                    {
                        throw new Exception("反拣出库后，未找到对应反拣回库单信息");
                    }
                    stockInfo.LocationCode = "";
                    stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                    stockInfo.Remark = "反拣入库";
                    stockInfoDetail.OutboundQuantity = 0;
                    stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
                    stockInfoDetail.OrderNo = returnOrder.OrderNo;
                }
                else
                {
                    bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
                    if (allowCompeted)
                    {
                        DeleteAndMoveIntoHtStockStatus(stockInfo);
                    }
                    else
                    {
                        decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
                        if (returnQuantity > 0)
                        {
                            Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
                            {
                                MaterielCode = stockInfoDetail.MaterielCode,
                                MaterielName = stockInfoDetail.MaterielName,
                                BatchNo = stockInfoDetail.BatchNo,
                                OrderQuantity = returnQuantity,
                                ReceiptQuantity = returnQuantity,
                                OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                                LinId = stockInfoDetail.LinId,
                                LPNNo = stockInfo.PalletCode,
                                Creater = "LK",
                                CreateDate = DateTime.Now,
                                OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                                System = "WMS",
                                Remark = stockInfoDetail.BatchNo
                            };
                            if(lastReturnOrder != null)
                            {
                                lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
                                _returnOrderRepository.UpdateData(lastReturnOrder);
                            }
                            if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                            {
                                returnOrder.LocationCode = stockInfo.LocationCode;
                            }
                            _unitOfWorkManage.BeginTran();
                            if(lastReturnOrder == null)
                            {
                                _returnOrderRepository.AddData(returnOrder);
                                lastReturnOrder = returnOrder;
                            }
                            stockInfo.LocationCode = "";
                            stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                            stockInfo.Remark = "余料退库";
                            stockInfoDetail.OutboundQuantity = 0;
                            stockInfoDetail.StockQuantity = returnQuantity;
                            stockInfoDetail.OrderNo = lastReturnOrder.OrderNo;
                            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                            _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
                            _unitOfWorkManage.CommitTran();
                        }
                    }
                }
            }


        }

@@ -2356,8 +2671,7 @@
                        var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
                        if (matchedStockDetail == null)
                        {
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
               x.MaterielCode == outboundDetail.MaterielCode);
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outboundDetail.MaterielCode);

                            if (matchedStockDetail == null)
                            {