From 01fa93b5dd9f20286ef8f22515caf55307f76a9d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs
---
src/main/java/com/zy/asrs/service/WorkService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 8d34c6e..c024dd5 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
@@ -40,7 +41,7 @@
*/
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
- void stockOut(BasDevp staNo, TaskDto taskDto, Long userId);
+ void stockOut(BasDevp staNo, TaskDto taskDto, String deviceNo, Long userId);
/**
* 绌烘澘鍏ュ簱
@@ -91,6 +92,15 @@
void pickWrkMast(String workNo, Long userId);
/**
+ * 绌烘澘鍥炲簱/浣欐枡鍥炲簱
+ * @author Ryan
+ * @date 2026/1/13 19:45
+ * @param workNo
+ * @param userId
+ */
+ R backLocOperation(String workNo, Long userId);
+
+ /**
* 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
*/
StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId);
@@ -102,4 +112,14 @@
void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
+ /**
+ * 淇敼浠诲姟妗ｇ┖浣欏洖搴�
+ *
+ * @param workNo
+ * @param userId
+ * @param type
+ * @author Ryan
+ * @date 2026/1/14 15:06
+ */
+ void updateWrkIsSuplus(String workNo, Long userId, Integer type);
}
--
Gitblit v1.9.1