From d255292cedeefc1f93de831d9d788f18401c4a13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 08 四月 2024 22:20:14 +0800
Subject: [PATCH] # 新增 所有入库订单明细接口
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 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 27d587c..48c754f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,13 +1,22 @@
package com.zy.asrs.controller;
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.AgvMobileService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -19,24 +28,115 @@
@Autowired
private AgvMobileService agvMobileService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private AgvWorkService workService;
+ @Autowired
+ private AgvLocMastService agvLocMastService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+ /*
+ locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
+ */
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- agvMobileService.comb(combParam, 1l);
- return R.ok("缁勬墭鎴愬姛");
+ String message = agvMobileService.comb(combParam, 1l);
+ return R.ok(message);
}
+ /*
+ 缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+ */
@PostMapping("/combBinging/auth")
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("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
+ /*
+ 鑾峰彇褰撳墠宸茬粦瀹氱殑杩樻病鐢熸垚宸ヤ綔妗ｇ殑鏆傚瓨浣�
+ */
+ @PostMapping("/getBasDevp/auth")
+ public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
+ String floor = map.get("floor").toString();
+ if("1".equals(floor) || "3".equals(floor)){
+ return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
+ }
+ return R.error("鍙傛暟閿欒");
+ }
+ /*
+ 鑾峰彇杈撻�佺嚎绔欑偣
+ */
+ @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");
+ List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
+ return agvBasDevpService.selectById(devNo);
+ }).collect(Collectors.toList());
+
+ workService.createWaitPainWrkMastStart(agvBasDevpList, 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()));
+
+ }
}
--
Gitblit v1.9.1