From 7dd4ffa405be3d4aaf23b328b5db2b9d485a17d1 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 30 一月 2026 09:00:58 +0800
Subject: [PATCH] 添加移库接口 修改自动下发任务 添加条码入库申请
---
src/main/java/com/zy/asrs/entity/param/CompleteParam.java | 3 +
src/main/java/com/zy/api/controller/WcsApiController.java | 24 ++++++++++++
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 12 ++++++
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 20 +++++-----
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 1
src/main/java/com/zy/api/service/WcsApiService.java | 9 ++++
src/main/java/com/zy/asrs/service/MobileService.java | 8 ++++
8 files changed, 82 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/WcsApiController.java b/src/main/java/com/zy/api/controller/WcsApiController.java
index fd804c6..5a8d2a7 100644
--- a/src/main/java/com/zy/api/controller/WcsApiController.java
+++ b/src/main/java/com/zy/api/controller/WcsApiController.java
@@ -6,6 +6,8 @@
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
+import com.zy.asrs.entity.param.CompleteParam;
+import com.zy.asrs.service.MobileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@
@Autowired
private WcsApiService wcsApiService;
+ @Autowired
+ private MobileService mobileService;
/**
@@ -68,6 +72,26 @@
return wcsApiService.pubWrkToWcs(params);
}
+
+ @ManagerAuth(memo = "鏉＄爜绔欏叆搴撶敵璇�")
+ @RequestMapping("/cache/comb/pub")
+ public R cacheCombPub(@RequestBody CompleteParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ return wcsApiService.combInPub(combParam, 10031L);
+ }
+
+ @ManagerAuth(memo = "绉诲簱浠诲姟")
+ @RequestMapping("/task/move")
+ public R taskMove(@RequestBody CompleteParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ return mobileService.taskMove(combParam, 10031L);
+ }
+
+
@ManagerAuth
@ApiOperation("璁惧鎵ц鐘舵�佸洖鍐�")
@PostMapping("/openapi/report")
diff --git a/src/main/java/com/zy/api/service/WcsApiService.java b/src/main/java/com/zy/api/service/WcsApiService.java
index 30c842c..e44b2ec 100644
--- a/src/main/java/com/zy/api/service/WcsApiService.java
+++ b/src/main/java/com/zy/api/service/WcsApiService.java
@@ -3,6 +3,7 @@
import com.core.common.R;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
+import com.zy.asrs.entity.param.CompleteParam;
import java.util.Map;
import java.util.Set;
@@ -68,4 +69,12 @@
* @return
*/
R getStations(Map<String, String> params);
+
+ /**
+ * 鏉＄爜绔欐壂鐮佸叆搴撶敵璇�
+ * @param combParam
+ * @param l
+ * @return
+ */
+ R combInPub(CompleteParam combParam, long l);
}
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 994112b..6c976ca 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.api.entity.dto.LocMastDto;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CompleteParam;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
@@ -230,4 +231,15 @@
public R getStations(Map<String, String> params) {
return null;
}
+
+ /**
+ * 鏉＄爜绔欏叆搴撶敵璇�
+ * @param combParam
+ * @param l
+ * @return
+ */
+ @Override
+ public R combInPub(CompleteParam combParam, long l) {
+ return null;
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ae128b7..61011cb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -363,7 +363,6 @@
if (Objects.isNull(callAgvBackParam.getOrgSite())) {
return R.error("鍙傛暟涓嶈兘涓虹┖!!");
}
-
return mobileService.agvCallback(callAgvBackParam, getUserId());
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CompleteParam.java b/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
index b98f007..dbe4cc6 100644
--- a/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CompleteParam.java
@@ -16,6 +16,9 @@
//绔欓粸
private String sourceStaNo;
+ //婧愬簱浣�
+ private String sourceLocSta;
+
//鍙敤鎺�
private List<Integer> rowList;
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 6cb47c8..8ec6f81 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -168,4 +168,12 @@
* @return com.core.common.R
*/
R agvCallback(AgvCallParams callAgvBackParam, Long userId);
+
+ /**
+ * 绉诲簱浠诲姟鐢宠
+ * @param combParam
+ * @param l
+ * @return
+ */
+ R taskMove(CompleteParam combParam, long l);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f8d4fbf..21e625e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -2579,6 +2579,22 @@
}
/**
+ * 绉诲簱浠诲姟鐢宠
+ * @param combParam
+ * @param userId
+ * @return
+ */
+ @Override
+ public R taskMove(CompleteParam combParam, long userId) {
+// /openapi/createLocMoveTask
+
+
+
+
+ return null;
+ }
+
+ /**
* 鎸変紭鍏堢骇鏌ユ壘鍙敤搴撲綅
* 椤哄簭锛氬叆搴撶紦瀛樺尯 -> SO鍖� -> EO鍖�
*/
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 33112bc..b5b1f15 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -77,34 +77,34 @@
/**
- * 浠诲姟鑷姩涓嬪彂
+ * 浠诲姟鑷姩涓嬪彂鍑哄簱浠诲姟
*
* @author Ryan
* @date 2026/1/10 14:42
*/
@Scheduled(cron = "0/15 * * * * ? ")
private void autoPubTasks() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(11L)));
if (wrkMasts.isEmpty()) {
return;
}
Collections.shuffle(wrkMasts);
wrkMasts.forEach(wrkMast -> {
WorkTaskParams params = new WorkTaskParams();
- if (wrkMast.getIoType().equals(1)) {
- params.setType("in");
- params.setTaskNo(wrkMast.getWrkNo() + "")
- .setLocNo(wrkMast.getLocNo())
- .setBarcode(wrkMast.getBarcode())
- .setTaskPri(wrkMast.getIoPri().intValue());
- } else {
+// if (wrkMast.getIoType().equals(1)) {
+// params.setType("in");
+// params.setTaskNo(wrkMast.getWrkNo() + "")
+// .setLocNo(wrkMast.getLocNo())
+// .setBarcode(wrkMast.getBarcode())
+// .setTaskPri(wrkMast.getIoPri().intValue());
+// } else {
params.setType("out")
.setTaskNo(wrkMast.getWrkNo() + "")
.setLocNo(wrkMast.getLocNo())
.setStaNo(wrkMast.getStaNo())
.setTaskPri(wrkMast.getIoPri().intValue());
wcsApiService.pubWrkToWcs(params);
- }
+// }
});
}
--
Gitblit v1.9.1