From 7a663544bda26aaabcad039c726b87d0c65be5f0 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:34:45 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs | 127 ++++++++++--------------------------------
1 files changed, 31 insertions(+), 96 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
index e7e9b59..ce2214b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs"
@@ -18,9 +18,6 @@
namespace WIDESEA_StoragIntegrationServices
{
- /// <summary>
- /// 鎬昏宸ュ崟淇℃伅
- /// </summary>
public partial class MESService
{
public WebResponseContent pushOrderInfo(object json)
@@ -29,110 +26,48 @@
try
{
if (string.IsNullOrEmpty(json.ToString())) throw new Exception("璇锋眰鍙傛暟涓虹┖");
- var result = JsonConvert.DeserializeObject<pushOrderInfo>(json.ToString());
+ Console.WriteLine(json);
+ var result = JsonConvert.DeserializeObject<List<pushOrderInfo>>(json.ToString());
- if (result.plantCode != "1052") throw new Exception("闈炴湰宸ュ巶璁㈠崟,璇烽噸璇�");
+ if (result[0].plantCode != "1052") throw new Exception("闈炴湰宸ュ巶璁㈠崟,璇烽噸璇�");
- var ListTaskDto = new List<WMSTaskDTO>();
- var ListTask = new List<Dt_Task>();
- foreach (var item in result.data)
+ var ListAssemblyOrderInfo = new List<Dt_AssemblyOrderInfo>();
+ foreach (var item in result)
{
- var palletStockInfos = _palletStockInfoRepository.QueryData(x => x.OrderID == item.workOrderNo);
-
-
- //濡傚瓨鍦ㄩ缁戝畾宸ュ崟鐨勫簱瀛�,鍒欎紭鍏堝嚭搴撻缁戝畾鐨勫伐鍗�
- if (palletStockInfos != null || palletStockInfos.Count != 0)
+ Dt_AssemblyOrderInfo assemblyOrderInfo = new Dt_AssemblyOrderInfo
{
- foreach (var item1 in palletStockInfos)
- {
- Dt_Task task = new Dt_Task()
- {
- CurrentAddress = item1.LocationCode,
- Grade = 2,
- NextAddress = item1.LocationCode,
- PalletCode = item1.PalletCode,
- OrderNo = item1.OrderID,
- PVI = item1.PVI,
- Modifier = item1.Modifier,
- Roadway = item1.RoadwayNo,
- SourceAddress = item1.LocationCode,
- TaskNum = _taskRepository.GetTaskNo().Result,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.Outbound,
- TargetAddress = "",
- Creater = "System",
- CreateDate = DateTime.Now
- };
- ListTask.Add(task);
-
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- Grade = task.Grade.Value,
- PalletCode = task.PalletCode,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- RoadWay = task.Roadway,
- TaskState = task.TaskState.Value,
- TaskType = task.TaskType,
- TaskNum = task.TaskNum.Value
- };
- ListTaskDto.Add(taskDTO);
- }
- }
- else
- {
- //濡備笉瀛樺湪棰勭粦瀹氬伐鍗曡溅杈�,鍒欐寜鐓у伐鍗曚俊鎭尮閰嶅簱瀛樿溅杈�
- //todo 鐗瑰緛淇℃伅鍖归厤
- _palletStockInfoRepository.QueryData(x => x.PVI == item.pvi);
-
- }
-
-
+ biwMaterial = item.biwMaterial,
+ CreateDate = DateTime.Now,
+ Creater = "System",
+ orderType = item.orderType,
+ pbMaterial = item.pbMaterial,
+ plantCode = item.plantCode,
+ pvi = item.pvi,
+ sequenceNo = item.sequenceNo,
+ spare1 = item.spare1,
+ spare2 = item.spare2,
+ spare3 = item.spare3,
+ splitStrategy = item.splitStrategy,
+ vehicleCharacteristic = item.vehicleCharacteristic,
+ vehicleCode = item.vehicleCode,
+ vehicleOrderNo = item.vehicleOrderNo,
+ workOrderNo = item.workOrderNo,
+ workOrderSendStatus = item.workOrderSendStatus, //1-鎺掍骇 2-鎾ゅ洖
+ };
+ ListAssemblyOrderInfo.Add(assemblyOrderInfo);
}
- pushOrderInfo orderInfo = new pushOrderInfo
- {
+ _assemblyOrderInfoRepository.AddData(ListAssemblyOrderInfo);
- };
-
- Dt_OutOrder outOrder = new()
- {
- CreateDate = DateTime.Now,
- Creater = "System",
- Status = 1,
- //UpperOutOrderId = result.workOrderNo,
- OrderNumber = result.data[0].workOrderNo,
- WarehouseId = 1,
- OrderDate = DateTime.Now,
- UpperOutOrderId = 1,
- Remarks = "娴嬭瘯璁㈠崟"
-
- };
-
-
- var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
- var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
- if (wmsBase == null || ipAddress == null)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddress = wmsBase + ipAddress;
-
- var WCSresult = HttpHelper.PostAsync(wmsIpAddress, ListTaskDto.ToJsonString()).Result;
- var content = JsonConvert.DeserializeObject<WebResponseContent>(WCSresult);
-
- _unitOfWorkManage.BeginTran();
- _OutOrderRepository.AddData(outOrder);
- _taskRepository.AddData(ListTask);
-
- _unitOfWorkManage.CommitTran();
-
+ LogFactory.GetLog("鎬昏宸ュ崟淇℃伅").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鎬昏宸ュ崟淇℃伅").Info(true, json.ToJsonString());
responseContent.OK();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+ //_unitOfWorkManage.RollbackTran();
+ LogFactory.GetLog("鎬昏宸ュ崟淇℃伅").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("鎬昏宸ュ崟淇℃伅").Info(true, $"鎬昏宸ュ崟鎺ユ敹寮傚父:{ex.Message}");
return responseContent.Error(ex.Message);
}
return responseContent;
--
Gitblit v1.9.3