From 635417c5b06174b86488c317bb9023f89039eced Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:26:53 +0800
Subject: [PATCH] 优化库位查找逻辑及AGV工作处理
---
src/main/java/com/zy/common/service/AgvCommonService.java | 8 ++
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 155 ++++++++++++++++++++++++++-------------------------
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 7 ++
3 files changed, 91 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 668df57..1aad0bc 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -140,6 +140,7 @@
params.getCombParams().forEach(combParam -> {
agvMobileService.comb(combParam, getUserId());
});
+ String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode();
params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);
@@ -201,15 +202,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<>();
@@ -219,10 +220,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));
}
}
@@ -240,31 +241,31 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@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);
+ 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;
@@ -281,7 +282,7 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@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");
@@ -294,23 +295,23 @@
// 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));
}
}
@@ -330,7 +331,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");
@@ -338,16 +339,16 @@
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));
}
- 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);
@@ -359,21 +360,21 @@
@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));
}
@@ -404,7 +405,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);
@@ -419,13 +420,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");
@@ -439,7 +440,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);
@@ -450,13 +451,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)) {
@@ -465,7 +465,7 @@
supp_codes.forEach(agvLocDetl -> {
agvLocDetl.setLocNo(locNo1);
- agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
});
}
@@ -488,11 +488,11 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove(@RequestBody HashMap<String,Object> params){
+ 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")) {
@@ -506,18 +506,18 @@
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
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("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
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());
}
}
}
@@ -528,11 +528,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();
@@ -557,11 +557,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(), 30, floor);
// 鍚屾璋冩嫧鍗�
long flowId = snowflakeIdWorker.nextId();
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -580,7 +580,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() + ">宸插畬鎴愯皟鎷ㄦ暟閲�,璇锋鏌�!");
@@ -612,15 +612,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 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
}
}
}
@@ -636,9 +636,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) {
@@ -648,11 +648,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) {
@@ -671,17 +671,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 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)");
}
}
}
@@ -697,7 +697,7 @@
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
@Synchronized
- public R handControlLocMove(@RequestBody LocMoveParam param){
+ public R handControlLocMove(@RequestBody LocMoveParam param) {
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
}
@@ -706,7 +706,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
@Synchronized
- public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ public R allocationOut(@RequestBody AgvMobileStartPakin param) {
agvMobileService.allocationOut(param, getUserId());
return R.ok();
}
@@ -715,7 +715,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧杩涘満")
@Synchronized
- public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ public R allocationIn(@RequestBody AgvMobileStartPakin param) {
agvMobileService.allocationIn(param, getUserId());
return R.ok();
}
@@ -724,7 +724,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦绂诲満")
@Synchronized
- public R empOut(@RequestBody AgvMobileStartPakin param){
+ public R empOut(@RequestBody AgvMobileStartPakin param) {
agvMobileService.empOut(param, getUserId());
return R.ok();
}
@@ -733,7 +733,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦杩涘満")
@Synchronized
- public R empIn(@RequestBody AgvMobileStartPakin param){
+ public R empIn(@RequestBody AgvMobileStartPakin param) {
agvMobileService.empIn(param, getUserId());
return R.ok();
}
@@ -742,8 +742,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());
@@ -754,7 +754,7 @@
@Transactional
@ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
@Synchronized
- public R handBack(@RequestBody AgvMobileStartPakin param){
+ public R handBack(@RequestBody AgvMobileStartPakin param) {
agvMobileService.handBack(param, getUserId());
return R.ok();
}
@@ -763,7 +763,7 @@
@Transactional
@ManagerAuth(memo = "纭鍔犲伐瀹屾垚")
@Synchronized
- public R processed(@RequestBody AgvMobileStartPakin param){
+ public R processed(@RequestBody AgvMobileStartPakin param) {
agvMobileService.processed(param, getUserId());
return R.ok();
}
@@ -787,10 +787,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);
@@ -819,7 +820,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;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index c5ff91e..70c1b84 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -507,6 +507,9 @@
case 30:
br = 3;
break;
+ case 31:
+ br = 6;
+ break;
case 40:
br = 5;
break;
@@ -525,7 +528,9 @@
locType = 2;
} else if (containerType == 30) {
locType = 3;
- } else {
+ } else if (containerType == 31) {
+ locType = 6;
+ }else {
locType = agvBasDevp.getLocType1();
}
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index e7aded0..b3b3a6a 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -114,7 +114,13 @@
try{
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
+ //濡傛灉鏄崐鎴愬搧绠卞３
+ if (type == 6) {
+
+ }else {
+ //涓嶅姩杩欎釜閫昏緫
+ locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
+ }
if (locMast != null) {
return locMast;
}
--
Gitblit v1.9.1