下线打印报告优化

admin

昨天 4e91ae3c1ff41d0bf9f65d444c90c2583e69cdb7

下线打印报告优化

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/PrintOfflineReportInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.jcdm.main.bs.formulaChild.domain;

import lombok.Data;

@Data
public class PrintOfflineReportInfo {
    private String inspectionDate;
    private String param18;
    private String param19;
    private String param20;
    private String param21;
    private String param22;
    private String param23;
    private String param24;
    private String param25;
    private String param26;
    private String param27;
    private String param28;
    private String param29;
    private String param30;
    private String param31;
    private String param32;
    private String param33;
    private String param34;
    private String param35;
    private String param36;
    private String param37;
}

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java

@@ -7,6 +7,7 @@
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.bs.formulaChild.domain.PrintOfflineReportInfo;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,10 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;

/**
 * è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集Controller
@@ -32,6 +36,50 @@
    /**
     * æŸ¥è¯¢è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集列表
     */
    @GetMapping("/getPrintOfflineReportInfo")
    public AjaxResult getPrintOfflineReportInfo(DaParamCollection daParamCollection)
    {
        PrintOfflineReportInfo info = new PrintOfflineReportInfo();
        info.setParam18("＞500");
        info.setParam19("0.3%，0%，0.5%");
        info.setParam20("＞600");
        info.setParam21("＞700");
        info.setParam22("0.22");
        info.setParam23("362");
        info.setParam24("8.18");
        info.setParam25("0.1");
        info.setParam26("21.53,42.33,42.19");
        info.setParam27("49.20,49.34,49.15");
        info.setParam28("0.061%，0.163%，0.223%");
        info.setParam29("35.1,35.0,35.1");
        info.setParam30("√");
        info.setParam31("0.0041");
        info.setParam32("3.06");
        info.setParam33("o.48");
        info.setParam34("4.7ｕA");
        info.setParam35("562.1");
        info.setParam36("-137.1");
        info.setParam37("√");
        info.setInspectionDate(getInspectionDate());
        return AjaxResult.success(info);
    }

    public static String getInspectionDate(){
        // èŽ·å–当前日期
        LocalDate today = LocalDate.now();
        // å®šä¹‰æ—¥æœŸæ ¼å¼ï¼ˆå¹´.月.日）
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M.d");
        // æ ¼å¼åŒ–当前日期
        return today.format(formatter);
    }

    public static void main(String[] args) {
        System.out.println(getInspectionDate());
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集列表
     */
    @PreAuthorize("@ss.hasPermi('main:paramCollection:list')")
    @GetMapping("/list")
    public TableDataInfo list(DaParamCollection daParamCollection)

 jcdm-ui/src/api/main/da/paramCollection/paramCollection.js

@@ -9,6 +9,14 @@
  })
}

