From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 c14fa72..9488d88 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"
@@ -47,7 +47,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 +55,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 +65,10 @@
/// <returns></returns>
//WebResponseContent RequestInboundTask(string palletCode, string stationCode);
WebResponseContent RequestInboundTask(SaveModel saveModel);
+ /// <summary>
+ /// 鏌ヨ璐ㄦ鏁伴噺
+ /// </summary>
+ WebResponseContent InQualityConfirm(string palletCode);
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -147,6 +151,10 @@
/// <returns></returns>
MesResponseContent TestToolOut(TestToolOutModel model);
+ //闃茬剨鍒扮嚎杈�
+ MesResponseContent SolderMaskOut(SolderMaskOut model);
+ //闃茬剨娲惧伐
+ MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model);
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
/// </summary>
@@ -205,6 +213,7 @@
/// <param name="id"></param>
/// <returns></returns>
WebResponseContent Outbound(int id);
+ WebResponseContent TakeOutbound(List<StockViewDTO> stockViews);
/// <summary>
/// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
@@ -334,6 +343,11 @@
/// <returns></returns>
WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
/// <summary>
+ /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES澶栧寘瑁呮満
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ShipmentOrderMESSync(MesShipmentOrderSync model);
+ /// <summary>
/// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
/// </summary>
/// <param name="keys"></param>
--
Gitblit v1.9.3