From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 184 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 182 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index 7d2eb1b..67606c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -30,6 +30,7 @@
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;
@@ -39,7 +40,21 @@
{
ITaskRepository Repository { get; }
- WebResponseContent PushTasksToWCS();
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="tasks"></param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -49,6 +64,47 @@
/// <returns></returns>
//WebResponseContent RequestInboundTask(string palletCode, string stationCode);
WebResponseContent RequestInboundTask(SaveModel saveModel);
+ /// <summary>
+ /// 绌虹鍏ュ簱
+ /// </summary>
+ /// <param name="barcode"></param>
+ /// <param name="address"></param>
+ /// <returns></returns>
+ WebResponseContent InEmpty(string barcode, string address, int WarehouseId);
+ /// <summary>
+ /// 绌虹鍑哄簱
+ /// </summary>
+ /// <param name="qty">鏁伴噺</param>
+ /// <param name="address">鍦板潃</param>
+ /// <returns></returns>
+ WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode);
+
+ /// <summary>
+ /// WCS鐢宠鍏ュ簱
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode);
+
+ /// <summary>
+ /// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="roadwayNos"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, List<string> roadwayNos, int heightType);
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
@@ -58,6 +114,22 @@
/// <param name="palletType">鎵樼洏绫诲瀷</param>
/// <returns></returns>
WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ WebResponseContent TaskCompleted(int taskNum);
/// <summary>
///
@@ -85,7 +157,7 @@
/// </summary>
/// <param name="keys"></param>
/// <returns></returns>
- WebResponseContent GenerateOutboundTask(int[] keys);
+ WebResponseContent GenerateOutboundTasks(int[] keys);
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
@@ -93,5 +165,113 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
WebResponseContent OutboundTaskCompleted(int taskNum);
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="locationCode">鍏ュ簱鎴栧嚭搴撶殑璐т綅鍙�</param>
+ /// <returns></returns>
+ MesResponseContent TestToolBack(TestToolBackModel backModel);
+
+ /// <summary>
+ /// 娴嬭瘯鏋舵姤搴�
+ /// </summary>
+ /// <param name="toolScrap"></param>
+ /// <returns></returns>
+ MesResponseContent TestScrap(TestToolScrap toolScraps);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="locationCode"></param>
+ /// <returns></returns>
+ WebResponseContent IsRelocation(int taskNum, string locationCode);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="toolSynInfo"></param>
+ /// <returns></returns>
+ WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo);
+
+ /// <summary>
+ /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ WebResponseContent Outbound(int id);
+
+ /// <summary>
+ /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ WebResponseContent UploadMesMaterialLotaAcept(MesMaterialLotaAceptModel model);
+
+ /// <summary>
+ /// 鍩烘澘鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent SubstrateOut(SubstrateOutModel model);
+
+ /// <summary>
+ /// 鍩烘澘浣欐枡閫�搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent SubstrateBack(SubstrateBackModel model);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <param name="taskNum"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent AssignRoadwayByHeight(List<string> roadwayNos, int taskNum, int heightType = 0);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent AssignRoadwayByHeightAndCode(List<string> roadwayNos, string palletCode, int heightType = 0);
+
+ /// <summary>
+ /// 鍒嗛厤宸烽亾
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNos"></param>
+ /// <returns></returns>
+ WebResponseContent AssignRoadway(int taskNum, List<string> roadwayNos);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <returns></returns>
+ WebResponseContent SingleAssignRoadway(List<string> roadwayNos);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <returns></returns>
+ WebResponseContent HandSubstrateOut(int orderId);
+
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵��
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
+
+
+ WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
}
}
--
Gitblit v1.9.3