ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
647556386
2025-12-19 43fba3aeb0fbbd48fb2f6a859418ab5c9e9d9241 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs


@@ -1,10 +1,12 @@


using System;


using Newtonsoft.Json;


using Newtonsoft.Json.Serialization;


using Org.BouncyCastle.Asn1.Ocsp;


using SqlSugar;


using System;


using System.Collections.Generic;


using System.Linq;


using System.Text;


using System.Threading.Tasks;


using Newtonsoft.Json;


using SqlSugar;


using WIDESEA_Core;


using WIDESEA_Core.BaseRepository;


using WIDESEA_Core.BaseServices;


@@ -47,6 +49,21 @@


                {


                    return WebResponseContent.Instance.Error($"未找到对应的出库单信息");


                }




                List<Dt_MesReturnRecord> returnRecords = BaseDal.QueryData(x => x.OrderNo == orderNo && x.OrderId == outboundOrder.Id && x.ReturnStatus == 2);


                foreach (var item in returnRecords)


                {


                    HttpResponseResult<MesResponseDTO> httpResponse = _httpClientHelper.Post<MesResponseDTO>(item.ApiUrl, item.RequestData);


                    item.ReturnCount += 1;


                    bool success = httpResponse.IsSuccess && httpResponse.Data.Code == "200";


                    item.ReturnStatus = success ? 1 : 2;


                    item.HttpStatusCode = httpResponse.StatusCode.ObjToInt();


                    item.LastReturnTime = DateTime.Now;


                    item.ResponseData = httpResponse.Content;


                    item.SuccessTime = httpResponse.IsSuccess ? DateTime.Now : null;


                }


                BaseDal.UpdateData(returnRecords);




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


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


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


@@ -62,7 +79,11 @@


                    string apiUrl = AppSettings.GetValue("MaterialOutboundFeedbackUrl");


                    returnDTO.ReqCode = reqCode;


                    returnDTO.ReqTime = reqTime;


                    requestData = returnDTO.Serialize();


                    JsonSerializerSettings settings = new JsonSerializerSettings


                    {


                        ContractResolver = new CamelCasePropertyNamesContractResolver()


                    };


                    requestData = JsonConvert.SerializeObject(returnDTO, settings);


                    lineNos = returnDTO.Details.Select(x => x.LineNo).ToList();


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


                    httpResponseResult.ApiUrl = apiUrl;


@@ -82,7 +103,11 @@


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


                    returnDTO.ReqCode = reqCode;


                    returnDTO.ReqTime = reqTime;


                    requestData = returnDTO.Serialize();


                    JsonSerializerSettings settings = new JsonSerializerSettings


                    {


                        ContractResolver = new CamelCasePropertyNamesContractResolver()


                    };


                    requestData = JsonConvert.SerializeObject(returnDTO, settings);


                    lineNos = returnDTO.Details.Select(x => x.LineNo).ToList();


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


                    httpResponseResult.ApiUrl = apiUrl;


@@ -123,8 +148,6 @@


                _unitOfWorkManage.BeginTran();


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




                if (isSuccess)


                {


                    List<Dt_OutboundOrderDetail> outboundOrderDetails = outboundOrder.Details.Where(x => lineNos.Contains(x.lineNo)).ToList();


                    outboundOrderDetails.ForEach(x =>


                    {


@@ -153,7 +176,6 @@




                    _outboundOrderRepository.Db.Updateable(outboundOrderDetails).ExecuteCommand();


                    _outboundOrderRepository.UpdateData(outboundOrder);


                }




                _unitOfWorkManage.CommitTran();




@@ -203,7 +225,7 @@


                    Details = returnDetails,


                    FactoryArea = outboundOrder.FactoryArea,


                    OperationType = 1,


                    OrderNo = outboundOrder.OrderNo,


                    OrderNo = outboundOrder.UpperOrderNo,


                    FromWarehouse = fromWarehouse,


                    ToWarehouse = toWarehouse


                };


@@ -326,11 +348,11 @@


                {


                    Business_type = outboundOrder.BusinessType,


                    Details = returnDetails,


                    DocumentsNO = "",


                    DocumentsNO = _basicService.CreateCodeByRule("OutboundOrderRule"),


                    FactoryArea = outboundOrder.FactoryArea,


                    OperationType = 1,


                    Operator = App.User.UserName,


                    OrderNo = outboundOrder.OrderNo,


                    OrderNo = outboundOrder.UpperOrderNo,


                    Status = 1


                };




@@ -373,8 +395,12 @@




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


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


                string requestData = returnDTO.Serialize();


                JsonSerializerSettings settings = new JsonSerializerSettings


                {


                    ContractResolver = new CamelCasePropertyNamesContractResolver()


                };




                string requestData = JsonConvert.SerializeObject(returnDTO, settings);


                HttpResponseResult<MesResponseDTO> httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);


                httpResponseResult.ApiUrl = apiUrl;