From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 211 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 129 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 241d8cd..6f6c36f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -14,13 +14,12 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("/agv")
@@ -36,18 +35,22 @@
AgvWaitPakinService agvWaitPakinService;
@Autowired
AgvWorkService agvWorkService;
+ @Autowired
+ AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(agvBasDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -67,7 +70,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvBasDevp> wrapper = new EntityWrapper<AgvBasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != agvBasDevpService.selectOne(wrapper)){
+ if (null != agvBasDevpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -81,9 +84,9 @@
@RequestMapping(value = "/basDevp/update/auth")
@ManagerAuth(memo = "绔欑偣淇敼")
- public R update(AgvBasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
- return R.error();
+ public R update(AgvBasDevp basDevp) {
+ if (Cools.isEmpty(basDevp) || null == basDevp.getDevNo()) {
+ return R.error("鍙傛暟缂哄け");
}
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
@@ -93,12 +96,12 @@
@RequestMapping(value = "/basDevp/delete/auth")
@ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AgvBasDevp> list = JSONArray.parseArray(param, AgvBasDevp.class);
- if (Cools.isEmpty(list)){
- return R.error();
+ if (Cools.isEmpty(list)) {
+ return R.error("鍙傛暟缂哄け");
}
- for (AgvBasDevp entity : list){
+ for (AgvBasDevp entity : list) {
agvBasDevpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -106,23 +109,26 @@
@RequestMapping(value = "/basDevp/unbind/auth")
@ManagerAuth(memo = "绔欑偣瑙ｇ粦")
- public R unbind(@RequestParam String param){
- AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
-
+ public R unbind(@RequestParam String param) {
+ AgvBasDevp agvBasDevp = JSONArray.parseObject(param, AgvBasDevp.class);
+ if (agvBasDevp == null) {
+ return R.error("鍙傛暟缂哄け");
+ }
//鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
- if(!agvBasDevp.getLocSts().equals("F")){
+ if (!agvBasDevp.getLocSts().equals("F")) {
return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
}
agvBasDevp.setLocSts("O");
agvBasDevp.setBarcode("");
- agvBasDevpService.update(agvBasDevp,new EntityWrapper<AgvBasDevp>().eq("dev_no",agvBasDevp.getDevNo()));
+ agvBasDevp.setLocType2(null);
+ agvBasDevpService.update(agvBasDevp, new EntityWrapper<AgvBasDevp>().eq("dev_no", agvBasDevp.getDevNo()));
return R.ok();
}
@RequestMapping(value = "/basDevp/export/auth")
@ManagerAuth(memo = "绔欑偣瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
@@ -138,7 +144,7 @@
wrapper.like("dev_no", condition);
Page<AgvBasDevp> page = agvBasDevpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AgvBasDevp basDevp : page.getRecords()){
+ for (AgvBasDevp basDevp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basDevp.getDevNo());
map.put("value", basDevp.getDevNo());
@@ -158,41 +164,63 @@
return R.ok();
}
+ /*
+ 绔欑偣鏄庣粏
+ */
@RequestMapping(value = "/basDevp/detail/list/auth")
- public R basDevpDetailList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R basDevpDetailList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
String devNo = param.get("devNo").toString();
+ if (Cools.isEmpty(devNo) || !CodeDetectionUtil.carCodeDetection(devNo)) {
+ throw new CoolException(devNo + "灏忚溅鍦扮爜鏈夎锛岃姝ｇ‘鎵爜锛侊紒锛�");
+ }
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
+ if ("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())) {
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
Page<AgvWaitPakin> agvWaitPakinPage = agvWaitPakinService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWaitPakin>()
- .eq("zpallet", agvBasDevp.getBarcode()));
- if(agvWaitPakinPage.getRecords().size()>0){
+ .eq("supp_code", agvBasDevp.getBarcode()));
+ if (agvWaitPakinPage.getRecords().size() > 0) {
return R.ok(agvWaitPakinPage);
- }else {
+ } else {
//濡傛灉鍏ュ簱閫氭。鏄庣粏涓虹┖锛屽垯鍘诲伐浣滄。鎵炬槑缁�
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevp.getDevNo())
- .or().eq("source_loc_no",agvBasDevp.getDevNo()));
+ .or().eq("source_loc_no", agvBasDevp.getDevNo()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
+ .eq("supp_code", agvBasDevp.getBarcode()));
+ if (agvLocDetlPage.getRecords().size() > 0) {
+ return R.ok(agvLocDetlPage);
+ } else {
+ return R.error("褰撳墠璐ф灦鐮佸紓甯革紒");
+ }
+ }
Page<AgvWrkDetl> agvWrkDetlPage = agvWrkDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWrkDetl>()
.eq("wrk_no", agvWrkMast.getWrkNo()));
- if(agvWrkDetlPage.getRecords().size()>0){
+ if (agvWrkDetlPage.getRecords().size() > 0) {
return R.ok(agvWrkDetlPage);
}
}
}
- return R.error("鏁版嵁寮傚父");
+ return R.ok();
}
@RequestMapping(value = "/basDevp/visualized/list/auth")
- public R visualizedList(@RequestBody JSONObject param){
+ public R visualizedList(@RequestBody JSONObject param) {
String stationCode = param.get("stationCode").toString();
+ Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);
+
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDevp/visualized/list/auth/v2")
+ public R visualizedList(@RequestParam String stationCode) {
Map<String, Object> result = agvBasDevpService.getAgvBasDevpDtoByStationCode(stationCode);
@@ -200,67 +228,86 @@
}
/*
- 瀹瑰櫒绂诲満
+ 浠诲姟瀹屾垚
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
- public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
+ @ManagerAuth(memo = "纭鍑哄簱")
+ public R visualiZedContainerMoveOut(@RequestBody Map<String, Object> map) {
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
- if(agvWrkMast.getIoType() == 103){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�103.鎷ｆ枡鍏ュ簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- return agvWrkMast;
- }).collect(Collectors.toList());
-
- try {
- int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
- if(code == 0){
- //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
- agvWrkMastList.forEach(agvWrkMast -> {
- agvWrkMast.setWrkSts(207L);
- agvWrkMastService.updateById(agvWrkMast);
- });
- //淇敼绔欑偣鐘舵��
- devNos.forEach(devNo -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- agvBasDevp.setBarcode("");
- agvBasDevp.setLocSts("O");
- agvBasDevpService.updateById(agvBasDevp);
- });
- }
- } catch (IOException e) {
- e.printStackTrace();
- return R.error("瀹瑰櫒绂诲満澶辫触");
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
+ if (agvWrkMast == null) {
+ R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ if (agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110) {
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
- return R.ok("瀹瑰櫒绂诲満鎴愬姛");
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMast.setModiTime(new Date());
+ agvWrkMastService.updateById(agvWrkMast);
+
+ return R.ok("璐ф灦绂诲満鎴愬姛");
}
/*
- 鎷ｆ枡鍏ュ簱
- */
- @RequestMapping(value = "/basDevp/visualized/container/pickIn")
- public R visualiZedPickIn(@RequestBody Map<String,Object> map){
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍏ュ簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- return agvWrkMast;
- }).collect(Collectors.toList());
+ 浠诲姟瀹屾垚
+ */
+ @RequestMapping(value = "/basDevp/visualized/container/moveOut2")
+ @ManagerAuth(memo = "纭鍑哄簱2")
+ public R visualiZedContainerMoveOut2(@RequestBody Map<String, Object> map) {
- agvWorkService.pickIn(agvWrkMastList);
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
+ if (agvWrkMast == null) {
+ return R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ }
+ if (agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110) {
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
- return R.ok("鐢熸垚鎷ｆ枡鍑哄簱浠诲姟鎴愬姛");
+ agvWrkMast.setWrkSts(208L);
+ agvWrkMast.setModiTime(new Date());
+ agvWrkMastService.updateById(agvWrkMast);
+
+ return R.ok("璐ф灦绂诲満鎴愬姛");
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ /*
+ 鎷ｆ枡/鐩樼偣鍏ュ簱
+ */
+ @RequestMapping(value = "/basDevp/visualized/container/pickIn")
+ @ManagerAuth(memo = "宸叉嫞鏂欏洖搴�")
+ public R visualiZedPickIn(@RequestBody Map<String, Object> map) {
+ if (Cools.isEmpty(map.get("devNo"))) {
+ return R.error("绔欑偣涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(map.get("barcode"))) {
+ return R.error("璐ф灦鐮佷笉鑳戒负绌�");
+ }
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ String devNo = map.get("devNo").toString();
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("loc_no", devNo).eq("wrk_sts", 205L));
+ if (agvWrkMast != null) {
+ if (agvWrkMast.getIoType() == 101) {
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ agvWrkMast.setLocNo(devNo);
+ agvWrkMastList.add(agvWrkMast);
+ agvWorkService.pickIn(agvWrkMastList);
+ } else {
+ return R.error("鏌ヤ笉鍒版嫞鏂欏嚭搴撲换鍔�");
+ }
+
+
+ return R.ok("鐢熸垚鎷ｆ枡鍥炲簱浠诲姟鎴愬姛");
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
--
Gitblit v1.9.1