From 2c945116a7d4dccac387930e40980ae1ba32f05c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 16:18:58 +0800
Subject: [PATCH] 物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 9161d1d..69e0bb0 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,11 +2,9 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.AgvBasDevpService;
-import com.zy.asrs.service.AgvMobileService;
-import com.zy.asrs.service.AgvWorkService;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -33,6 +32,8 @@
private AgvBasDevpService agvBasDevpService;
@Autowired
private AgvWorkService workService;
+ @Autowired
+ private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
@@ -53,7 +54,8 @@
public R combBinding(@RequestBody Map<String,Object> map){
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- agvMobileService.combBinding(barcode,stationCode);
+ Short containerType = Short.valueOf(map.get("containerType").toString());
+ agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -94,5 +96,46 @@
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
+ /*
+ 鍏ュ簱
+ */
+ @PostMapping("/pakin/empty/auth")
+ @Synchronized
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params){
+
+ for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
+
+ /*
+ 绌烘澘鍑哄簱
+ */
+ @PostMapping("/pakout/empty/auth")
+ @Synchronized
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
+
+ for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
+
+ /*
+ 绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+ */
+ @PostMapping("/pakout/empty/container/selector/auth")
+ public R containerType(@RequestBody HashMap<String,String> params){
+
+ String devNo = params.get("devNo");
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+
+ return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
+
+ }
}
--
Gitblit v1.9.1