From a10c3ec2b42371be6d4cb08df7c627e4f900600a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 12 二月 2025 09:40:45 +0800
Subject: [PATCH] 任务添加工序标识
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 10 +++++-----
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs | 8 ++++++++
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 17 ++++++++++-------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs
index 4e7750a..53f69a9 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs
@@ -129,6 +129,14 @@
public string? ProductionLine { get; set; }
/// <summary>
+ /// 澶� 娉�: 褰撳墠宸ュ簭
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "ProcessCode", Length = 255, IsNullable = true)]
+ public string? ProcessCode { get; set; }
+
+
+ /// <summary>
/// 浠诲姟鎵ц鏄庣粏
/// </summary>
[SugarColumn(ColumnName = "浠诲姟鎵ц鏄庣粏")]
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 a001e83..6485266 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
@@ -761,7 +761,7 @@
{
NGStation = efg.Select(x => x.stationNGChildCode).ToList();
}
- content = await CreateNewTask(input, result.ProductionLine, NGStation, 2);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
@@ -798,7 +798,7 @@
{
// TODO 閫佽嚦鍖呰
List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- content = await CreateNewTask(input, result.ProductionLine, strings, 3);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
return content;
}
else
@@ -806,7 +806,7 @@
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// TODO 鍏ュ簱
- content = await CreateNewTask(input, result.ProductionLine, strings);
+ content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
if (content.Status)
await _boxingInfoRepository.AddDataNavAsync(boxing);
}
@@ -895,7 +895,7 @@
List<string> strings = stationManagers.Roadway.Split(',').ToList();
Console.WriteLine(strings.ToJsonString() + "b-----------------------");
//// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, result.ProductionLine, strings);
+ content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -952,6 +952,7 @@
CreateDate = DateTime.Now,
TaskId = 0,
ProductionLine = stock.ProductionLine,
+ ProcessCode = stock.ProcessCode,
};
var taskDTO = CreateTaskDTO(taskNew);
@@ -1125,7 +1126,7 @@
}
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- return await CreateNewTask(input, result.ProductionLine, strings, 1);
+ return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
}
catch (Exception)
{
@@ -1360,6 +1361,7 @@
CreateDate = DateTime.Now,
TaskId = 0,
ProductionLine = stockInfo.ProductionLine,
+ ProcessCode = stockInfo.ProcessCode,
};
}
@@ -2275,7 +2277,7 @@
/// <param name="process">宸烽亾</param>
/// <param name="flag">鏍囪瘑锛�0-鍏ュ簱锛�1-绌烘墭鐩樺叆搴擄紝2-NG鍏ュ簱锛�3-鍑哄簱锛�</param>
/// <returns></returns>
- private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, List<string> process = null, int flag = 0)
+ private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, string processCode, List<string> process = null, int flag = 0)
{
WebResponseContent content = new WebResponseContent();
@@ -2304,7 +2306,8 @@
TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam",
- ProductionLine = productionLine
+ ProductionLine = productionLine,
+ ProcessCode = processCode
};
// 灏濊瘯娣诲姞鏂颁换鍔�
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index 771d001..ee67f26 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -61,7 +61,7 @@
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// 鍏ュ簱閫佽嚦甯告俯3
- var resultContent = await CreateNewTask(input, input.ProductionLine, strings);
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode,strings);
if (resultContent.Status)
{
await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -75,14 +75,14 @@
{
// 閫佽嚦鍖呰
List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- return await CreateNewTask(input, input.ProductionLine, strings, 3);
+ return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);
}
else
{
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// 鍏ュ簱閫佽嚦甯告俯3
- var resultContent = await CreateNewTask(input, input.ProductionLine, strings);
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
if (resultContent.Status)
{
await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -138,7 +138,7 @@
}
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- var resultContent = await CreateNewTask(input, result.ProductionLine, strings);
+ var resultContent = await CreateNewTask(input, result.ProductionLine,boxing.ProcessCode, strings);
if (resultContent.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -200,7 +200,7 @@
// NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
//}
List<string> NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
- content = await CreateNewTask(input, input.ProductionLine, NGStation, 2);
+ content = await CreateNewTask(input, input.ProductionLine,"", NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
--
Gitblit v1.9.3