dubin
2025-05-28 5477e673d28e407d52b887f624af87d8bcaff7ed
电视机ip配置更新和为wms提供输送站点是否有物
3个文件已修改
10 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -241,6 +241,7 @@
            crnStatusParam.setDevpNo(basDevp.getDevNo());
            crnStatusParam.setOutEnable(basDevp.getOutEnable());
            crnStatusParam.setInEnable(basDevp.getInEnable());
            crnStatusParam.setLoading(basDevp.getLoading());
            if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
                crnStatusParam.setCrnSts(3);
            }else{
src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java
@@ -11,4 +11,5 @@
    private String errorMsg;//报警内容
    private String outEnable;//可出 Y:可出 N:不可出
    private String inEnable;//可入 Y:可入 N:不可入
    private String loading;//有物
}
src/main/resources/application-prod.yml
@@ -168,6 +168,7 @@
      staNo: 1014
      backSta: 1015
      barcode: ${wcs-slave.barcode[0].id}
      led: ${wcs-slave.led[2].id}
    outSta[0]: #出库口1
      staNo: 1019
    outSta[1]: #出库口2
@@ -186,6 +187,7 @@
      staNo: 2007
      backSta: 2006
      barcode: ${wcs-slave.barcode[1].id}
      led: ${wcs-slave.led[8].id}
    outSta[0]: #出库口1
      staNo: 2001
    outSta[1]: #出库口2
@@ -213,10 +215,12 @@
    slot: 0
    emptyInSta[0]: #空板入库口0
      staNo: 2056
      led: ${wcs-slave.led[3].id}
    inSta[0]: #入库口1
      staNo: 2056
      backSta: 2055
      barcode: ${wcs-slave.barcode[3].id}
      led: ${wcs-slave.led[4].id}
    outSta[0]: #出库口1
      staNo: 1053
    outSta[1]: #出库口1
@@ -230,12 +234,14 @@
    # 拣料入库口1
    pickSta[0]:
      staNo: 2051
      led: ${wcs-slave.led[6].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 2052
    # 拣料入库口3
    pickSta[2]:
      staNo: 2057
      led: ${wcs-slave.led[3].id}
    # 拣料入库口4
    pickSta[3]:
      staNo: 2058
@@ -268,7 +274,7 @@
    ip: 192.168.110.211
    port: 5005
    devpPlcId: ${wcs-slave.devp[2].id}
    staArr: 1052
    staArr: 1051
  # LED3 半成品库1F
  led[2]:
    id: 3