From c84db706e8c8d82a96bb4b4c18c243a42b2976c1 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 19 十一月 2025 19:44:30 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index f552ffb..a7d3558 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -19,7 +19,12 @@
{
public partial class TaskService
{
-
+ /// <summary>
+ /// ESS鎵爜璇锋眰鍏ュ簱
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> RequestInboundTask(string palletCode, string stationCode)
{
try
@@ -27,7 +32,14 @@
Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
if (dbtask != null)
{
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+ if (dbtask.TaskType == TaskTypeEnum.Outbound.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"鍑哄簱寰呭垎鎷ｄ换鍔�");
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+ }
}
Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
@@ -45,7 +57,7 @@
return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
}
- Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation();
+ Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation(stockInfo.LocationType);
if (locationInfo == null)
{
return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
@@ -53,7 +65,7 @@
var newTask = new Dt_Task()
- {
+ {
CurrentAddress = stationCode,
Grade = 0,
NextAddress = stations.GetValueOrDefault(stationCode) ?? "",
@@ -65,7 +77,8 @@
TaskStatus = TaskStatusEnum.New.ObjToInt(),
WarehouseId = stockInfo.WarehouseId,
PalletType = stockInfo.PalletType,
-
+ OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo
+
};
//绌虹
if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
@@ -131,12 +144,24 @@
}
}
};
- _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(esstask));
+
var result = await _eSSApiService.CreateTaskAsync(esstask);
_logger.LogInformation("鍒涘缓浠诲姟杩斿洖: " + result);
if (result)
{
+ try
+ {
+ await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
+ {
+ slotCode = stationCode,
+ containerCode = palletCode
+ });
+ }
+ catch (Exception ex) {
+
+
+ }
return WebResponseContent.Instance.OK();
}
else
--
Gitblit v1.9.3