-bug修改

admin

2024-07-30 c1da6d36b8133744017a4f1c5e97821b591f02fc

-bug修改

 jcdm-admin/src/main/resources/application-druid.yml

@@ -21,8 +21,8 @@
                url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm042-Mes
                username: sa
#                password: JCDM@2023
#                password: admin@123
                password: 1!deshine
                password: admin@123
#                password: 1!deshine
#                password: 123456



 jcdm-ui/src/assets/images/a8963a24920640508e96150a053fc41.png

 jcdm-ui/src/views/login.vue

@@ -77,6 +77,8 @@
    return {
      codeUrl: "",
      loginForm: {
        // username: "RGGW",
        // password: "123456",
        username: "admin",
        password: "admin123",
        rememberMe: false,

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

@@ -31,26 +31,29 @@
              <div>
                <div style="display: none" id="printMe">
                  <br>
                  <p style="margin-left: 43px">9900166410</p>
                  <p style="margin-left: 43px">HW001.001</p>
                  <p style="margin-left: 43px">SW002.005</p>
                  <p style="margin-left: 43px">{{printInfoData.partNumber}}</p>
                  <p style="margin-left: 43px">{{printInfoData.hardwareVersion}}</p>
                  <p style="margin-left: 43px">{{printInfoData.softwareVersion}}</p>
                  <br>
                  <span style="font-size: 30px;font-weight: bold;margin-left: 40px;">GEELY</span><br>
                  <span style="font-size: 10px;margin-left: 29px">COMMERCIAL VEHICLE</span><br>
                  <span style="margin-left: 60px">H2155D</span><br>
                  <span style="margin-left: 63px">993083</span><br>
                  <span style="margin-left: 40px">9900166410</span><br>
                  <span style="font-size: 10px;margin-left: 17px;">{{text1}}</span>
                  <br>
<!--                  <span style="font-size: 30px;font-weight: bold;margin-left: 40px;">GEELY</span><br>-->
                  <img style="width: 140px;height: 20px;margin-left: 25px" :src="require('@/assets/images/a8963a24920640508e96150a053fc41.png')">
                  <span style="margin-left: 60px">{{printInfoData.printModel}}</span><br>
                  <span style="margin-left: 63px">{{printInfoData.supplierCode}}</span><br>
                  <span style="margin-left: 40px">{{printInfoData.partNumber}}</span><br>
                  <span style="font-size: 10px;margin-left: 17px;">{{text1}}</span><br>
                  <span style="font-size: 10px;margin-left: 52px">MADE IN CHINA</span><br>
                  <br>
                  <br>
                  <br>
                  <div ref="canvasWrapper" id="canvasWrapper1" style="display: flex;justify-content: center;margin-top: -27px;"></div>
                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>
                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>
<!--                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{// printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>-->
                  <br>
                  <br>
                  <div ref="canvasWrapper" id="canvasWrapper2" style="display: flex;justify-content: center;margin-top: -27px"></div>
                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>
                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>
<!--                  <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P{{printInfoData.partNumber}}#T{{text1}}#V{{printInfoData.supplierCode}}#S{{// printInfoData.softwareVersion}}#H{{printInfoData.hardwareVersion}}#NBMS#</span>-->
                </div>
                <el-button @click="print1">打印</el-button>
                <el-button style="display: none" @click="test1">生成二维码</el-button>
@@ -223,11 +226,19 @@
  yzAddBasicParameters,
} from "@/api/main/da/paramCollection/paramCollection";
import QRCode from "qrcodejs2";
import {listEquipmentArchives} from "@/api/main/em/equipmentArchives/equipmentArchives";

export default {
  name: "stationTerminal",
  data() {
    return {
      printInfoData: {
        softwareVersion: 'SW001.001', //软件版本号
        hardwareVersion: 'HW001.001', //硬件版本号
        printModel: 'H2155D', //型号
        partNumber: '9900200136', //零部件号
        supplierCode: '993983', //供应商编码
      },
      weightValue: '',
      showInput: true,
      serialPortContent: '',
@@ -343,6 +354,15 @@
    },
  },
  methods: {
    initializePrintInfoData(){
      listEquipmentArchives().then(response => {
        this.printInfoData.softwareVersion = response.rows[0].equipmentCode
        this.printInfoData.hardwareVersion = response.rows[0].equipmentName
        this.printInfoData.supplierCode = response.rows[0].equipmentSpec
        this.printInfoData.printModel = response.rows[0].equipmentBrand
        this.printInfoData.partNumber = response.rows[0].equipmentTypeName
      });
    },
    enterWeighing(){
      if(this.headContent.sfcCode ==='' || this.weightValue === '' ){
        this.$message.error('参数不全！');
@@ -473,7 +493,7 @@
        let qrCode = new QRCode('canvasWrapper1',{
          width: 120,
          height: 120,
          text: 'P9900166410#T'+ this.text1 +'#V993983#SSW002.005#HHW001.001#NBMS#',
          text: 'P'+this.printInfoData.partNumber+'#T'+ this.text1 +'#V'+this.printInfoData.supplierCode+'#S'+this.printInfoData.softwareVersion+'#H'+this.printInfoData.hardwareVersion+'#NBMS#',
          colorDark: '#000',
          colorLight: '#fff'
        })
@@ -486,7 +506,7 @@
          let qrCode = new QRCode('canvasWrapper2',{
            width: 120,
            height: 120,
            text: 'P9900166410#T'+ this.text1 +'#V993983#SSW002.005#HHW001.001#NBMS#',
            text: 'P'+this.printInfoData.partNumber+'#T'+ this.text1 +'#V'+this.printInfoData.supplierCode+'#S'+this.printInfoData.softwareVersion+'#H'+this.printInfoData.hardwareVersion+'#NBMS#',
            colorDark: '#000',
            colorLight: '#fff'
          })
@@ -524,7 +544,10 @@
    },

    initStation: async function () {

      await getIpv4().then(response => {
        this.initializePrintInfoData();

        this.StationConfQueryParams.ipAddress = response.msg
        console.log('查询到本工位IP为' + this.StationConfQueryParams.ipAddress)
      });

 jcdm-ui/src/views/main/em/equipmentArchives/index.vue

@@ -1,104 +1,104 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="设备编码" prop="equipmentCode">
            <el-input
              v-model="queryParams.equipmentCode"
              placeholder="请输入设备编码"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="设备名称" prop="equipmentName">
            <el-input
              v-model="queryParams.equipmentName"
              placeholder="请输入设备名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="状态" prop="status">
            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
              <el-option
                v-for="dict in dict.type.sys_normal_disable"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
    </el-card>
<!--    <el-card class="box-card">-->
<!--        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
<!--          <el-form-item label="设备编码" prop="equipmentCode">-->
<!--            <el-input-->
<!--              v-model="queryParams.equipmentCode"-->
<!--              placeholder="请输入设备编码"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="设备名称" prop="equipmentName">-->
<!--            <el-input-->
<!--              v-model="queryParams.equipmentName"-->
<!--              placeholder="请输入设备名称"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="状态" prop="status">-->
<!--            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.sys_normal_disable"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
<!--          <el-form-item style="float: right">-->
<!--            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
<!--            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
<!--          </el-form-item>-->
<!--        </el-form>-->
<!--    </el-card>-->

    <el-card style="margin-top: 10px" class="box-card">
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              @click="handleAdd"
              v-hasPermi="['em:equipmentArchives:add']"
            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="success"
              plain
              icon="el-icon-edit"
              size="mini"
              :disabled="single"
              @click="handleUpdate"
              v-hasPermi="['em:equipmentArchives:edit']"
            >修改</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="danger"
              plain
              icon="el-icon-delete"
              size="mini"
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['em:equipmentArchives:remove']"
            >删除</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-download"
              size="mini"
              @click="handleExport"
              v-hasPermi="['em:equipmentArchives:export']"
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
<!--        <el-row :gutter="10" class="mb8">-->
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="primary"-->
<!--              plain-->
<!--              icon="el-icon-plus"-->
<!--              size="mini"-->
<!--              @click="handleAdd"-->
<!--              v-hasPermi="['em:equipmentArchives:add']"-->
<!--            >新增</el-button>-->
<!--          </el-col>-->
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="success"-->
<!--              plain-->
<!--              icon="el-icon-edit"-->
<!--              size="mini"-->
<!--              :disabled="single"-->
<!--              @click="handleUpdate"-->
<!--              v-hasPermi="['em:equipmentArchives:edit']"-->
<!--            >修改</el-button>-->
<!--          </el-col>-->
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="danger"-->
<!--              plain-->
<!--              icon="el-icon-delete"-->
<!--              size="mini"-->
<!--              :disabled="multiple"-->
<!--              @click="handleDelete"-->
<!--              v-hasPermi="['em:equipmentArchives:remove']"-->
<!--            >删除</el-button>-->
<!--          </el-col>-->
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="warning"-->
<!--              plain-->
<!--              icon="el-icon-download"-->
<!--              size="mini"-->
<!--              @click="handleExport"-->
<!--              v-hasPermi="['em:equipmentArchives:export']"-->
<!--            >导出</el-button>-->
<!--          </el-col>-->
<!--          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!--        </el-row>-->

        <el-table border v-loading="loading" :data="equipmentArchivesList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
          <el-table-column label="设备名称" align="center" prop="equipmentName"/>
          <el-table-column label="状态" align="center" prop="status" width="80">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
            </template>
          </el-table-column>
          <el-table-column label="工序编号" align="center" prop="processesCode"/>
          <el-table-column label="品牌" align="center" prop="equipmentBrand"/>
          <el-table-column label="规格型号" align="center" prop="equipmentSpec"/>
          <el-table-column label="车间编码" align="center" prop="workshopCode"/>
          <el-table-column label="产线编码" align="center" prop="lineCode"/>
          <el-table-column label="设备状态" align="center" prop="status"/>
          <el-table-column label="创建时间" width="160" align="center" prop="createTime"/>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
          <el-table-column label="软件版本号" align="center" prop="equipmentCode"/>
          <el-table-column label="硬件版本号" align="center" prop="equipmentName"/>
<!--          <el-table-column label="状态" align="center" prop="status" width="80">-->
<!--            <template slot-scope="scope">-->
<!--              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--          <el-table-column label="工序编号" align="center" prop="processesCode"/>-->
          <el-table-column label="型号" align="center" prop="equipmentBrand"/>
          <el-table-column label="供应商编码" align="center" prop="equipmentSpec"/>
          <el-table-column label="零部件号" align="center" prop="equipmentTypeName"/>
<!--          <el-table-column label="产线编码" align="center" prop="lineCode"/>-->
<!--          <el-table-column label="设备状态" align="center" prop="status"/>-->
<!--          <el-table-column label="创建时间" width="160" align="center" prop="createTime"/>-->
          <el-table-column  width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
@@ -109,15 +109,15 @@
                @click="handleUpdate(scope.row)"
                v-hasPermi="['em:equipmentArchives:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['em:equipmentArchives:remove']"
              >删除</el-button>
<!--              <el-button-->
<!--                size="mini"-->
<!--                type="danger"-->
<!--                plain-->
<!--                style="width: 72px"-->
<!--                icon="el-icon-delete"-->
<!--                @click="handleDelete(scope.row)"-->
<!--                v-hasPermi="['em:equipmentArchives:remove']"-->
<!--              >删除</el-button>-->
            </template>
          </el-table-column>
        </el-table>
@@ -137,61 +137,61 @@
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="设备编码" prop="equipmentCode">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="软件版本号" prop="equipmentCode">
          <el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
        </el-form-item>
        <el-form-item label="设备名称" prop="equipmentName">
        <el-form-item label="硬件版本号" prop="equipmentName">
          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="工序编号" prop="processesCode">
          <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="请选择工序编号">
            <el-option
              v-for="item in processesCodeoptions"
              :key="item.index"
              :label="item.processesCode"
              :value="item.processesCode">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="品牌" prop="equipmentBrand">
<!--        <el-form-item label="状态" prop="status">-->
<!--          <el-radio-group v-model="form.status">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.sys_normal_disable"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="工序编号" prop="processesCode">-->
<!--          <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="请选择工序编号">-->
<!--            <el-option-->
<!--              v-for="item in processesCodeoptions"-->
<!--              :key="item.index"-->
<!--              :label="item.processesCode"-->
<!--              :value="item.processesCode">-->
<!--            </el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item label="型号" prop="equipmentBrand">
          <el-input v-model="form.equipmentBrand" placeholder="请输入品牌" />
        </el-form-item>
        <el-form-item label="设备类型" prop="equipmentTypeName">
        <el-form-item label="零部件号" prop="equipmentTypeName">
          <el-input v-model="form.equipmentTypeName" placeholder="请输入设备类型名称" />
        </el-form-item>
        <el-form-item label="规格型号" prop="equipmentSpec">
        <el-form-item label="供应商编码" prop="equipmentSpec">
          <el-input v-model="form.equipmentSpec" placeholder="请输入规格型号" />
        </el-form-item>
        <el-form-item label="车间编号" prop="workshopCode">
          <el-select style="width: 100%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="请选择车间编号">
            <el-option
              v-for="item in options"
              :key="item.workshopCode"
              :label="item.workshopName"
              :value="item.workshopCode">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item  label="产线编号" prop="lineCode">
          <el-select style="width: 100%" v-model="form.lineCode" placeholder="请选择产线编号">
            <el-option
              v-for="item in lineOptions"
              :key="item.lineCode"
              :label="item.lineName"
              :value="item.lineCode">
            </el-option>
          </el-select>
        </el-form-item>
<!--        <el-form-item label="车间编号" prop="workshopCode">-->
<!--          <el-select style="width: 100%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="请选择车间编号">-->
<!--            <el-option-->
<!--              v-for="item in options"-->
<!--              :key="item.workshopCode"-->
<!--              :label="item.workshopName"-->
<!--              :value="item.workshopCode">-->
<!--            </el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
<!--        <el-form-item  label="产线编号" prop="lineCode">-->
<!--          <el-select style="width: 100%" v-model="form.lineCode" placeholder="请选择产线编号">-->
<!--            <el-option-->
<!--              v-for="item in lineOptions"-->
<!--              :key="item.lineCode"-->
<!--              :label="item.lineName"-->
<!--              :value="item.lineCode">-->
<!--            </el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>

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

@@ -425,7 +425,7 @@
      let formulaChildParams = {
        scanBarcode: value,
        sfcBarcode: this.headContent.module,
        // workOrderNo: this.workpieceInformation.workOrderNo,
        // workOrderNo: '-',
        productCode: 'PE01B',
        locationCode: this.headContent.processesCode,
        collectionTime: new Date()
@@ -633,7 +633,8 @@
            productCode: "PE01B",
            locationCode: self.headContent.processesCode,
            productBarcode: self.headContent.module,
            inboundTime: self.workpieceInformation.inboundTime
            inboundTime: self.workpieceInformation.inboundTime,
            workOrderNo: '-'
          }
          jrmSaveCampaignTimeParameters(param).then(response => {});
          self.cakeLamp.release = 1;