From 801d18d505ed7b979c2cac3872daa6b78724c504 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 26 三月 2024 14:57:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java | 23 +++++++++++++++--------
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 12 ++++++------
src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java | 2 +-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 +++-
4 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 6987853..8143d47 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -100,10 +100,10 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
- public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params){
- for (AgvMobileStartParam param : params){
- workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),param.getContainerType(), getUserId());
+ for (AgvMobileStartParam.Pad pad : params.getPad()) {
+ workService.emptyPlateIn(pad.getDevNo(),pad.getContainerCode(),pad.getContainerType(), getUserId());
}
return R.ok();
@@ -114,10 +114,10 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
- public R pakoutEmpty(@RequestBody List<AgvMobileStartParam> params){
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
- for (AgvMobileStartParam param : params){
- workService.emptyPlateOut(param.getDevNo(),param.getContainerType(), getUserId());
+ for (AgvMobileStartParam.Pad pad : params.getPad()) {
+ workService.emptyPlateOut(pad.getDevNo(),pad.getContainerType(), getUserId());
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
index 9766b0e..45135d8 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
@@ -2,15 +2,22 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class AgvMobileStartParam {
- //绔欑偣
- private String devNo;
- //浠诲姟绫诲瀷
- private int type;
- //瀹瑰櫒鐮�
- private String containerCode;
- //瀹瑰櫒绫诲瀷
- private int containerType;
+ private List<Pad> pad;
+
+ @Data
+ public static class Pad {
+ //绔欑偣
+ private String devNo;
+ //浠诲姟绫诲瀷
+ private int type;
+ //瀹瑰櫒鐮�
+ private String containerCode;
+ //瀹瑰櫒绫诲瀷
+ private int containerType;
+ }
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
index aaf3408..273bd0b 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinMapper.java
@@ -11,7 +11,7 @@
@Repository
public interface AgvWaitPakinMapper extends BaseMapper<AgvWaitPakin> {
- @Update("UPDATE agv_cust_wait_pakin SET io_status = ${ioStatus} WHERE supp_code = '${containerCode}'")
+ @Update("UPDATE agv_cust_wait_pakin SET io_status = '${ioStatus}' WHERE supp_code = '${containerCode}'")
int updateIoStatus(@Param("containerCode")String containerCode, @Param("ioStatus")String ioStatus);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 2437e26..9d20ed1 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -378,7 +378,9 @@
//瀵绘壘鐩稿簲绫诲瀷鐨勭┖鎵樼洏
AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType);
-
+ if (Cools.isEmpty(agvLocMast)) {
+ throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖鎵樼洏锛�");
+ }
//鐢熸垚宸ヤ綔妗�
createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,false);
--
Gitblit v1.9.1