From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 168 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 78 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
index d7aff8b..de91dfc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -29,7 +29,6 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoRepository;
@@ -56,21 +55,7 @@
/// <param name="agvDescription"></param>
/// <returns></returns>
WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
-
- /// <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>
/// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
/// </summary>
@@ -78,6 +63,27 @@
/// <param name="palletCode"></param>
/// <returns></returns>
WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
+
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode);
+
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent YLPurchaseBoxing(string palletCode);
+
+ /// <summary>
+ /// 鍒嗛厤鍘熸枡宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ string AssignYLRoadwayNo(string palletCode);
+
+
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
/// </summary>
@@ -103,28 +109,6 @@
Task<WebResponseContent> TaskCompleted(int taskNum);
/// <summary>
- /// 娴嬭瘯鏋跺嚭浠�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent TestToolOut(TestToolOutModel model);
-
- /// <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>
@@ -133,32 +117,11 @@
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 SubstrateBack(SubstrateBackModel model);
/// <summary>
///
@@ -190,25 +153,7 @@
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
-
- /// <summary>
- /// PP浠揳gv鎼繍浠诲姟
- /// </summary>
- /// <param name="task"></param>
- /// <returns></returns>
- WebResponseContent AGVTasks(SaveModel saveModel);
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
- /// <summary>
- /// 鎴愬搧浣欐枡閫�搴撳叆浠�
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- WebResponseContent BackProductTask(string barCode, string startPoint);
+
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
/// </summary>
@@ -216,5 +161,72 @@
/// <param name="startPoint"></param>
/// <returns></returns>
WebResponseContent EmptyBackTask(string barCode, string startPoint);
+
+ /// <summary>
+ /// 杈呮枡鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount);
+
+ /// <summary>
+ /// 鎴愬搧鍑哄簱
+ /// </summary>
+ /// <param name="Count"></param>
+ /// <returns></returns>
+ WebResponseContent RequestCPWMSTaskOut(int Count);
+
+ /// <summary>
+ /// 鏃犵汉甯冨嚭搴�
+ /// </summary>
+ /// <param name="Count"></param>
+ /// <returns></returns>
+ WebResponseContent RequestWFBWMSTaskOut(int Count);
+
+ /// <summary>
+ /// 鍘熸枡鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
+ /// <param name="materielWide">鐗╂枡骞呭</param>
+ /// <param name="Count">鍗锋暟</param>
+ /// <returns></returns>
+ WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count, string address = "");
+
+ /// <summary>
+ /// 鍘熸枡绉诲簱
+ /// </summary>
+ /// <param name="startAddress"></param>
+ /// <param name="endAddress"></param>
+ /// <param name="roadWay"></param>
+ /// <returns></returns>
+ WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay);
+ /// <summary>
+ /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
+ /// </summary>
+ WebResponseContent RelocationRoadWay(string roadWay,int Count);
+
+ /// <summary>
+ /// 鍒嗛厤宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ string AssignCPRoadwayNo();
+ /// <summary>
+ /// 鍗板埛浣欐枡閫�鏂欎换鍔�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent PrintBackInbound(SaveModel saveModel);
+
+ /// <summary>
+ /// 鍗板埛涓嬫枡浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent PrintInbound(SaveModel saveModel);
+ /// <summary>
+ /// 鍒涘缓鍘熺焊鐢熶骇鎺掔▼鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ WebResponseContent CreateBSTOutboundTasks(int[] keys);
}
}
--
Gitblit v1.9.3