From 011ca316e6ec2ed93e31c45a9ebd9d3c66664871 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 四月 2026 11:47:03 +0800
Subject: [PATCH] 代码更新
---
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 198 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 140 insertions(+), 58 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 856fcba..2e44e6b 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"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Asn1.X509;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -30,6 +31,7 @@
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
+using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoRepository;
@@ -63,19 +65,32 @@
/// <param name="stationCode"></param>
/// <param name="palletCode"></param>
/// <returns></returns>
- WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
+ WebResponseContent DeviceRequestInboundTaskSimple(string stationCode);
/// <summary>
- /// 鍏ュ簱浠诲姟璇锋眰
+ /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
/// </summary>
/// <returns></returns>
WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode);
/// <summary>
+ /// 鍘熸枡鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0,string stationCode = "");
+ /// <summary>
+ /// 鍘熸枡閲囪喘缁戝畾RFID
+ /// </summary>
+ /// <param name="palletCode">绾稿嵎鏉＄爜</param>
+ /// <returns></returns>
+ WebResponseContent PurchaseBoxing(string palletCode, int orderType = 0);
+
+ /// <summary>
/// 鍒嗛厤鍘熸枡宸烽亾
/// </summary>
/// <returns></returns>
- string AssignYLRoadwayNo(string palletCode);
+ string AssignYLRoadwayNo(string palletCode, int wide = 0, int thickness = 0, int weight = 0);
/// <summary>
@@ -86,17 +101,16 @@
/// <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>
- ///
+ /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ WebResponseContent AssignOutTargetAddress(int taskNum);
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
@@ -108,38 +122,14 @@
/// <param name="taskNum"></param>
/// <param name="locationCode"></param>
/// <returns></returns>
- WebResponseContent IsRelocation(int taskNum, string locationCode);
+ //WebResponseContent IsRelocation(int taskNum, string locationCode);
/// <summary>
/// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
/// </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,33 +137,39 @@
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
+
/// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
-
- /// <summary>
- /// 鎴愬搧绌烘鍥炲簱
+ /// 鎴愬搧绌烘墭鍥炲簱
/// </summary>
/// <param name="barCode"></param>
/// <param name="startPoint"></param>
/// <returns></returns>
- WebResponseContent EmptyBackTask(string barCode, string startPoint);
+ WebResponseContent EmptyBackTask(string barCode, string startPoint,int target);
+
+ /// <summary>
+ /// 杈呮枡/鎴愬搧涓存椂鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount,int oneCount);
+
+ /// <summary>
+ /// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent InboundOrderInTask(string bindCode, string barCode, string startPoint, int orderType = 0);
/// <summary>
/// 鎴愬搧鍑哄簱
/// </summary>
- /// <param name="Count"></param>
/// <returns></returns>
- WebResponseContent RequestCPWMSTaskOut(int Count);
+ WebResponseContent RequestCPWMSTaskOut(string materialCode, int Count,string targetId);
- /// <summary>
- /// 鏃犵汉甯冨嚭搴�
- /// </summary>
- /// <param name="Count"></param>
- /// <returns></returns>
- WebResponseContent RequestWFBWMSTaskOut(int Count);
+ ///// <summary>
+ ///// 鏃犵汉甯冨嚭搴�
+ ///// </summary>
+ ///// <param name="Count"></param>
+ ///// <returns></returns>
+ //WebResponseContent RequestWFBWMSTaskOut(int Count);
/// <summary>
/// 鍘熸枡鍑哄簱浠诲姟
@@ -182,16 +178,16 @@
/// <param name="materielWide">鐗╂枡骞呭</param>
/// <param name="Count">鍗锋暟</param>
/// <returns></returns>
- WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count, string address = "");
+ WebResponseContent RequestYLWMSTaskOut(YLWMSTaskOutDTO yLWMSTaskOutDTO);
/// <summary>
- /// 鍘熸枡绉诲簱
+ /// 绉诲簱
/// </summary>
/// <param name="startAddress"></param>
/// <param name="endAddress"></param>
/// <param name="roadWay"></param>
/// <returns></returns>
- WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay);
+ WebResponseContent IsRelocation(RelocationDTO relocationDTO);
/// <summary>
/// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
/// </summary>
@@ -208,12 +204,98 @@
/// <param name="saveModel"></param>
/// <returns></returns>
WebResponseContent PrintBackInbound(SaveModel saveModel);
-
+ /// <summary>
+ /// 鍗婃垚鍝佹垚鍝佷俊鎭�
+ /// </summary>
+ /// <param name="proInDTOs"></param>
+ /// <returns></returns>
+ WebResponseContent ReceiveProCodeInfo(List<MESProInDTO> proInDTOs);
/// <summary>
/// 鍗板埛涓嬫枡浠诲姟
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
WebResponseContent PrintInbound(SaveModel saveModel);
+ /// <summary>
+ /// 鍒涘缓鍘熺焊鐢熺鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ WebResponseContent CreateSGOutboundTasks(int[] keys);
+ /// <summary>
+ /// MES鎺掔▼璁″垝鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveOutBound(List<OutMESOrderDTO> outMESOrderDTOs);
+ /// <summary>
+ /// MES鑷姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveAutoIssue(MESAutoIssueDTO autoIssueDTO);
+ /// <summary>
+ /// MES鎵嬪姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveManualIssue(MESManualIssueDTO manualIssueDTO);
+ /// <summary>
+ /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveReturnIssue(List<MESReturnIssueDTO> returnIssueDTOs);
+ /// <summary>
+ /// 娣诲姞鐢熺
+ /// </summary>
+ /// <param name="outOrderDTOs"></param>
+ /// <returns></returns>
+ WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs);
+ /// <summary>
+ /// BST棰嗘枡淇℃伅鍚屾
+ /// </summary>
+ /// <param name="bSTPickInfoDTO"></param>
+ /// <returns></returns>
+ WebResponseContent ReceivePicking(List<BSTPickInfoDTO> bSTPickInfoDTOs);
+
+ /// <summary>
+ /// 鍒涘缓鐢熺鎵嬪姩鍑哄簱
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ WebResponseContent CreateSGManualTasks(List<int> ids);
+ /// <summary>
+ /// 鍒涘缓閿�鍞嚭搴�
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ WebResponseContent CreateProDeliveryTasks(List<int> ids);
+ /// <summary>
+ /// 绌烘墭鍙犵洏鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent PlateOutbound(string stationCode);
+ /// <summary>
+ /// 鍚敤绔欑偣
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent EnableStatus(int[] keys);
+ /// <summary>
+ /// 绂佺敤绔欑偣
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent DisableStatus(int[] keys);
+ /// <summary>
+ /// 鎴愬搧缁勭洏
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent BoxingInBound(string stationCode, List<string> barCodes);
+ /// <summary>
+ /// 鎴愬搧鍏ュ簱鎵爜璇锋眰鏇存柊鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent InBoundPalletCode(int taskNum, string barCode);
+ /// <summary>
+ /// 鍗婃垚鍝佹墭鐩樻惉杩愬叆搴�
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent SemiProIn(string barcode, string palletCode, string address);
}
}
--
Gitblit v1.9.3