From ad18b0c17b5b1f715c33cb2a2b39589c10434a00 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 09 十一月 2024 13:24:48 +0800
Subject: [PATCH] 11.09-1申请巷道与申请货位拆分
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index cd77752..5367dc9 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -401,7 +401,7 @@
#region 璇锋眰浠诲姟鍏ュ簱
/// <summary>
- /// 璇锋眰浠诲姟
+ /// 璇锋眰浠诲姟宸烽亾
/// </summary>
/// <param name="input">璇锋眰妯″瀷</param>
/// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
@@ -416,7 +416,7 @@
var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
if (task != null)
{
- if (task.TaskState == (int)TaskInStatusEnum.InNew)
+ //if (task.TaskState == (int)TaskInStatusEnum.InNew)
{
// 鍒涘缓WMS浠诲姟
WMSTaskDTO taskDTO = new WMSTaskDTO()
@@ -433,8 +433,6 @@
};
return content.OK(data: taskDTO);
}
- content = await UpdateExistingTask(input, task);
- return content;
}
// 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
@@ -465,8 +463,8 @@
// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
var processResponse = await GetProcessResponseAsync(process, input.Position);
- // 濡傛灉task涓嶄负null锛屽垯璋冪敤UpdateExistingTask鏂规硶锛屾洿鏂颁换鍔★紱鍚﹀垯璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(input, processResponse);
+ // 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
+ content = await CreateNewTask(input, processResponse);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -483,6 +481,35 @@
return content;
}
+ /// <summary>
+ /// 鏇存柊浠诲姟璐т綅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task == null)
+ return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
+
+ return content = await UpdateExistingTask(input, task);
+
+ }
+ catch (Exception err)
+ {
+
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 绌烘墭鐩樺叆搴撶敵璇�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> RequestTrayInTaskAsync(RequestTaskDto input)
{
WebResponseContent content = new WebResponseContent();
@@ -718,6 +745,12 @@
#region 浠诲姟鐘舵�佹洿鏀�
+ /// <summary>
+ /// 鏇存柊浠诲姟鐘舵��&鍑哄簱瑙ｇ洏
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="taskState"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
{
WebResponseContent content = new WebResponseContent();
@@ -726,12 +759,57 @@
var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- task.TaskState = taskState;
- var asb = await BaseDal.UpdateDataAsync(task);
- if (asb)
+
+ if (taskState == (int)TaskOutStatusEnum.Line_OutFinish)
+ {
+ var taskHty = CreateHistoricalTask(task);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
+ var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+ if (asb && asbHty)
+ content.OK();
+ else
+ throw new Exception();
+ });
content.OK();
+ }
else
- content.Error();
+ {
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
+ content.OK();
+ else
+ content.Error();
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ #endregion
+
+ #region 鍑哄簱瑙ｇ洏
+
+ /// <summary>
+ /// 鍑哄簱瑙ｇ洏鎺ュ彛
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
+ if (task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ var taskHty = CreateHistoricalTask(task);
}
catch (Exception ex)
{
--
Gitblit v1.9.3