From c63696bec5666ad3064dd72636420e3980ade34f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 05 十二月 2025 09:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 234 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 168 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d402788..368cdfc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -18,6 +18,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
+import com.zy.common.constant.AgvConstant;
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.service.CommonService;
@@ -720,6 +721,40 @@
@Override
@Transactional
+ public boolean TaskArmLocStatus(ArmOKParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArmNo())
+ .eq("sta_no", param.getStaNo())
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArm)){
+ log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ return false;
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+ if (Cools.isEmpty(locMast)){
+ log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�"+ JSON.toJSONString(param));
+ return false;
+ }
+ if (locMast.getLocSts().equals("D")){
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sta_no", basArm.getStaNoSou())
+ .eq("arm_no", param.getArmNo())
+ .eq("status", 3)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ return true;
+ }
+ log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ } else {
+ log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+ return false;
+ }
+
+ @Override
+ @Transactional
public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
.eq("arm_no", param.getArm_no())
@@ -798,27 +833,55 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- // 鍒涘缓瀵硅薄锛堟瀯閫犲嚱鏁颁腑宸茬敓鎴� timestamp锛�
BasAgvMast basAgvMast = new BasAgvMast();
- // 鐢熸垚 WMS 浠诲姟鍙凤紙濡傛棤澶栭儴浼犲叆锛屽彲浠ヤ娇鐢ㄩ洩鑺盜D 鎴栬嚜澧烇級
+
+ Long ts = basAgvMast.getTimestamp();
+ if (ts == null) {
+ throw new CoolException("timestamp 鐢熸垚澶辫触");
+ }
+ String locNo = null;
+ String staNo = null;
+
+ basAgvMast.setBarcode(Long.toString(ts));
+
basAgvMast.setTaskNo(commonService.getWorkNo(0));
- // 璧嬪�煎弬鏁�
basAgvMast.setSourceStaNo(param.getSourceStaNo());
basAgvMast.setStaNo(param.getStaNo());
basAgvMast.setSourceLocNo(param.getSourceLocNo());
basAgvMast.setLocNo(param.getLocNo());
- // 榛樿鍊�
- basAgvMast.setPriority(1L); // 榛樿浼樺厛绾�
- basAgvMast.setStatus(0); // 鍒濆鐘舵��
- basAgvMast.setAppeTime(new Date()); // 娣诲姞鏃堕棿
- basAgvMast.setModiTime(new Date()); // 淇敼鏃堕棿
- basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
- basAgvMast.setFloorNo(param.getFloorNo()); //妤煎眰
-
- // 鎻掑叆鏁版嵁搴�
+ basAgvMast.setPriority(1L);
+ basAgvMast.setStatus(0);
+ basAgvMast.setAppeTime(new Date());
+ basAgvMast.setModiTime(new Date());
+ basAgvMast.setIoType(param.getIoType());
+ basAgvMast.setFloorNo(param.getFloorNo());
+ switch (basAgvMast.getIoType()){
+ // AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
+ // AGV搴撲綅==銆婣GV搴撲綅 1
+ // 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
+ // 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
+ case 0:
+ case 1:
+ locNo = param.getSourceLocNo();
+ break;
+ case 2:
+ case 3:
+ staNo = param.getSourceStaNo().toString();
+ break;
+ }
basAgvMastService.insert(basAgvMast);
- return true;
+ bindCtnrAndBinParam bindParam = new bindCtnrAndBinParam();
+ bindParam.setBarcode(Long.toString(ts));
+ bindParam.setIndBind("1");
+ bindParam.setFloorNo(basAgvMast.getFloorNo());
+ bindParam.setLocNo(locNo);
+ bindParam.setStaNo(staNo);
+ if(bindCtnrAndBin(bindParam)){
+ return true;
+ }else{
+ throw new CoolException("鏈兘缁戝畾");
+ }
}
@Override
@@ -865,53 +928,57 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
- BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
- BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
- agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
- agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
- }
- if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
- }
- agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
- try {
- String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
- String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
- String response = "";
- boolean success = false;
+ if (param.getFloorNo()==1){
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
+ agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
+ agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
+ }
+ if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
+ }
+ agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
try {
- log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
+ String URL = AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
+ String mesPath = AgvConstant.getAGVADAPTOR(param.getFloorNo()); // 鎺ュ彛璺緞
+ String response = "";
+ boolean success = false;
+ try {
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
- response = new HttpHandler.Builder()
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
- .build()
- .doPost();
+ response = new HttpHandler.Builder()
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
+ .build()
+ .doPost();
- log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
- JSONObject jsonObject = JSON.parseObject(response);
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
+ JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
- success = true;
- } else {
- log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
- throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ }
+ } catch (Exception e) {
+ log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
}
} catch (Exception e) {
- log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
- throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
+ throw new CoolException(e.getMessage());
}
- } catch (Exception e) {
- throw new CoolException(e.getMessage());
- }
+ } else {}
return true;
}
+
+
@Override
@@ -933,7 +1000,8 @@
agvGoParam.setCode("0");
agvGoParam.setMessage("缁х画鎵ц");
agvGoParam.setReqCode(param.getReqCode());
- ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, param);
+ agvGoParam.setTaskCode(param.getTaskCode());
+ ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
if (result.getCode()==200){
return true;
}
@@ -943,24 +1011,58 @@
@Override
@Transactional
public boolean agvBindAndBin(String taskNo) {
- String URL = "http://10.10.10.200:8181/"; // AGV鎺ュ彛鍦板潃
+ String URL = "http://10.10.10.200:8181"; // AGV鎺ュ彛鍦板潃
String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
- BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
- new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
- );
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
- agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
- agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
- agvBindCtnrAndBinParam.setIndBind("0");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
- if (resultBind.getCode()!=200){
- return true;
+ if (Cools.isEmpty(basAgvMast)){
+ return false;
+ }
+ if (basAgvMast.getFloorNo()==1){
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
+ );
+ BasAgvLocNo locNo = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getLocNo())
+ );
+ String binCode = basAgvLocNoEnd != null
+ ? basAgvLocNoEnd.getAgvLocNo()
+ : (locNo != null ? locNo.getAgvLocNo() : null);
+ if (Cools.isEmpty(basAgvMast)){
+ return false;
+ }
+ String ctnrCode = basAgvMast.getBarcode().length() > 1?basAgvMast.getBarcode():basAgvMast.getTimestamp().toString();
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + System.currentTimeMillis());
+ agvBindCtnrAndBinParam.setCtnrCode(ctnrCode);
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ agvBindCtnrAndBinParam.setStgBinCode(binCode);
+ agvBindCtnrAndBinParam.setIndBind("0");
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
+ if (resultBind.getCode() ==200){
+ basAgvMast.setStatus(4);
+ basAgvMastService.updateById(basAgvMast);
+ return true;
+ }
+ return false;
+ }else {
+ if (basAgvMast.getIoType()==0 && (basAgvMast.getSourceStaNo()==2033 || basAgvMast.getStaNo()==4003)){
+ AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
+ agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
+ agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
+ agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
+ agvBindCtnrAndBinTwoParam.setIndBind("0");;
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦",
+ AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode()!=1){
+ basAgvMast.setStatus(4);
+ basAgvMastService.updateById(basAgvMast);
+ return true;
+ }
+ }
}
return false;
+
}
--
Gitblit v1.9.1