From d9fd877179522eac8ebb34da661d1f1efd8ef9b6 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:38:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12 ++++
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 67 +++++++++++-----------
src/main/java/com/zy/asrs/entity/param/AgvCallParams.java | 3 +
src/main/java/com/zy/asrs/controller/MobileController.java | 26 ++++++++
src/main/java/com/zy/asrs/service/MobileService.java | 14 ++++
5 files changed, 89 insertions(+), 33 deletions(-)
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 91389f9..0142a1e 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -193,40 +193,41 @@
mast.setWrkSts(4L);
} else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
//TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
- if (mast.getWrkSts() != 14) {
+// if (mast.getWrkSts() != 14) {
//TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
- if (mast.getIoType() == 103) {
- List<WrkDetl> wrkDetls103 = wrkDetlService
- .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
- if (wrkDetls103.isEmpty()) {
- throw new CoolException("鎷ｆ枡鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
- }
- for (WrkDetl wrkDetl : wrkDetls103) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- if (orderDetlPakout == null) {
- orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
- }
- if (!Cools.isEmpty(orderDetlPakout)) {
- if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
- wrkDetl.getAnfme())) {
- throw new CoolException("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
- }
- }
- }
- }
- mast.setWrkSts(14L);
- }
+// if (mast.getIoType() == 103) {
+// List<WrkDetl> wrkDetls103 = wrkDetlService
+// .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
+// if (wrkDetls103.isEmpty()) {
+// throw new CoolException("鎷ｆ枡鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
+// }
+// for (WrkDetl wrkDetl : wrkDetls103) {
+// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+// OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+// if (orderDetlPakout == null) {
+// orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+// }
+// if (!Cools.isEmpty(orderDetlPakout)) {
+// if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
+// wrkDetl.getMatnr(),
+// orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+// wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+// wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+// wrkDetl.getAnfme())) {
+// throw new CoolException("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + mast.getWrkNo());
+// }
+// }
+// }
+// }
+// mast.setWrkSts(14L);
+// }
+ mast.setWrkSts(14L);
}
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2e24c37..f414275 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -361,6 +361,32 @@
}
/**
+ *
+ * 鑾峰彇鎹嗗寘鍑哄簱鏄庣粏
+ * @param params
+ * @return
+ */
+ @ManagerAuth(memo = "鑾峰彇鎹嗗寘鏄庣粏淇℃伅")
+ @RequestMapping("/agv/bind/info")
+ public R getAllBind(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ return mobileService.getAllBindInfo(params);
+ }
+
+ @ApiOperation("纭鎹嗗寘鍑哄簱")
+ @ManagerAuth(memo = "纭鎹嗗寘鍑哄簱")
+ @RequestMapping("/agv/out/confirm")
+ public R confirmOutStock(@RequestBody CombParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+
+ return mobileService.confirmOutstock(combParam);
+ }
+
+ /**
* @author Ryan
* @date 2025/9/24
* @description: 鍛煎彨AGV杩斿洖
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 4354bce..948ee02 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -13,6 +13,8 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -250,6 +252,16 @@
}
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+
public String getTag$() {
MatService service = SpringUtils.getBean(MatService.class);
Mat order = service.selectOne(new EntityWrapper<Mat>()
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
index dd50be1..a50ab2b 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
@@ -36,4 +36,7 @@
@ApiModelProperty("鏄惁鏂板彴杞﹀叆搴�")
private List<Integer> isNewIn;
+ @ApiModelProperty("浠诲姟绫诲瀷")
+ private String taskType;
+
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index f6eed1b..6d6f69d 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -192,4 +192,18 @@
* @return
*/
R getCacheSites(String type);
+
+ /**
+ * 鑾峰彇鍙拌溅鎹嗗寘鏄庣粏
+ * @param params
+ * @return
+ */
+ R getAllBindInfo(AgvCallParams params);
+
+ /**
+ * 纭鎹嗗寘鍑哄簱
+ * @param combParam
+ * @return
+ */
+ R confirmOutstock(CombParam combParam);
}
--
Gitblit v1.9.1