#

whycq

2024-07-07 964b8b59ad2a37c92bd3c738bf98d65e3916d0e7

#

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

@@ -156,8 +156,10 @@
                    errMsg = "扫码失败";
                    back = true;
                }

                // 退回
                if (back) {
                    log.info("errmsg: " + errMsg);
//                        News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));

@@ -1134,7 +1136,7 @@
                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                    crnCommand.setSourcePosX((short)(sourceSta.getRow1()+slave.getOffset()));     // 源库位排
                    crnCommand.setSourcePosY((short)(sourceSta.getBay1()+slave.getOffset()));     // 源库位列
                    crnCommand.setSourcePosZ((short)(sourceSta.getBay1()+slave.getOffset()));     // 源库位层
                    crnCommand.setSourcePosZ((short)(sourceSta.getLev1()+slave.getOffset()));     // 源库位层
                    crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
                    crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 目标库位列
                    crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层
@@ -1579,7 +1581,8 @@

                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            //staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发6："+dto.getWorkNo()+","+staProtocol.getSiteId());

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -67,7 +67,7 @@
    }};

    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
        add(101); add(201);
        add(1); add(2);
    }};
    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
        add(101); add(201);
@@ -246,7 +246,7 @@
            for (int i = 0; i < barcodeList.size(); i++) {
                Integer barcodeId = barcodeList.get(i);
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                }

 src/main/resources/application.yml

@@ -52,7 +52,7 @@
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，货架从2开始，加1
    offset: 1
    offset: 0
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
@@ -90,7 +90,7 @@
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 1
    offset: 0
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
@@ -128,7 +128,7 @@
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 1
    offset: 0
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
@@ -149,14 +149,14 @@
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 104
      row: 6
      bay: 41
      bay: 42
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 5
      bay: 41
      bay: 42
      lev: 1
  # 输送线1
  devp[0]: