#

zjj

2024-11-05 52a2060950f4bc81a2be056c7019ebb0754c39b6

#

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

@@ -537,6 +537,7 @@
                    if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
                            && crnProtocol.statusType == CrnStatusType.WAITING
                            && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                        log.error("堆垛机等待确认！！！ [工作号:{}]", crnProtocol.getTaskNo());

                        // 命令下发区 --------------------------------------------------------------------------
                        if (crnProtocol.getCrnNo() !=5){
@@ -1162,6 +1163,7 @@
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                log.error("堆垛机处于等待确认且任务完成状态。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
                if (crnProtocol.getTaskNo() == 9999) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
@@ -2595,6 +2597,10 @@
                        if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //灌装站需要获取输送线物料代码
                            matnr = staProtocol.getMatnr();
                            batch = staProtocol.getBatch();
                            anfme = staProtocol.getAnfme().shortValue();
                            anfme2 = staProtocol.getAnfme2().shortValue();
                            weight = staProtocol.getWeight1();
                            weight2 = staProtocol.getWeight2();
                        }

                        devpThread.setPakMk(inStn.getSourceStaNo(),false);

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -25,6 +25,10 @@
    // 物料代码
    private Integer matnr;
    private String batch;
    private Double anfme;
    private Double anfme2;
    private Double weight1;
    private Double weight2;

    // ----------------------------------------------------------------
    // 自动