From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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 2ee810a..9161d1d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,13 +1,14 @@
package com.zy.asrs.controller;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvBasDevp;
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.common.web.BaseController;
+import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -32,14 +33,22 @@
private AgvBasDevpService agvBasDevpService;
@Autowired
private AgvWorkService workService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ /*
+ locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
+ */
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
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();
@@ -48,6 +57,9 @@
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
+ /*
+ 鑾峰彇褰撳墠宸茬粦瀹氱殑杩樻病鐢熸垚宸ヤ綔妗ｇ殑鏆傚瓨浣�
+ */
@PostMapping("/getBasDevp/auth")
public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
String floor = map.get("floor").toString();
@@ -57,19 +69,27 @@
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 -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- if (!"F".equals(agvBasDevp.getLocSts())) {
- throw new CoolException("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱锛岃閲嶆柊閫夋嫨");
- }
- return agvBasDevp;
+ return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
--
Gitblit v1.9.1