#

zjj

2024-09-11 04048d2a63603c14cb6c76ba6cd9aad91ca5172a

#

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

@@ -2277,7 +2277,7 @@
            crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排
            crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 源库位列
            crnCommand.setSourcePosZ(crnStn.getLev().shortValue());     // 源库位层
            crnCommand.setDestinationPosX((short) (locMast.getRow1()+slave.getOffset()));     // 目标库位排
            crnCommand.setDestinationPosX(locMast.getRow1().shortValue());     // 目标库位排
            crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
            crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层
            crnCommand.setLocType1(locMast.getLocType1());     // 货物类型
@@ -2468,7 +2468,7 @@
                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                    crnCommand.setSourcePosX((short)(locMast.getRow1()+slave.getOffset()));     // 源库位排
                    crnCommand.setSourcePosX(locMast.getRow1().shortValue());     // 源库位排
                    crnCommand.setSourcePosY(locMast.getBay1().shortValue());     // 源库位列
                    crnCommand.setSourcePosZ(locMast.getLev1().shortValue());     // 源库位层
                    crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
@@ -2521,7 +2521,7 @@
                        log.info("空桶强制入库："+staProtocol.getAmount());
                        matCodeStore.setAnfme(Double.valueOf(staProtocol.getAmount()));
                    }else {
                        matCodeStore.setAnfme(8d) ;
                        matCodeStore.setAnfme(4d) ;
                    }
                    ArrayList<FullStoreParam.MatCodeStore> matCodeStores = new ArrayList<>();
                    matCodeStores.add(matCodeStore);

 src/main/resources/application.yml

@@ -47,7 +47,7 @@
  # 堆垛机1
  crn[0]:
    id: 1
    ip: 10.10.10.100
    ip: 172.17.5.40
    port: 102
    rack: 0
    slot: 0
@@ -72,7 +72,7 @@
  # 输送线1
  devp[0]:
    id: 1
    ip: 10.10.10.20
    ip: 172.17.5.20
    port: 102
    rack: 0
    slot: 0