ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
647556386
10 天以前 70aa9b5ca249a84e5867912d551cdafbec76e54e 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs


@@ -32,6 +32,7 @@


using WIDESEA_IInboundService;


using WIDESEA_IOutboundService;


using WIDESEA_IStockService;


using WIDESEA_ITaskInfoService;


using WIDESEA_Model.Models;


using WIDESEA_Model.Models.Basic;


using WIDESEA_Model.Models.Check;


@@ -63,6 +64,7 @@


        private readonly IInboundOrderDetailService _inboundOrderDetailService;


        private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;


        private readonly IReCheckOrderService _reCheckOrderService;


        private readonly ITask_HtyService _task_HtyService;


        private readonly ILogger<OutboundPickingService> _logger;




        private Dictionary<string, string> stations = new Dictionary<string, string>


@@ -82,7 +84,7 @@


        public OutboundPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,


            IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,


            IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,


            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService) : base(BaseDal)


            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService, ITask_HtyService task_HtyService) : base(BaseDal)


        {


            _unitOfWorkManage = unitOfWorkManage;


            _stockInfoService = stockInfoService;


@@ -103,6 +105,7 @@


            _inboundOrderDetailService = inboundOrderDetailService;


            _warehouseAreaRepository = warehouseAreaRepository;


            _reCheckOrderService = reCheckOrderService;


            _task_HtyService = task_HtyService;


        }






@@ -1124,7 +1127,7 @@


        {


            // èŽ·å–最新的订单明细数据（带锁）


            var currentOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()


                .With(SqlWith.RowLock)


                //.With(SqlWith.RowLock)


                .FirstAsync(x => x.Id == orderDetailId);




            decimal newOverOutQuantity = currentOrderDetail.OverOutQuantity - cancelQty;


@@ -1684,14 +1687,29 @@


                WarehouseId = originalTask.WarehouseId




            };


            try


            {


            // ä¿å­˜å›žåº“任务


            await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


                var insertcount = await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


                if (insertcount <= 0)


                {


                    throw new Exception("创建任务失败！");


                }


            }


            catch (Exception ex) 


            {


                _logger.LogInformation($"CreateReturnTaskAndHandleESS åˆ›å»ºä»»åŠ¡å¤±è´¥: {orderNo} ï¼Œ {palletCode}");


                throw new Exception("创建任务失败！");


            }


            var targetAddress = originalTask.TargetAddress;




            // åˆ é™¤åŽŸå§‹å‡ºåº“任务


            _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


            // _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


            var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.人工删除);


            if (!result)


            {


            await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();




            }






            // ç»™ ESS å‘送流动信号和创建任务


@@ -2093,8 +2111,7 @@


            {


                // 1. åˆ é™¤åº“存数量为0的明细记录


                var deleteDetailCount = await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()


                    .Where(x => x.StockId == stockId && x.StockQuantity == 0 && (x.Status == StockStatusEmun.出库完成.ObjToInt() || x.Status ==


                                          StockStatusEmun.入库完成.ObjToInt()))


                    .Where(x => x.StockId == stockId && x.StockQuantity == 0)


                    .ExecuteCommandAsync();




                await _stockInfoService.Db.Deleteable<Dt_StockInfo>()


@@ -2978,6 +2995,8 @@


                    {


                        return content.Error("只有拿到重检结果才能入库！");


                    }






                }


                //  Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);




@@ -3003,7 +3022,8 @@


                    stockInfo.Details = new List<Dt_StockInfoDetail>();


                }


                var inboindId = 0; Dt_InboundOrder dt_InboundOrder = null;


                var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == dbinboundOrderDetails.First().OrderNo).First();


                var orderno = dbinboundOrderDetails.First().OrderNo;


                var dbinbound = _inboundOrderRepository.QueryData(x => x.InboundOrderNo == orderno).FirstOrDefault();


                if (dbinbound == null)


                {


                    dt_InboundOrder = new Dt_InboundOrder


@@ -3046,7 +3066,7 @@


                        FactoryArea = item.FactoryArea,


                        Status = 0,


                        OrderNo = item.OrderNo,


                        BusinessType = InOrderTypeEnum.InternalAllocat.ObjToInt().ToString()


                        BusinessType = materielGroupDTO.orderTypes.ToString()




                    });


                    item.WarehouseCode = item.WarehouseCode;