From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 10:28:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 257 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 170 insertions(+), 87 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 4c99399..7676b34 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -65,6 +65,9 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam) {
+ if (combParam == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
agvMobileService.comb(combParam, getUserId());
return R.ok();
@@ -74,6 +77,9 @@
@RequestMapping("/pick/again/auth")
@ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams) {
+ if (pickParams == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
agvMobileService.pickAgain(pickParams, 1l);
return R.ok("鎷ｆ枡鎴愬姛");
}
@@ -83,6 +89,9 @@
*/
@PostMapping("/combBinging/auth")
public R combBinding(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("barcode")) || Cools.isEmpty(map.get("stationCode"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
Short containerType = Short.valueOf(barcode.substring(0, 2));
@@ -95,6 +104,9 @@
*/
@PostMapping("/getBasDevp/auth")
public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("floor"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String floor = map.get("floor").toString();
if ("1".equals(floor) || "3".equals(floor)) {
return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
@@ -116,12 +128,17 @@
@PostMapping("/pakin/auth")
@Synchronized
public R pakin(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("devNo"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
-
+ if (agvBasDevpList == null) {
+ return R.error("鏆傚瓨浣嶄笉瀛樺湪");
+ }
workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
@@ -135,6 +152,9 @@
@Transactional
@ManagerAuth(memo = "鍚姩鍏ュ簱")
public R startPakin(@RequestBody AgvMobileStartPakin params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
// 缁勬墭
params.getCombParams().forEach(combParam -> {
@@ -147,16 +167,43 @@
}
/*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熸垚宸ヤ綔妗�,涓昏鐢ㄤ簬鍚稿涓�妤肩殑鍏ュ簱
+ */
+ @PostMapping("/start/pakin/auth/v2")
+ @Synchronized
+ @Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱v2")
+ public R startPakinV2(@RequestBody AgvMobileStartPakin params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ log.info("鍚姩鍏ュ簱v2,{}", JSON.toJSONString(params));
+ // 缁勬墭
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam, getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
+ workService.emptyPlateInV2(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false, params.getFactory());
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R pakinEmpty(@RequestBody AgvMobileStartParam params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ if (pda == null || Cools.isEmpty(pda.getContainerCode())) {
+ return R.error("缂哄皯瀹瑰櫒鍙傛暟");
+ }
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
- workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
+ workService.emptyPlateInV3(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
}
return R.ok();
@@ -169,9 +216,11 @@
@Synchronized
@ManagerAuth(memo = "绌烘澘鍑哄簱")
public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- if (pda == null) {
+ if (pda == null || Cools.isEmpty(pda.getDevNo()) || Cools.isEmpty(pda.getContainerType())) {
return R.error("缂哄皯绔欑偣淇℃伅");
}
workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
@@ -185,8 +234,13 @@
*/
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String, String> params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String devNo = params.get("devNo");
+ if (Cools.isEmpty(devNo)) {
+ return R.error("缂哄皯绔欑偣鏁版嵁");
+ }
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
@@ -204,15 +258,15 @@
String matnr = params.get("matnr");
String floor = params.get("floor");
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
// wrapper.eq("orderNo",orderNo);
- wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
- if (threeCode.substring(0,2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
@@ -222,10 +276,10 @@
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
} else {
// 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
- if ("JG".equals(orderNo.substring(0,2))) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ if ("JG".equals(orderNo.substring(0, 2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
}
}
@@ -243,31 +297,33 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@PostMapping("/query/locDetl/v3")
- public R queryAgvLocDetl3(@RequestBody HashMap<String,String> params){
+ public R queryAgvLocDetl3(@RequestBody HashMap<String, String> params) {
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
String floor = params.get("floor");
-
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
+ if (Cools.isEmpty(matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
// wrapper.eq("orderNo",orderNo);
- wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
- if (threeCode.substring(0,2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
for (AgvLocDetl agvLocDetl : agvLocDetls) {
AgvLocMast agvLocMast = new AgvLocMast();
if (Cools.isEmpty(floor)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
}
if (Cools.isEmpty(agvLocMast)) continue;
@@ -284,36 +340,38 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@PostMapping("/query/locDetl/v2")
- public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){
+ public R queryAgvLocDetl2(@RequestBody HashMap<String, String> params) {
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
String floor = params.get("floor");
-
+ if (Cools.isEmpty(orderNo, threeCode, matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", 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);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
- if (threeCode.substring(0,2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
+ if (threeCode.substring(0, 2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
for (AgvLocDetl agvLocDetl : agvLocDetls) {
AgvLocMast agvLocMast = new AgvLocMast();
if (Cools.isEmpty(floor)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
} else {
// 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
if (orderDetl.getSource().equals(35)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
}
}
@@ -333,7 +391,7 @@
@PostMapping("/check/detl/v1")
@ManagerAuth(memo = "搴撳瓨鐩樼偣")
@Synchronized
- public R checkLocDetl(@RequestBody HashMap<String,String> param){
+ public R checkLocDetl(@RequestBody HashMap<String, String> param) {
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
@@ -341,16 +399,26 @@
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ if (listByLocNo != null) {
+ for (AgvLocDetl agvLocDetl : listByLocNo) {
+ agvLocDetl.setCount(agvLocDetl.getAnfme());
+ }
+ }
}
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(containerCode)) {
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+ if (listByContainerCode != null) {
+ for (AgvLocDetl agvLocDetl : listByContainerCode) {
+ agvLocDetl.setCount(agvLocDetl.getAnfme());
+ }
+ }
}
- Map<String,Object> result = new HashMap<String,Object>();
- result.put("locNo",listByLocNo);
- result.put("containerCode",listByContainerCode);
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("locNo", listByLocNo);
+ result.put("containerCode", listByContainerCode);
return R.ok(result);
@@ -362,28 +430,30 @@
@PostMapping("/update/detl/v1")
@ManagerAuth(memo = "绾犳搴撲綅")
@Synchronized
- public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
+ public R updateLocDetlLocNo(@RequestBody HashMap<String, String> param) {
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
- if(Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)){
+ if (Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)) {
return R.error("鍙傛暟涓嶅叏");
}
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
// 婧愬簱浣�
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
- if(!Cools.isEmpty(locNo)){
+ if (!Cools.isEmpty(locNo)) {
// 鐩爣搴撲綅
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
-
+ if (agvLocMastByLocNo == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
String barcode1 = agvLocMastByLocNo.getBarcode();
@@ -407,7 +477,7 @@
agvLocMastByLocNo.setBarcode(containerCode);
agvLocMastService.updateById(agvLocMastByLocNo);
- if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
+ if (!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F", agvLocMastByContainerCode.getLocSts())) {
agvLocMastByContainerCode.setLocSts("D");
agvLocMastByContainerCode.setBarcode(barcode1);
agvLocMastService.updateById(agvLocMastByContainerCode);
@@ -422,13 +492,13 @@
// -------------2-----------------------------
//搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
- if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
+ if (!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)) {
String newLocNo = agvLocMastByContainerCode.getLocNo();
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByLocNo.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(newLocNo,sourceLoc,agvLocDetl);
+ agvLocDetlService.updateLocNo(newLocNo, sourceLoc, agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
@@ -442,7 +512,7 @@
return R.ok("缁存姢鎴愬姛");
}
- if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
+ if ((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)) {
//agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
//agvLocMastService.updateById(agvLocMastByContainerCode);
@@ -453,13 +523,12 @@
}
-
// --------------3----------------------------
String locNo1 = listByContainerCode.get(0).getLocNo();
listByContainerCode.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
- agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
});
if (!Cools.isEmpty(listByLocNo)) {
@@ -468,7 +537,7 @@
supp_codes.forEach(agvLocDetl -> {
agvLocDetl.setLocNo(locNo1);
- agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
});
}
@@ -491,11 +560,12 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove(@RequestBody HashMap<String,Object> params){
+ @Deprecated //涓嶇敤浜�
+ public R agvLocMove(@RequestBody HashMap<String, Object> params) {
String fl = String.valueOf(params.get("floor"));
- short floor =(short)Integer.parseInt(fl.substring(0, 1));
- List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
- params.get("dbList");
+ short floor = (short) Integer.parseInt(fl.substring(0, 1));
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
Object mT = params.get("moveType");
String moveType = "";
if (mT.equals("unAuto")) {
@@ -507,20 +577,23 @@
String locNo = map.get("locNo");
Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ if (agvLocMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
- agvLocMastService.update(agvLocMast,wrapper);
+ agvLocMastService.update(agvLocMast, wrapper);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ throw new CoolException("璋冩嫧鍗曟槑缁嗕笉瀛樺湪");
}
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
}
}
}
@@ -531,11 +604,11 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove2(@RequestBody HashMap<String,Object> params){
+ public R agvLocMove2(@RequestBody HashMap<String, Object> params) {
Date now = new Date();
String fl = String.valueOf(params.get("floor"));
Integer floor = Integer.parseInt(fl.substring(0, 1));
- List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
Object mT = params.get("moveType");
String orderNo = params.get("orderNo").toString();
@@ -560,11 +633,11 @@
if (!Cools.isEmpty(source_loc_no)) {
throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
}
- AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
if (Cools.isEmpty(locMastS)) {
- throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
}
- AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
+ AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), Integer.parseInt(barcode.substring(0, 2)), floor);
// 鍚屾璋冩嫧鍗�
long flowId = snowflakeIdWorker.nextId();
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -583,7 +656,7 @@
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
// 鍒ゆ柇璁㈠崟鏄惁瓒呴噺
if (orderDetl.getQty() >= orderDetl.getAnfme()) {
throw new CoolException("璋冩嫧鍗�:" + orderNo + "鐨�<" + agvLocDetl.getMatnr() + ">宸插畬鎴愯皟鎷ㄦ暟閲�,璇锋鏌�!");
@@ -615,15 +688,15 @@
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
- throw new CoolException("璁㈠崟鍙凤細{"+orderNo+"}鏇存柊璁㈠崟鏄庣粏澶辫触锛� 寮傚父鐗╂枡:"+agvLocDetl.getMatnr()+"(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("璁㈠崟鍙凤細{" + orderNo + "}鏇存柊璁㈠崟鏄庣粏澶辫触锛� 寮傚父鐗╂枡:" + agvLocDetl.getMatnr() + "(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
}
// 鏇存柊璁㈠崟鐘舵��
Order order = orderService.selectByNo(orderDetl.getOrderNo());
Long settle = order.getSettle();
if (settle == 1L) {
- if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
- throw new CoolException("璁㈠崟鍙凤細{"+order.getOrderNo()+"}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{" + order.getOrderNo() + "}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
}
}
}
@@ -639,9 +712,9 @@
@Transactional
@ManagerAuth(memo = "鍥炶皟鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove3(@RequestBody HashMap<String,Object> params){
+ public R agvLocMove3(@RequestBody HashMap<String, Object> params) {
Date now = new Date();
- List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
String orderNo = params.get("orderNo").toString();
for (HashMap<String, String> map : dbList) {
@@ -651,11 +724,11 @@
if (!Cools.isEmpty(source_loc_no)) {
throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
}
- AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
if (Cools.isEmpty(locMastS)) {
- throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
}
- AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30,1);
+ AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30, 1);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
@@ -674,17 +747,17 @@
// 鏇存柊璁㈠崟
// 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("source", 17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
}
// 鏇存柊璁㈠崟鐘舵��
Order order = orderService.selectByNo(orderNo);
Long settle = order.getSettle();
if (settle == 1L) {
- if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
- throw new CoolException("璁㈠崟鍙凤細{"+order.getOrderNo()+"}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ if (!orderService.updateSettle(order.getId(), 2L, getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{" + order.getOrderNo() + "}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
}
}
}
@@ -700,7 +773,7 @@
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
@Synchronized
- public R handControlLocMove(@RequestBody LocMoveParam param){
+ public R handControlLocMove(@RequestBody LocMoveParam param) {
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
}
@@ -709,7 +782,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
@Synchronized
- public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ public R allocationOut(@RequestBody AgvMobileStartPakin param) {
agvMobileService.allocationOut(param, getUserId());
return R.ok();
}
@@ -718,7 +791,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧杩涘満")
@Synchronized
- public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ public R allocationIn(@RequestBody AgvMobileStartPakin param) {
agvMobileService.allocationIn(param, getUserId());
return R.ok();
}
@@ -727,7 +800,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦绂诲満")
@Synchronized
- public R empOut(@RequestBody AgvMobileStartPakin param){
+ public R empOut(@RequestBody AgvMobileStartPakin param) {
agvMobileService.empOut(param, getUserId());
return R.ok();
}
@@ -736,7 +809,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦杩涘満")
@Synchronized
- public R empIn(@RequestBody AgvMobileStartPakin param){
+ public R empIn(@RequestBody AgvMobileStartPakin param) {
agvMobileService.empIn(param, getUserId());
return R.ok();
}
@@ -745,8 +818,8 @@
@Transactional
@ManagerAuth(memo = "绔欑偣鍥為��")
@Synchronized
- public R doBack(@RequestBody AgvMobileStartPakin param){
- if (Cools.isEmpty(param)){
+ public R doBack(@RequestBody AgvMobileStartPakin param) {
+ if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓虹┖");
}
agvMobileService.doBack(param, getUserId());
@@ -757,7 +830,7 @@
@Transactional
@ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
@Synchronized
- public R handBack(@RequestBody AgvMobileStartPakin param){
+ public R handBack(@RequestBody AgvMobileStartPakin param) {
agvMobileService.handBack(param, getUserId());
return R.ok();
}
@@ -766,8 +839,17 @@
@Transactional
@ManagerAuth(memo = "纭鍔犲伐瀹屾垚")
@Synchronized
- public R processed(@RequestBody AgvMobileStartPakin param){
+ public R processed(@RequestBody AgvMobileStartPakin param) {
agvMobileService.processed(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/processed/v2")
+ @Transactional
+ @ManagerAuth(memo = "纭鍔犲伐瀹屾垚V2")
+ @Synchronized
+ public R processedV2(@RequestBody AgvMobileStartPakin param) {
+ agvMobileService.processedV2(param, getUserId());
return R.ok();
}
@@ -790,10 +872,11 @@
System.out.println(agvLocDetls22.equals(agvLocDetls2));
}
+
/*
鐢熸垚宸ヤ綔妗�
*/
- private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,int floor){
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
AgvWrkMast wrkMast = new AgvWrkMast();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
@@ -822,7 +905,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));
return wrkMast;
}
--
Gitblit v1.9.1