From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 255 insertions(+), 6 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 ffe18b8..bbc83dc 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"
@@ -15,6 +15,7 @@
*----------------------------------------------------------------*/
#endregion << 鐗� 鏈� 娉� 閲� >>
+using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -30,6 +31,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,9 +41,21 @@
{
ITaskRepository Repository { get; }
- WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="tasks"></param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "", string agvtaskNum = "");
- WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -52,12 +66,23 @@
//WebResponseContent RequestInboundTask(string palletCode, string stationCode);
WebResponseContent RequestInboundTask(SaveModel saveModel);
/// <summary>
+ /// 鏌ヨ璐ㄦ鏁伴噺
+ /// </summary>
+ WebResponseContent InQualityConfirm(string palletCode);
+ /// <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鐢宠鍏ュ簱
@@ -66,7 +91,25 @@
/// <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鏍规嵁璺敱纭畾涓嬩竴鍦板潃
+ /// </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>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
@@ -77,7 +120,23 @@
/// <returns></returns>
WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
- WebResponseContent TaskCompleted(int taskNum);
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="heightType"></param>
+ /// <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>
+ Task<WebResponseContent> TaskCompleted(int taskNum);
/// <summary>
///
@@ -92,6 +151,10 @@
/// <returns></returns>
MesResponseContent TestToolOut(TestToolOutModel model);
+ //闃茬剨鍒扮嚎杈�
+ MesResponseContent SolderMaskOut(SolderMaskOut model);
+ //闃茬剨娲惧伐
+ MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model);
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
/// </summary>
@@ -105,7 +168,7 @@
/// </summary>
/// <param name="keys"></param>
/// <returns></returns>
- WebResponseContent GenerateOutboundTask(int[] keys);
+ WebResponseContent GenerateOutboundTasks(int[] keys);
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
@@ -121,20 +184,206 @@
/// <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);
- WebResponseContent OutEmpty(int qty, string address, int WarehouseId);
+ WebResponseContent TakeOutbound(List<StockViewDTO> stockViews);
+
+ /// <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>
+ /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent PPSubsectionOut(PPSubsectionOutModel model);
+
+ /// <summary>
+ /// PP灏忓嵎鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent PPCutOut(PPCutOutModle model);
+
+ /// <summary>
+ /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent PPBack(PPBackModel model);
+ /// <summary>
+ /// PP搴撳瓨鏌ヨ
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent QueryPpByWidth(QueryPpByWidthModel model);
+
+ /// <summary>
+ /// 鎴愬搧杩斿伐鎻愬簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ MesResponseContent RworkTask(RworkTaskModel 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, int heightType);
+
+ /// <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);
+
+ /// <summary>
+ /// PP浠揳gv鎼繍浠诲姟
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ WebResponseContent AGVTasks(SaveModel saveModel);
+
+
+ WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
+ /// <summary>
+ /// MES鎴愬搧鍐呭寘淇℃伅鎺ユ敹
+ /// </summary>
+ /// <returns></returns>
+ MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel);
+ /// <summary>
+ /// MES鎴愬搧澶栧寘淇℃伅鎺ユ敹
+ /// </summary>
+ /// <param name="boxInfoModel"></param>
+ /// <returns></returns>
+ MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel);
+ /// <summary>
+ /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
+ /// <summary>
+ /// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ WebResponseContent MESPPGenerateOutboundTasks(int[] keys);
+
+ /// <summary>
+ /// 鐢熸垚MESPP灏忓嵎鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ //WebResponseContent PPCutOutGenerateOutboundTasks(int[] keys);
+
+ WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
+
+ WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
+ /// <summary>
+ /// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
+ /// <param name="StationCode">绔欏彴鍦板潃</param>
+ /// <returns></returns>
+ Task<WebResponseContent> OutProductTask(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);
}
}
--
Gitblit v1.9.3