From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 110 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 43 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 238ea19..4da871c 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"
@@ -66,10 +66,17 @@
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>
/// 鍒嗛厤鍘熸枡宸烽亾
@@ -86,17 +93,9 @@
/// <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>
@@ -115,31 +114,7 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- WebResponseContent Outbound(int id);
-
- /// <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="taskNum"></param>
- /// <param name="roadwayNos"></param>
- /// <returns></returns>
- WebResponseContent AssignRoadway(int taskNum, List<string> roadwayNos, int heightType);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="roadwayNos"></param>
- /// <returns></returns>
- WebResponseContent SingleAssignRoadway(List<string> roadwayNos);
+ WebResponseContent Outbound(List<int> ids);
/// <summary>
/// 淇敼浠诲姟鐘舵��
@@ -147,11 +122,6 @@
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
@@ -162,11 +132,24 @@
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);
+ WebResponseContent RequestCPWMSTaskOut(string materialCode, int Count,int targetId);
+
+ ///// <summary>
+ ///// 鏃犵汉甯冨嚭搴�
+ ///// </summary>
+ ///// <param name="Count"></param>
+ ///// <returns></returns>
+ //WebResponseContent RequestWFBWMSTaskOut(int Count);
+
/// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
/// </summary>
@@ -174,8 +157,49 @@
/// <param name="materielWide">鐗╂枡骞呭</param>
/// <param name="Count">鍗锋暟</param>
/// <returns></returns>
- WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count);
+ 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);
+ /// <summary>
+ /// MES鑷姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveAutoIssue(MESAutoIssueDTO autoIssueDTO);
}
}
--
Gitblit v1.9.3