From 830b5f394b6f5c41d259be38272d578467b53cf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 18:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/service/AgvWorkService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 6946beb..430bbc3 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -22,6 +22,11 @@
void stockOutWrkMast(List<TaskDto> agvTaskDtos, Long userId);
/*
+ 鐢熸垚鍑哄簱浠诲姟
+ */
+ void processOut(List<TaskDto> agvTaskDtos, Long userId);
+
+ /*
鐢熸垚鎷ｆ枡鍏ュ簱浠诲姟
*/
void pickIn(List<AgvWrkMast> agvWrkMastList);
@@ -39,7 +44,12 @@
/*
绌烘澘鍏ュ簱
*/
- String emptyPlateIn(String station,String containerCode,Short containerType, Long userId);
+ String emptyPlateIn(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
+
+ String emptyPlateInV2(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory);
+
+ String emptyPlateInV3(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
+
void emptyPlateOut(String station, int containerType, Long userId);
@@ -56,6 +66,11 @@
/**
* 鎵嬪姩鍙栨秷宸ヤ綔妗�
*/
- void cancelWrkMast(String workNo, Long userId);
+ void cancelWrkMast(String workNo, Long userId, Integer type);
+
+ /**
+ * 鍒囨崲璋冩嫧绫诲瀷
+ */
+ void changeType(String workNo, Long userId);
}
--
Gitblit v1.9.1