ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
pan
10 天以前 c95029139c278f0d2980e6d67cab42f5331e8d06 
 ÏîÄ¿´úÂë/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;


        }






@@ -1685,13 +1688,20 @@




            };


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


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


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


            if (insertcount <= 0)


            {


                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 å‘送流动信号和创建任务