*
L
2025-09-25 345947cd69683fed7b61ec9eb15821808217ca43
*
3个文件已修改
25 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/param/CombParam.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -51,6 +51,7 @@
        // 规格
        private String specs = "";
        private String supp = "";
        // sku
        private String sku = "";
@@ -65,9 +66,9 @@
            this.matnr = basArmMast.getSku();
//            this.batch = basArmMast.getCreateTime().toString();
            this.anfme = basArmMast.getCtns().doubleValue();
            this.specs = basArmMast.getPo();
            this.brand = basArmMast.getUpc();
            this.standby1 = basArmMast.getSupplier();
            this.standby1 = basArmMast.getPo();
            this.standby2 = basArmMast.getUpc();
            this.supp = basArmMast.getSupplier();
        }
    }
src/main/java/com/zy/core/MainProcess.java
@@ -37,8 +37,8 @@
        thread = new Thread(this::crnAndDevRun);
        thread.start();
//        armThread = new Thread(this::roboticArmDispatch);
//        armThread.start();
        armThread = new Thread(this::roboticArmDispatch);
        armThread.start();
    }
    private void crnAndDevRun() {
        while (!Thread.currentThread().isInterrupted()) {
src/main/resources/application.yml
@@ -38,7 +38,7 @@
  enable: false
wms:
  url: 127.0.0.1:8080/jshdasrs
  url: 127.0.0.1:8081/jshdasrs
  comb: mobile/combAuto/wcs/auth
inventory:
  number: 7
@@ -370,18 +370,18 @@
    slot: 0
    # 码垛位
    armSta[0]:
      staNo: 1044
      staNo: 1098
      armNo: 1
      sortingLine: 1044
      staNoEnd: 1044
      sortingLine: 8
      staNoEnd: 1103
      barcode: ${wcs-slave.barcode[0].id}
      led: ${wcs-slave.led[1].id}
    # 码垛位
    armSta[1]:
      staNo: 1044
      staNo: 1093
      armNo: 1
      sortingLine: 1044
      staNoEnd: 1044
      sortingLine: 7
      staNoEnd: 1103
      barcode: ${wcs-slave.barcode[0].id}
      led: ${wcs-slave.led[1].id}
    # 码垛位