修改采集参数

cl

2024-08-11 5b939fe26d70b6cb2f8b75b02ddd25c96dcaddd9

修改采集参数

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

@@ -32,7 +32,7 @@
    public static final String RECORD_DATA= "RecordData";
    public static final String RECORD_SN= "RecordSN";

    public static final String SCREW = "Screw";
    public static final String SCREW = "PLCScrew";
    public static final String ONE= "1";
    public static final String ZERO= "0";
    public static final String TWO= "2";

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

@@ -108,7 +108,7 @@
        try{
            if (Constants.RECORD_DATA.equals(tab)) {  //出入站
                if (Constants.ONE.equals(valueString)) {//入站
                    if(Constants.OP040_OP160.contains(device)){
                    if(Constants.OP040_OP160.contains(device)){//人工工位
                        Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                        if (ObjectUtil.isNull(snCodeObjcet)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
@@ -119,20 +119,31 @@
                            WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                        }
                    }else {
                    }else {//自动工位
                        //所有进站将进站时间写给PLC
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        String currentDate = dateFormat.format(new Date());
                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".StartTime").value(currentDate).build());

                        Integer recordDataDone = 11;
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                    }

                } else if(Constants.TWO.equals(valueString)){//出站
                        if(Constants.OP040_OP160.contains(device)){//人工工位
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        }else{//自动工位
                            //先判断是否有产品SN
                            //先判断是否有产品SNy
                            Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                            Object orderObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
                            if (ObjectUtil.isNull(snCodeObjcet)){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(25).build());
                            }else {
                                //所有出站将出站时间写给PLC
                                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                String currentDate = dateFormat.format(new Date());
                                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".StopTime").value(currentDate).build());

                                Integer result = 21;
                                String snCode = snCodeObjcet.toString();//产品SN
                                String orderNumber = orderObjcet.toString();//工单号
@@ -140,8 +151,10 @@
                                if (ObjectUtil.isNotNull(stationStatusObjcet)) {
                                    String stationStatus = stationStatusObjcet.toString();
                                    if (Constants.OP010.equals(device)) {
                                        updateOrderStatus(snCode, "3");//OP010工位更新工单状态为执行中
                                        reportFactoryMes(snCode, device, format.format(new Date()));//工厂MES报工
                                        CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                            updateOrderStatus(snCode, "3");//OP010工位更新工单状态为执行中
                                            reportFactoryMes(snCode, device, format.format(new Date()));//工厂MES报工
                                        });
                                    }
                                    result = savePassingStation(thoroughfare, device, snCode, orderNumber, stationStatus);//保存过站
                                    if (result == 21) {
@@ -173,7 +186,7 @@
                }
            }else if(Constants.SCREW.equals(tab)){
                List<String> list = new ArrayList<>();
                String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
                String[] suffixes = {"Torque1", "Angle1", "TorqueResult1", "AngleResult1"};

                for (String suffix : suffixes) {
                    String string = thoroughfare + "." + device + "." + suffix;
@@ -205,7 +218,7 @@
            Date startTime = new Date();
            ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间
            if (ObjectUtil.isNotNull(startTimeRead.getValue())){
                startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString())));
                startTime = format.parse(startTimeRead.getValue().toString());
            }else{
                result = 23;
                log.info("读取到工位{}的StartTime数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
@@ -464,4 +477,10 @@
        sb.append(']'); // 添加右方括号
        return sb.toString();
    }

 /*   public static void main(String[] args) {
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String currentDate = dateFormat.format(new Date());
        System.out.println(currentDate);
    }*/
}

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

@@ -235,9 +235,9 @@
    },
    handleEnter() {
      this.serialPortMethod(this.materialCode);
      this.materialCode="";
      this.setFocus();
      this.$message("扫描物料编码"+this.materialCode);
      this.setFocus();
      this.materialCode="";
    },
    getWorkOrders(){
      if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){