ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
z8018
2025-12-18 77bc3a65b83a58c9fc30fb80679a93bc45a2cb84 
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -90,6 +90,7 @@


        private readonly ITask_HtyService _task_HtyService;


        private readonly IRepository<Dt_AllocateMaterialInfo> _allocateMaterialInfo;


        private readonly IRepository<Dt_AllocateMaterialInfo_Hty> _allocateMaterialInfo_Hty;


        private readonly HttpClientHelper _httpClientHelper;


        public IRepository<Dt_Task> Repository => BaseDal;




        private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()


@@ -109,7 +110,7 @@




        public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();




        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService, IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, IRepository<Dt_AllocateMaterialInfo_Hty> allocateMaterialInfo_Hty) : base(BaseDal)


        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService, IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, IRepository<Dt_AllocateMaterialInfo_Hty> allocateMaterialInfo_Hty, HttpClientHelper httpClientHelper) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -135,6 +136,7 @@


            _task_HtyService = task_HtyService;


            _allocateMaterialInfo = allocateMaterialInfo;


            _allocateMaterialInfo_Hty = allocateMaterialInfo_Hty;


            _httpClientHelper = httpClientHelper;


        }




        public async Task TaskStatusChange(string taskNum, TaskStatusEnum taskStatusEnum)


@@ -358,9 +360,9 @@


                               }).ToList();


                            allocatefeedmodel.Details = groupedData;




                            var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            //var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);




                            var response = responseModel(inboundOrder, 3, "http://127.0.0.1:450/api/AldAllocationOperation/AllocationOperation", null, allocatefeedmodel);


                            var response = responseModel(inboundOrder, 3, null, allocatefeedmodel);


                            if (response != null && response.IsSuccess)


                            {


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })


@@ -466,7 +468,7 @@




                            //var feedbackresult = await _invokeMESService.FeedbackInbound(feedmodel);




                            var response= responseModel(inboundOrder,2, "http://127.0.0.1:450/api/AldMaterialWarehousing/MaterialWarehousing", feedmodel);


                            var response= responseModel(inboundOrder,2, feedmodel);




                            if (response != null && response.IsSuccess)


                            {


@@ -495,22 +497,24 @@


            return WebResponseContent.Instance.OK();


        }




        public HttpResponseResult<MesResponseDTO> responseModel(Dt_InboundOrder order, int InterfaceType, string url, FeedbackInboundRequestModel model = null, AllocateDto allocateDto = null)


        public HttpResponseResult<MesResponseDTO> responseModel(Dt_InboundOrder order, int InterfaceType, FeedbackInboundRequestModel model = null, AllocateDto allocateDto = null)


        {


            HttpResponseResult<MesResponseDTO> httpResponseResult = new HttpResponseResult<MesResponseDTO>();


            string reqCode = Guid.NewGuid().ToString();


            string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");


            string requestData = string.Empty;


            //string apiUrl = AppSettings.GetValue("AllocationFeedbackUrl");


            //string apiUrl = "http://127.0.0.1:450/api/AldMaterialWarehousing/MaterialWarehousing";


            string apiUrl = url;


            string apiUrl = string.Empty;            


            if (model != null)


            {


                apiUrl = AppSettings.GetValue("AldMaterialWarehousing");


                httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, model.Serialize());


                requestData = model.Serialize();


            }


            else


            {


                apiUrl = AppSettings.GetValue("AldAllocationOperation");


                httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, allocateDto.Serialize());


                requestData = allocateDto.Serialize(); 


            }


            httpResponseResult.ApiUrl = apiUrl;


            bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";