From b922fe4d80f7e278b1ff958c4c95626b27cf8266 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 12 四月 2024 15:42:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index d1bd0b8..3d65e5c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,19 +1,25 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.param.AgvMobileStartPakin;
+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;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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,7 +39,11 @@
@Autowired
private AgvWorkService workService;
@Autowired
+ private AgvLocMastService agvLocMastService;
+ @Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
/*
@@ -41,8 +51,9 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ agvMobileService.comb(combParam, getUserId());
+
+ return R.ok();
}
/*
@@ -52,7 +63,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(barcode.substring(0,2));
+ agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -69,9 +81,18 @@
}
/*
+ 鑾峰彇杈撻�佺嚎绔欑偣
+ */
+ @PostMapping("/getBasDevp/noCacheShelves/auth")
+ public R getBasDevpByNoCacheShelves(){
+ return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
+ }
+
+ /*
鍚姩鍏ュ簱锛岀敓鎴愬伐浣滄。
*/
@PostMapping("/pakin/auth")
+ @Synchronized
public R pakin(@RequestBody Map<String,Object> map){
List<String> devNos = (List<String>) map.get("devNo");
@@ -84,5 +105,85 @@
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
+ /*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+ */
+ @PostMapping("/start/pakin/auth")
+ @Synchronized
+ @Transactional
+ public R startPakin(@RequestBody AgvMobileStartPakin params){
+ // 缁勬墭
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam,getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+
+ 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(),false);
+ }
+
+ 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()));
+
+ }
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v1")
+ public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+
+ return R.ok(agvLocDetls);
+ }
+
}
--
Gitblit v1.9.1