From 7404d352ee7efa5ae82d6bd68a3a876a913159f8 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 00:26:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 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..10784d2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4819,6 +4819,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 +4921,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 +5205,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 +5543,7 @@
// 浠诲姟鐢熸垚鍖� --------------------------------------------------------------------------
BasAgvMast basAgvMast = new BasAgvMast();
-
+ BasAgvWrkDetl basAgvWrkDetl = new BasAgvWrkDetl();
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -5943,23 +5955,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 +5972,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