吉安立库
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
1
wankeda
2026-01-22 eaf097eeef67ebaaf46777269128e65f820e31fc 
 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -108,6 +108,7 @@


        private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;


        private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;


        private readonly IStockInfoDetailRepository _stockInfoDetailRepository;


        private readonly IStockInfoDetailCPRepository _stockInfoDetailCPRepository;


        private readonly IReturnOrderRepository _returnOrderRepository;


        private readonly IProductionRepository _productionRepository;


        private readonly IInboundRepository _inboundRepository;


@@ -115,7 +116,7 @@


        private readonly ITakeStockOrderDetailCPRepository _takeStockOrderDetailCPRepository;


        public ITaskRepository Repository => BaseDal;




        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository) : base(BaseDal)


        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository, IStockInfoDetailCPRepository stockInfoDetailCPRepository) : base(BaseDal)


        {


            _mapper = mapper;


            _stockRepository = stockRepository;


@@ -143,6 +144,7 @@


            _newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;


            _takeStockOrderCPRepository = takeStockOrderCPRepository;


            _takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;


            _stockInfoDetailCPRepository = stockInfoDetailCPRepository;


        }




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


@@ -1171,7 +1173,7 @@


                        }


                    if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))


                    {


                        //SendInboundInfoToWMS(task, inboundOrder, stockInfo);


                    SendInboundInfoToWMS(task, inboundOrder, stockInfo);


                }


                    else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))


                    {


@@ -2716,7 +2718,7 @@


                            returnOrders.Add(returnOrder);




                            // 更新当前批次明细：只保留出库数量，其余返库


                            matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;


                            matchedStockDetail.StockQuantity = remainingQuantity;


                            matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;


                            //matchedStockDetail.OrderNo = returnOrder.OrderNo;


                        }


@@ -3427,12 +3429,7 @@


            try


            {


                //获取对应盘点单


                Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode);


                if (takeStockOrderDetailCP == null)


                {


                    return content.Error($"盘点单，托盘号{takeStockOrderDetailCP.TakePalletCode}不存在");


                }


                Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First();


                Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();


                if (takeStockOrder == null)


                {


                    return content.Error($"盘点单{task.OrderNo}不存在");


@@ -3495,6 +3492,7 @@


                _returnOrderRepository.AddData(returnOrder);


                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);


                _takeStockOrderCPRepository.UpdateData(takeStockOrder);


                _takeStockOrderDetailCPRepository.UpdateData(takeStockOrder.Details);


                _stockRepository.StockInfoRepository.UpdateData(stockInfo);


                _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);