From 630f5050eef4c2fd8dc7aa6ff43c3ceeeedd71e9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 14:55:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f9b28d0..8646b5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1184,7 +1184,7 @@
//mark - 3 - ....
this.locToLoc(crn, crnProtocol,mark);
//棰勮皟搴�
-// this.crnRebackHp(crn, crnProtocol, crnThread);
+ this.crnRebackHp(crn, crnProtocol, crnThread);
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
@@ -1202,6 +1202,9 @@
new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
);
boolean result = true;
+ if(crnProtocol.getCrnNo() == 3){
+ return;
+ }
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -4118,6 +4121,9 @@
log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", slave.getId());
continue;
}
+ if(staProtocol == null){
+ continue;
+ }
if(staProtocol.getWorkNo() == 0){
continue;
}
@@ -4819,6 +4825,10 @@
* arm浠诲姟瀹屾垚鑷姩缁勬墭
* */
public synchronized void armMissionAccomplished1() {
+ Config configAGVAUTOIN = configService.selectConfigByCode("AGVAUTOIN");
+ if(!Boolean.parseBoolean(configAGVAUTOIN.getValue())){
+ return;
+ }
try{
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
@@ -4917,6 +4927,10 @@
* arm浠诲姟瀹屾垚鑷姩缁勬墭
* */
public synchronized void armMissionAccomplished2() {
+ Config configAGVAUTOIN = configService.selectConfigByCode("AGVAUTOIN");
+ if(!Boolean.parseBoolean(configAGVAUTOIN.getValue())){
+ return;
+ }
try{
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().gt("arm_no",4));
for (BasArm basArm : basArmList) {
@@ -5197,6 +5211,10 @@
* arm浠诲姟涓嬪彂
* */
public synchronized void armTaskAssignment2() {
+ Config configAGVAUTOIN = configService.selectConfigByCode("AGVAUTOIN");
+ if(!Boolean.parseBoolean(configAGVAUTOIN.getValue())){
+ return;
+ }
try{
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().gt("arm_no",4));
for (BasArm basArm : basArmList) {
@@ -5531,7 +5549,7 @@
// 浠诲姟鐢熸垚鍖� --------------------------------------------------------------------------
BasAgvMast basAgvMast = new BasAgvMast();
-
+ BasAgvWrkDetl basAgvWrkDetl = new BasAgvWrkDetl();
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -5943,23 +5961,6 @@
if ((!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())) || basAgvMast.getSourceStaNo().equals(2033)){
AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
if(basAgvMast.getFloorNo()==1) {
-// WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
-// AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
-// agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
-// agvBindCtnrAndBinParam.setCtnrTyp("1");
-// ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾瑙ｇ粦", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
-// if (resultBind.getCode()==200){
-// //浠诲姟涓嬪彂
-// ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
-// if (result.getCode()==200){
-// basAgvMast.setStatus(1);
-// basAgvMastService.updateById(basAgvMast);
-// } else {
-// agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
-// }
-// } else {
-// agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV瀹瑰櫒缁戝畾瑙ｇ粦", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
-// }
//浠诲姟涓嬪彂
ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
@@ -5977,7 +5978,7 @@
agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getSourceStaNo().toString());
agvBindCtnrAndBinTwoParam.setIndBind("1");;
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦",
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾",
AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
if (resultBind.getCode()!=200){
basAgvMast.setStatus(4);
--
Gitblit v1.9.1