Merge remote-tracking branch 'origin/master'

cl

2024-08-16 258a1467940bef026c72055452f9818bae26d3d0

Merge remote-tracking branch 'origin/master'

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

@@ -420,6 +420,8 @@
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SNCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(11).build());
            }else{
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(12).build());
            }

        } catch (Exception e) {

 jcdm-ui/package.json

@@ -58,6 +58,7 @@
    "vue-cropper": "0.5.5",
    "vue-meta": "2.4.0",
    "vue-print-nb": "^1.7.5",
    "vue-qr": "^4.0.9",
    "vue-router": "3.4.9",
    "vuedraggable": "2.24.3",
    "vuex": "3.6.0"

 jcdm-ui/src/views/main/bs/workshop/index.vue

@@ -29,8 +29,9 @@
      <div>
        <div id="printMe">
          <div ref="canvasWrapper" id="canvasWrapper"></div>
          <p>1111</p>
          <p>P9900166410#T2342325325235235#V993983#SSW002.005#HHW001.001#NMCU#</p>
        </div>
        <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
        <el-button @click="print">打印</el-button>
        <el-button @click="test1">生成二维码</el-button>
      </div>
@@ -176,15 +177,19 @@
</template>

<script>
import VueQr from "vue-qr";
import QRCode from 'qrcodejs2'
import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/main/bs/workshop/workshop";

export default {
  components: {
    VueQr
  },
  name: "Workshop",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      text: '1234',
      text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#',
      select: '',
      // 遮罩层
      loading: true,
@@ -257,8 +262,8 @@
      document.getElementById('canvasWrapper').innerHTML = '';
      this.$nextTick(() => {
        let qrCode = new QRCode('canvasWrapper',{
          width: 50,
          height: 50,
          width: 83,
          height: 83,
          text: this.text,
          colorDark: '#000',
          colorLight: '#fff'

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

@@ -139,7 +139,7 @@
                 </div>
               </div>
               <div style="margin-top: 2px;margin-left: 80px">
                 <span style="font-size: 29px;">湖州智芯动力发展有限公司</span>
                 <span style="font-size: 26px;">湖州智芯动力系统发展有限公司</span>
               </div>


@@ -166,26 +166,30 @@
                 </div>
               </div>

               <div style="margin-top: 61px;display: flex;margin-left: 45px">
                 <div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>
                 <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
                        <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
               <div style="margin-top: 61px;display: flex;margin-left: 48px">
                 <div style="width: 30%;flex: 1">
                   <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
                 </div>
                 <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
                        <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
                          P9900166410#T{{headContent.sfcCode}}
                        </span><br>
                   <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
                   <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
                          #V993983#SSW002.005#HHW001.001#NMCU
                        </span>
                   <!--                      <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>-->
                 </div>
               </div>

               <div style="margin-top: 48px;display: flex;margin-left: 45px">
                 <div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>
                 <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
                        <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
               <div style="margin-top: 48px;display: flex;margin-left: 48px">
                 <div style="width: 30%;flex: 1">
                   <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
                 </div>
                 <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
                        <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
                          P9900166410#T{{headContent.sfcCode}}
                        </span><br>
                   <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
                   <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
                          #V993983#SSW002.005#HHW001.001#NMCU
                        </span>
                   <!--                      <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>-->
@@ -276,11 +280,16 @@
} from "@/api/main/da/paramCollection/paramCollection";
import {addFormula} from "@/api/main/bs/formula/formula";
import QRCode from "qrcodejs2";
import VueQr from "vue-qr";

export default {
  components: {
    VueQr
  },
  name: "stationTerminal",
  data() {
    return {
      text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#',
      materialCode: '', // 物料编码
      carCode: '',
      showInput: false,
@@ -553,8 +562,9 @@
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
          this.cakeLamp.InPlace = 1
          this.test1()
          this.test2()
          // this.test1()
          // this.test2()
          this.text = 'P9900166410#T'+this.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
        }
      });
    },
@@ -701,8 +711,9 @@

          //打印
          if(self.headContent.processesCode === "OP165"){
            self.test1()
            self.test2()
            // self.test1()
            // self.test2()
            self.text = 'P9900166410#T'+self.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
          }

        }else if (event.data.includes("[")) {//拧紧