优化

admin

2024-08-12 eec569e0ceaa54c052c6a19e6952a84cd584956e

优化

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -124,7 +124,7 @@
        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
                .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
                .orderByAsc(BsFormulaChildInfo::getStepSort)
//                .orderByAsc(BsFormulaChildInfo::getStepSort)
        );
        if (CollUtil.isNotEmpty(list)){
            List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java

@@ -590,7 +590,7 @@
    //                        List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
    //                        daPassingStationCollections.get(0).setOutboundTime(new Date());
    //                        daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare +"."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare +"."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(11).build());
                            WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
                        } catch (Exception e) {
                            throw new RuntimeException(e);

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

@@ -370,35 +370,45 @@
      console.log(tab, event);
    },
    handleEnter() {
      if(this.headContent.sfcCode.includes("9900200461") || this.headContent.sfcCode.includes("9900207783")){
      if(this.materialCode.includes("9900200461") || this.materialCode.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"
        ){
          let code = this.materialCode.substring(13,27);
          this.headContent.sfcCode = code;
          this.queryParams.productNum = code;
          this.getList();
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
          this.cakeLamp.InPlace = 1
          const param = {
            processesCode: this.headContent.processesCode,
            productCode: this.workpieceInformation.productCode
          if(this.materialCode.length>30){
            let code = this.materialCode.substring(13,26);
            this.headContent.sfcCode = code;
            this.queryParams.productNum = code;
            this.getList();
            this.cakeLamp.scanFinish = 1
            this.cakeLamp.startWork = 1
            this.cakeLamp.InPlace = 1
            const param = {
              processesCode: this.headContent.processesCode,
              productCode: this.workpieceInformation.productCode
            }
            fistSetpNumber(param).then(response => {
              console.log("fistSetpNumber------"+response.msg)
            });
            this.$message("扫描物料编码"+this.materialCode);
            this.setFocus();
            this.materialCode="";
          }else{
            this.$message("扫描物料编码错误！"+this.materialCode);
          }
          fistSetpNumber(param).then(response => {
            console.log("fistSetpNumber------"+response.msg)
          });

        }
      }else{
        if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
          this.$message("请先扫描产品条码！");
        }else{
          this.serialPortMethod(this.materialCode);
          this.$message("扫描物料编码"+this.materialCode);
          this.setFocus();
          this.materialCode="";
        }
      }else{
        this.serialPortMethod(this.materialCode);
        this.$message("扫描物料编码"+this.materialCode);
        this.setFocus();
        this.materialCode="";

      }
    },
    // getWorkOrders(){