From 45c2bf51fae3030c8e22fa2f2016b64a28928547 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 04 十月 2023 10:22:50 +0800
Subject: [PATCH] AGV调试整改
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 4 +-
src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 3 +
src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html | 2 +
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 6 +-
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 7 ++-
src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java | 13 +++++-
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 11 +++++
src/main/webapp/views/agvWrkMast/wrkDetl.html | 2 +
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 57 ++++++++++++++++++++++++----
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 7 +++
src/main/webapp/static/js/common.js | 3 -
12 files changed, 95 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 82ae4e1..30f4914 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -206,15 +206,34 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
-
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+ List<String> devNos = new ArrayList<>();
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ try {
+ devNos = (List<String>) map.get("devNo");
+ agvWrkMastList = devNos.stream().map(devNo -> {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+ if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ return agvWrkMast;
+ }).collect(Collectors.toList());
+ }catch (Exception e){
+ String devNo = map.get("devNo").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
- return agvWrkMast;
- }).collect(Collectors.toList());
+ agvWrkMastList.add(agvWrkMast);
+
+ }
+
+// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+// if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+// }
+// return agvWrkMast;
+// }).collect(Collectors.toList());
try {
int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
@@ -245,14 +264,34 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
- List<String> devNos = (List<String>) map.get("devNo");
- List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+ List<String> devNos = new ArrayList<>();
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ try {
+ devNos = (List<String>) map.get("devNo");
+ agvWrkMastList = devNos.stream().map(devNo -> {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ return agvWrkMast;
+ }).collect(Collectors.toList());
+ }catch (Exception e){
+ String devNo = map.get("devNo").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
if(agvWrkMast.getIoType() == 101){
throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
- return agvWrkMast;
- }).collect(Collectors.toList());
+ agvWrkMastList.add(agvWrkMast);
+ }
+
+// List<String> devNos = (List<String>) map.get("devNo");
+// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
+// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
+// if(agvWrkMast.getIoType() == 101){
+// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+// }
+// return agvWrkMast;
+// }).collect(Collectors.toList());
agvWorkService.pickIn(agvWrkMastList);
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 4aa441f..85395c6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -71,8 +71,11 @@
//save api log (appkey 鍚庣画娣诲姞)
AppAuthUtil.auth("",param, request);
-
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
+ int wrkNo = Integer.parseInt(param.getTaskCode());
+ if(wrkNo < 0){
+ wrkNo = -wrkNo;
+ }
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
if(Cools.isEmpty(agvWrkMast)){
return R.error("浠诲姟缂栧彿閿欒");
}
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
index b74492f..7a29307 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
@@ -10,10 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvWaitPakinService;
-import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,8 @@
@Autowired
private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvBasDevpService agvBasDevpService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -91,7 +94,13 @@
return R.error();
}
for (AgvWaitPakin entity : list){
- agvWaitPakinService.delete(new EntityWrapper<>(entity));
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", entity.getSuppCode()));
+ if(Cools.isEmpty(agvBasDevp)){
+ agvWaitPakinService.delete(new EntityWrapper<>(entity));
+ }else {
+ return R.error("鏂欑鐮佷负" + entity.getSuppCode() + "宸茬粦瀹氱珯鐐癸紝璇峰厛浠嶢GV绔欑偣绠＄悊瑙ｇ粦璇ユ枡绠�");
+ }
+
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 7353979..68a127c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkDetlService;
import com.zy.common.model.LocDto;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class AgvLocDetlServiceImpl extends ServiceImpl<AgvLocDetlMapper, AgvLocDetl> implements AgvLocDetlService {
@Autowired
@@ -36,6 +38,7 @@
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
agvWrkDetls.stream().map(agvWrkDetl -> {
AgvLocDetl agvLocDetl = new AgvLocDetl();
+ log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
agvLocDetl.setLocNo(locNo);
this.insert(agvLocDetl);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index e67221b..57250ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -57,6 +57,17 @@
for(int row=rowIndex; row<=rowMax; row++) {
for (int bay = bayIndex; bay <= bayMax; bay++) {
for (int lev = levIndex; lev <= levMax; lev++) {
+ if(row == 8 || row == 9){
+ if((bay >=8 && bay <=11)
+ || (bay >= 20 && bay <=23)
+ || (bay>=37 && bay <=39)
+ || (bay>=50 && bay <=52)
+ || (bay>=63 && bay <=64)
+ || (bay>=79 && bay <=80)){
+ continue;
+ }
+ }
+
AgvLocMast loc = new AgvLocMast();
String locRow = row < 10 ? "-00" + row : "-0" + row;
String locBay = bay < 10 ? "-00" + bay : "-0" + bay;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
index 471dffc..9274924 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
@@ -23,7 +23,7 @@
List<AgvWaitPakin> agvWaitPakinList = this.selectList(new EntityWrapper<AgvWaitPakin>().eq("zpallet", agvWrkMast.getBarcode()));
agvWaitPakinList.stream().forEach(agvWaitPakin -> {
agvWaitPakin.setIoStatus("Y");
- this.update(agvWaitPakin,new EntityWrapper<AgvWaitPakin>().eq("zpallet",agvWaitPakin.getZpallet()));
+ this.update(agvWaitPakin,new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getZpallet()));
});
}
}
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 b8e83d9..bbd57fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -208,7 +208,7 @@
Date now = new Date();
//鐢熸垚宸ヤ綔鍏�
- AgvWrkMast wrkMast = createWrkMast(107, 21L, locDetl.getLocNo(), agvBasDevp.getDevNo(), agvLocDetl.getZpallet(), now, userId);
+ AgvWrkMast wrkMast = createWrkMast(107, 21L, locDetl.getLocNo(), agvBasDevp.getDevNo(), agvLocDetl.getSuppCode(), now, userId);
//鐢熸垚宸ヤ綔鏄庣粏妗�
createWrkDetlReWrite(locDetl.getMatnr(),wrkMast.getWrkNo(),null,locDetl.getBatch(),locDetl.getCount(),wrkMast.getBarcode(),now,userId,agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
//淇敼搴撲綅淇℃伅
@@ -238,7 +238,7 @@
Date now = new Date();
//鐢熸垚绉诲簱宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getZpallet(), now, userId);
+ AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId);
//鐢熸垚宸ヤ綔鍏氭槑缁�
createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime());
//淇敼鐩爣搴撲綅鐘舵��
@@ -465,7 +465,7 @@
wrkDetl.setIoTime(now);
wrkDetl.setBatch(batch);
wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setZpallet(zpallet); // 鎵樼洏鏉＄爜
+ wrkDetl.setSuppCode(zpallet); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(now);
wrkDetl.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 9671a2f..8d90d1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -130,7 +130,12 @@
AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
//AgvTaskParam
- agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
+ if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57){
+ agvTaskParam.setTaskCode(-agvWrkMast.getWrkNo() + "");
+ }else{
+ agvTaskParam.setTaskCode(agvWrkMast.getWrkNo() + "");
+ }
+
agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//AgvTaskkDescribeParam
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index ab8a10e..66b8d65 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -6,11 +6,11 @@
{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜', sort:true}
,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'suppCode', align: 'center',title: '鏂欑鐮�'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
- ,{field: 'dead_time', align: 'center',title: '閿�鍞鍗曡鍙�'}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: false}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1d3e070..b409c37 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -225,8 +225,7 @@
var detlCols = [
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false}
- ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false, width: 110}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide: true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
diff --git a/src/main/webapp/views/agvWrkMast/wrkDetl.html b/src/main/webapp/views/agvWrkMast/wrkDetl.html
index 497742b..4a60ca5 100644
--- a/src/main/webapp/views/agvWrkMast/wrkDetl.html
+++ b/src/main/webapp/views/agvWrkMast/wrkDetl.html
@@ -32,7 +32,9 @@
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html b/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
index e04f2be..9f67944 100644
--- a/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
+++ b/src/main/webapp/views/agvWrkMastLog/wrkDetlLog.html
@@ -39,7 +39,9 @@
let cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
return cols;
}
--
Gitblit v1.9.1