export function getPrintOfflineReportInfo(query) {
  return request({
    url: '/main/paramCollection/getPrintOfflineReportInfo',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集详细
export function getParamCollection(id) {
  return request({

 jcdm-ui/src/views/components/offlineQualificationReport.vue

@@ -18,7 +18,7 @@
        <span>产品名称/零部件号：电驱动系统总成/9900200461</span>
      </td>
      <td colspan="4">
        <span>检验日期：2024.9.4</span>
        <span>检验日期：{{printParam.inspectionDate}}</span>
      </td>
      <td colspan="4">
        <span>追溯编号：2409030000032</span>
@@ -260,7 +260,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>＞500</td>
      <td>{{printParam.param18}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -273,7 +273,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>0.3%，0%，0.5%</td>
      <td>{{printParam.param19}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -285,7 +285,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>＞500</td>
      <td>{{printParam.param20}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -297,7 +297,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>＞500</td>
      <td>{{printParam.param21}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -309,7 +309,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>0.22</td>
      <td>{{printParam.param22}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -322,7 +322,7 @@
      <td>A</td>
      <td>定子综合测试仪</td>
      <td>全检</td>
      <td>362</td>
      <td>{{printParam.param23}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -334,7 +334,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>8.18</td>
      <td>{{printParam.param24}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -346,7 +346,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>0.1</td>
      <td>{{printParam.param25}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -360,7 +360,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>21.53,42.33,42.19</td>
      <td>{{printParam.param26}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -373,7 +373,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>49.20,49.34,49.15</td>
      <td>{{printParam.param27}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -385,7 +385,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>0.061%，0.163%，0.223%</td>
      <td>{{printParam.param28}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -397,7 +397,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>35.1,35.0,35.1</td>
      <td>{{printParam.param29}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -409,7 +409,7 @@
      <td>A</td>
      <td>综合测试仪</td>
      <td>全检</td>
      <td>√</td>
      <td>{{printParam.param30}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -422,7 +422,7 @@
      <td>A</td>
      <td>整机综合测试仪</td>
      <td>全检</td>
      <td>0.0041</td>
      <td>{{printParam.param31}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -434,7 +434,7 @@
      <td>A</td>
      <td>气密测试仪</td>
      <td>全检</td>
      <td>3.06</td>
      <td>{{printParam.param32}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -446,7 +446,7 @@
      <td>A</td>
      <td>气密测试仪</td>
      <td>全检</td>
      <td>o.48</td>
      <td>{{printParam.param33}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -458,7 +458,7 @@
      <td>A</td>
      <td>电性能测试仪</td>
      <td>全检</td>
      <td>4.7ｕA</td>
      <td>{{printParam.param34}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -470,7 +470,7 @@
      <td>A</td>
      <td>电性能测试仪</td>
      <td>全检</td>
      <td>562.1</td>
      <td>{{printParam.param35}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -482,7 +482,7 @@
      <td>A</td>
      <td>旋变测试仪</td>
      <td>全检</td>
      <td>-137.1</td>
      <td>{{printParam.param36}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -494,7 +494,7 @@
      <td>A</td>
      <td>EOL测试</td>
      <td>全检</td>
      <td>√</td>
      <td>{{printParam.param37}}</td>
      <td>OK</td>
      <td></td>
      <td></td>
@@ -587,13 +587,12 @@
  props: ['printParam'],
  data() {
    return {
      printData: this.printParam
    }
  },
  created() {
    console.log(this.printData)
  mounted() {
  },
  methods: {

  }

}

 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -3,17 +3,17 @@
    <el-row :gutter="5">
      <el-col :span="7">
        <el-card shadow="never">
          <span class="head-font">工位编号 : {{headContent.processesCode}}</span>
          <span class="head-font">工位编号：{{headContent.processesCode}}</span>
        </el-card>
      </el-col>
      <el-col :span="7">
        <el-card shadow="never">
          <span class="head-font">工位名称 : {{headContent.processesName}}</span>
          <span class="head-font">工位名称：{{headContent.processesName}}</span>
        </el-card>
      </el-col>
      <el-col :span="10">
        <el-card shadow="never">
          <span class="head-font">产品序列号 :</span>
        <el-card shadow="never" body-style="padding: 10px;">
          <span class="head-font">产品序列号：</span>
          <el-input style="width: 50%;" v-model="headContent.sfcCode" placeholder="请输入内容"></el-input>
<!--          <el-button type="primary" id="print" v-print="'#printMe'">打印</el-button>-->
          <el-button type="primary" id="print" v-print="'#printMe'" style="display: none;">打印</el-button>
@@ -31,7 +31,7 @@
            <span slot="label"> <a class="el-icon-date"></a>首页</span>
            <el-col :span="24">
              <div>
                <div id="printMe" class="print_hide">
                <div id="printMe">
                  <offline-qualification-report :printParam="printParam"></offline-qualification-report>
                </div>
              </div>
@@ -54,13 +54,14 @@
import USBDevice from "@/utils/usb.json";
import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {
  addTighteningParameters, enterWeighing,
  addTighteningParameters, enterWeighing, getPrintOfflineReportInfo, listParamCollection,
  replaceAssemblyCode,
  saveCampaignTimeParameters,
  yzAddBasicParameters,
} from "@/api/main/da/paramCollection/paramCollection";
import QRCode from "qrcodejs2";
import OfflineQualificationReport from "@/views/components/offlineQualificationReport.vue";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";

export default {
  name: "stationTerminal",
@@ -68,8 +69,7 @@
  data() {
    return {
      printParam: {
        key: '选项1',
        label: '黄金糕'

      },
      weightValue: '',
      showInput: true,
@@ -159,52 +159,7 @@
    //   this.connectWebsocket();
    // }, 3000);
  },
  mounted() {
    if ("serial" in navigator) {
      this.myserialport = new MySerialPort();
      this.getPorts();
      navigator.serial.addEventListener("connect", (e) => {
        this.$message.success("设备已连接");
        this.getPorts();
      });
      navigator.serial.addEventListener("disconnect", (e) => {
        this.$message.error("设备已断开");
      });
      this.restaurants = this.loadAll();
    } else {
      this.$message.error(
        "当前为HTTP模式或者浏览器版本过低，不支持网页连接串口"
      );
    }
  },
  computed: {
    isDisable() {
      return this.btnType === "danger";
    },
    printContent() {
      return {
        // id: '',
        // id: '#printMe',
        // preview: false,
      }
    }
  },
  methods: {


    enterWeighing(){
      if(this.headContent.sfcCode ==='' || this.weightValue === '' ){
        this.$message.error('参数不全！');
      }else {
        let param = {
          sfcCode: this.headContent.sfcCode,
          weightValue: this.weightValue,
        }
        enterWeighing(param).then(response => {
          this.$message('录入完成！');
        });
      }
    },
    serialLink() {
      this.open1 = true
    },
@@ -222,17 +177,6 @@
      }
    },

    Release(){
      // this.$message('portsList！'+this.portsList.length);
      if(this.btnType === "danger"){
        this.$message('连接了!！');

      }else {
        this.$message('mei连接了！');

      }

    },
    serialPortMethod(value){
      let formulaChildParams = {
        scanBarcode: value,
@@ -310,11 +254,22 @@
    },
    printBefore() {
      if (this.headContent.sfcCode !== '') {
        document.getElementById('print').click();
        listProductionOrde({productNum: this.headContent.sfcCode}).then(response => {
          let rowsData = response.rows[0];
          if(rowsData){
            getPrintOfflineReportInfo({productNum: this.headContent.sfcCode}).then(response => {
              this.printParam = response.data
              document.getElementById('print').click();
            });
          }else {
            this.$message.error('系统没有此工单，请重新扫码！');
          }
        });
      } else {
        alert('请先扫码');
        this.$message.error('请先扫码!');
      }
    },

    // print1() {
    //   if(this.headContent.sfcCode !== ''){
    //     // æ–°å¼€é¡µé¢æ‰“印
@@ -721,5 +676,16 @@
.el-table .success-row {
  background: #f0f9eb;
}

/*隐藏打印区域*/
/*#printMe {*/
/*  display: none;*/
/*}*/
/*!*打印时显示打印区域*!*/
/*@media print {*/
/*  #printMe {*/
/*    display: block;*/
/*  }*/
/*}*/
</style>