测试,xiug bug

zhang

4 天以前 f126a51e48410e2dc4ead6d340fd3ece0d934575

测试,xiug bug

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -44,7 +44,7 @@
 *  robot_reach：机器人到达工作站。
 *  weight：称重事件回调。
 *  rfid：RFID识别事件回调。
 *
 * <p>
 * 任务状态（status）：
 *  success：成功。
 *  fail：失败。
@@ -173,8 +173,17 @@
    end {
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            try {
                if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
                    if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
                        agvWrkMast.setTakeNone(agvWrkMast.getBarcode() + "!=" + param.getPodCode());
                        log.info("AGV回调的返回的托盘码和工作档托盘不一致,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
                        log.error("AGV回调的返回的托盘码和工作档托盘不一致,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
                    }
                }
            } catch (Exception e) {


            }
            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMast.setWrkSts(205L);

@@ -195,6 +204,8 @@
            }
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);


        }
    },
    /**

 src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java

@@ -16,6 +16,9 @@
    //任务号
    private String taskCode;

    //货架码
    private String podCode;

    //任务类型
    private String taskTyp;


 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -16,7 +16,6 @@
import com.zy.asrs.service.*;
import com.zy.common.service.AgvCommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -276,6 +275,9 @@
                }
                break;
        }
        if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
            agvTaskCreateParam.setPodCode(agvWrkMast.getBarcode());
        }
        agvTaskCreateParam.setPositionCodePath(agvTaskParamList);

    }
@@ -299,7 +301,7 @@
            } else if (sourceLocNo.endsWith("01F1") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
                // 从吸塑一楼的库位到吸塑二楼的点位上
                return true;
            }else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
            } else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
                // 从吸塑er楼的kuwei到吸塑一楼的dianwei
                return true;
            }
@@ -313,7 +315,7 @@
            } else if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F1")) {
                // 从吸塑二楼的点位到吸塑一楼的库位
                return true;
            }else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
            } else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
                // 从吸塑二楼的点位到吸塑一楼的库位
                return true;
            }

 src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCreateParam;