license.lic

Binary files differ

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

@@ -161,7 +161,7 @@

                        String barcode = barcodeThread.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            log.info("入库信号满足，托盘码未空");
                            log.info("入库信号满足，托盘码为空");
                            continue;
                        }

@@ -197,7 +197,16 @@
                                    .doPost();
                            JSONObject jsonObject = JSON.parseObject(response);
                            redisUtil.set(RedisKeyType.IN_TASK_LOCK.key, "lock", 5);
                            if (jsonObject.getInteger("code") != 200) {
                            if (jsonObject.getInteger("code") == 200) {

                            } else if (jsonObject.getInteger("code") == 500) {
                                log.info("条码：" + barcode + "申请WMS失败,系统回退,response=" + JSON.toJSONString(jsonObject));

                                staProtocol.setWorkNo(9997);
                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                continue;
                            }else {
                                log.info("条码：" + barcode + "申请WMS失败,response=" + JSON.toJSONString(jsonObject));
                                continue;
                            }

 src/main/resources/application-prod.yml

@@ -171,16 +171,20 @@
      staNo: 203
    inSta[2]:
      staNo: 105
      backSta: 106
      barcode: ${wcs-slave.barcode[2].id}
    inSta[4]:
      staNo: 202
      backSta: 203
      barcode: ${wcs-slave.barcode[4].id}
    inSta[0]: #入库口1
      staNo: 101
      backSta: 102
      barcode: ${wcs-slave.barcode[0].id}
    id: 1
    inSta[6]:
      staNo: 208
      backSta: 209
      barcode: ${wcs-slave.barcode[6].id}
    emptyInSta[1]: #空板入库口2
      staNo: 104
@@ -198,16 +202,20 @@
      staNo: 101
    inSta[3]:
      staNo: 107
      backSta: 108
      barcode: ${wcs-slave.barcode[3].id}
    inSta[5]:
      staNo: 205
      backSta: 206
      barcode: ${wcs-slave.barcode[5].id}
    port: 102
    inSta[1]: #入库口2
      staNo: 103
      backSta: 104
      barcode: ${wcs-slave.barcode[1].id}
    inSta[7]:
      staNo: 211
      backSta: 212
      barcode: ${wcs-slave.barcode[7].id}
  barcode[5]: #条码扫描仪6
    port: 51236

 src/main/resources/license.lic

Binary files differ