修改采集参数

cl

2024-08-12 6f1a28c55c7744c471bd5edfee0a418fb0f23434

修改采集参数

 jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java

@@ -15,6 +15,8 @@

    public static final List<String> OP040_OP160 = new ArrayList<>();//主线人工工位

    public static final List<String> OP0170_OP230 = new ArrayList<>();//环线人工工位

    public static final List<String> ModuleList = new ArrayList<>();//模组工位，用于校验是否传入模组码

    public static final Map<String,String> materialMap = new HashMap();//人工工位

 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -93,6 +93,15 @@
        Constants.OP040_OP160.add(Constants.OP100);
        Constants.OP040_OP160.add(Constants.OP120_2);

        //环线人工工位
        Constants.OP0170_OP230.add(Constants.OP170);
        Constants.OP0170_OP230.add(Constants.OP180);
        Constants.OP0170_OP230.add(Constants.OP190);
        Constants.OP0170_OP230.add(Constants.OP200);
        Constants.OP0170_OP230.add(Constants.OP210);
        Constants.OP0170_OP230.add(Constants.OP220);
        Constants.OP0170_OP230.add(Constants.OP230);

        OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
                miloService,
                daPassingStationCollectionService,

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -132,8 +132,12 @@
                } else if(Constants.TWO.equals(valueString)){//出站
                        if(Constants.OP040_OP160.contains(device)){//人工工位
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        }else{//自动工位
                            //先判断是否有产品SNy
                        } else if (Constants.OP165.equals(device)) {
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "print");//打印
                        } else if (Constants.OP0170_OP230.contains(device)) {
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        } else{//自动工位
                            //先判断是否有产品SN
                            Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                            Object orderObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
                            if (ObjectUtil.isNull(snCodeObjcet)){

 jcdm-ui/src/views/main/kb/stationTerminal/index.vue

@@ -370,15 +370,15 @@
      console.log(tab, event);
    },
    handleEnter() {
      if(this.headContent.sfcCode.includes("9900200461") || this.headContent.sfcCode.includes("9900207783") || this.headContent.sfcCode.includes("9900174365")){
      if(this.headContent.sfcCode.includes("9900200461") || this.headContent.sfcCode.includes("9900207783")){
        if(this.headContent.processesCode === "OP170" || this.headContent.processesCode === "OP180" ||
           this.headContent.processesCode === "OP190" || this.headContent.processesCode === "OP200" ||
           this.headContent.processesCode === "OP210" || this.headContent.processesCode === "OP220" ||
          this.headContent.processesCode === "OP230"  || this.headContent.processesCode === "OP070"
          this.headContent.processesCode === "OP230"
        ){
          this.headContent.sfcCode = this.materialCode;
          this.queryParams.productNum = this.materialCode;
          this.getList()
          this.getList();
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
          this.cakeLamp.InPlace = 1