From 9d75314e88f8aac494d57715e3231fe3540cb867 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:03 +0800
Subject: [PATCH] 优化更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 18a1993..c2eef48 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"
@@ -28,6 +28,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
@@ -47,7 +48,7 @@
/// <param name="tasks"></param>
/// <param name="agvDescription"></param>
/// <returns></returns>
- WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "", string agvtaskNum = "");
/// <summary>
///
@@ -55,7 +56,7 @@
/// <param name="taskNum"></param>
/// <param name="agvDescription"></param>
/// <returns></returns>
- WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
+ WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -65,6 +66,10 @@
/// <returns></returns>
//WebResponseContent RequestInboundTask(string palletCode, string stationCode);
WebResponseContent RequestInboundTask(SaveModel saveModel);
+ /// <summary>
+ /// 鏌ヨ璐ㄦ鏁伴噺
+ /// </summary>
+ WebResponseContent InQualityConfirm(string palletCode);
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -87,7 +92,7 @@
/// <param name="roadwayNo"></param>
/// <param name="palletCode"></param>
/// <returns></returns>
- WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode);
+ WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "");
/// <summary>
/// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
@@ -125,12 +130,14 @@
/// <returns></returns>
WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType);
+ WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot);
+
/// <summary>
///
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- WebResponseContent TaskCompleted(int taskNum);
+ Task<WebResponseContent> TaskCompleted(int taskNum);
/// <summary>
///
@@ -145,6 +152,10 @@
/// <returns></returns>
MesResponseContent TestToolOut(TestToolOutModel model);
+ //闃茬剨鍒扮嚎杈�
+ MesResponseContent SolderMaskOut(SolderMaskOut model);
+ //闃茬剨娲惧伐
+ MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model);
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
/// </summary>
@@ -189,6 +200,12 @@
/// <param name="locationCode"></param>
/// <returns></returns>
WebResponseContent IsRelocation(int taskNum, string locationCode);
+ /// <summary>
+ /// 鎵嬪姩绉诲簱
+ /// </summary>
+ /// <param name="relocationDTO"></param>
+ /// <returns></returns>
+ WebResponseContent ManualRelocation(RelocationDTO relocationDTO);
/// <summary>
///
@@ -203,6 +220,7 @@
/// <param name="id"></param>
/// <returns></returns>
WebResponseContent Outbound(int id);
+ WebResponseContent TakeOutbound(List<StockViewDTO> stockViews);
/// <summary>
/// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
@@ -332,6 +350,11 @@
/// <returns></returns>
WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
/// <summary>
+ /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES澶栧寘瑁呮満
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ShipmentOrderMESSync(MesShipmentOrderSync model);
+ /// <summary>
/// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
/// </summary>
/// <param name="keys"></param>
@@ -354,8 +377,33 @@
/// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
/// <param name="StationCode">绔欏彴鍦板潃</param>
/// <returns></returns>
- WebResponseContent OutProductTask(int[] keys, string StationCode);
- //搴撳瓨鏉垮嚭搴�
- WebResponseContent ProductOutBoundSync(MesProductOutBound model);
+ Task<WebResponseContent> OutProductTask(int[] keys, string StationCode, int Grade);
+ Task<WebResponseContent> OutProScrapTask(int[] keys, string StationCode, int Grade);
+ /// <summary>
+ /// 鎴愬搧浣欐枡閫�搴撳叆浠�
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ WebResponseContent BackProductTask(string barCode, string startPoint);
+ /// <summary>
+ /// 鎴愬搧绌烘鍥炲簱
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ WebResponseContent EmptyBackTask(string barCode, string startPoint);
+ /// <summary>
+ /// 浜哄伐閫夋嫨搴撳瓨
+ /// </summary>
+ WebResponseContent OutProductSelect(int orderDetailId, List<ProStockViewDTO> proStockViews);
+ WebResponseContent GetZHMesMaterialLot(string materialLot);
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="warehouseId"></param>
+ /// <returns></returns>
+ public Task<WebResponseContent> TaskHandCancel(int taskNum, int warehouseId);
}
}
--
Gitblit v1.9.3