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


@@ -41,10 +41,12 @@


using WIDESEA_Core.BaseServices;


using WIDESEA_Core.Enums;


using WIDESEA_Core.Helper;


using WIDESEA_Core.Util;


using WIDESEA_DTO.Allocate;


using WIDESEA_DTO.Basic;


using WIDESEA_DTO.Inbound;


using WIDESEA_DTO.Outbound;


using WIDESEA_DTO.ReturnMES;


using WIDESEA_DTO.Task;


using WIDESEA_IAllocateService;


using WIDESEA_IBasicService;


@@ -56,6 +58,7 @@


using WIDESEA_Model.Models;


using WIDESEA_Model.Models.Check;


using WIDESEA_Model.Models.Outbound;


using static HslCommunication.Profinet.Knx.KnxCode;




namespace WIDESEA_TaskInfoService


{


@@ -87,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()


@@ -106,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;


@@ -132,6 +136,7 @@


            _task_HtyService = task_HtyService;


            _allocateMaterialInfo = allocateMaterialInfo;


            _allocateMaterialInfo_Hty = allocateMaterialInfo_Hty;


            _httpClientHelper = httpClientHelper;


        }




        public async Task TaskStatusChange(string taskNum, TaskStatusEnum taskStatusEnum)


@@ -355,8 +360,10 @@


                               }).ToList();


                            allocatefeedmodel.Details = groupedData;




                            var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            if (feedbackresult != null && feedbackresult.code == 200)


                            //var feedbackresult = await _invokeMESService.FeedbackAllocate(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 })


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


@@ -459,8 +466,11 @@


                               }).ToList();


                            feedmodel.details = groupedData;




                            var feedbackresult = await _invokeMESService.FeedbackInbound(feedmodel);


                            if (feedbackresult != null && feedbackresult.code == 200)


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




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




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


                            {


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


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


@@ -469,7 +479,7 @@


                            }


                            else


                            {


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = feedbackresult.message })


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = response.ErrorMessage })


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


                                _inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })


                               .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();


@@ -487,6 +497,61 @@


            return WebResponseContent.Instance.OK();


        }




        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 = 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";


            string message = "鎴愬姛";


            if (!isSuccess)


            {


                if (!httpResponseResult.IsSuccess)


                {


                    message = $"MES鎺ュ彛杩斿洖閿欒锛孒TTP浠ｇ爜锛歿httpResponseResult.StatusCode}锛屼俊鎭細{httpResponseResult.ErrorMessage}";


                }


                else if (httpResponseResult?.Data?.Code != "200")


                {


                    message = $"璋冪敤MES鎺ュ彛澶辫触锛屼唬鐮侊細{httpResponseResult?.Data?.Code}锛屼俊鎭細{httpResponseResult?.Data?.Message}";


                }


            }


            Dt_MesReturnRecord mesReturnRecord = new Dt_MesReturnRecord()


            {


                ApiUrl = httpResponseResult.ApiUrl,


                InterfaceType = InterfaceType,


                OrderId = order.Id,


                OrderNo = order.InboundOrderNo,


                RequestCode = reqCode,


                RequestData = requestData,


                FailureReason = message,


                LastReturnTime = DateTime.Now,


                HttpStatusCode = httpResponseResult.StatusCode.ObjToInt(),


                ResponseData = httpResponseResult.Content,


                ReturnType = 0,


                ReturnCount = 1,


                ReturnStatus = httpResponseResult.IsSuccess ? 1 : 2,


                SuccessTime = httpResponseResult.IsSuccess ? DateTime.Now : null


            };


            _unitOfWorkManage.Db.Insertable(mesReturnRecord).ExecuteCommand();




            return httpResponseResult;


        }






        public async Task<WebResponseContent> OutAllocateTaskCompleted(Dt_Task task)


        {