打印bug优化

admin

2024-08-12 4280d7277bc0f9b5c3dfad6d59d833aa89294f69

打印bug优化

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

@@ -94,13 +94,16 @@
//        }
        Integer stepNumber = 1;
        try {
            List<BsFormulaChildInfo> op260 = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode()));
            List<BsFormulaChildInfo> filteredList = op260.stream()
                    .filter(obj -> obj.getResults() != null && !obj.getResults().isEmpty())
                    .collect(Collectors.toList());
            if(filteredList.size() > 0){
                stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1;
            }
//            List<BsFormulaChildInfo> op260 = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
//                    .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
//                    .eq(BsFormulaChildInfo::getOperationType, "1")
//            );
//            List<BsFormulaChildInfo> filteredList = op260.stream()
//                    .filter(obj -> obj.getResults() != null && !obj.getResults().isEmpty())
//                    .collect(Collectors.toList());
//            if(filteredList.size() > 0){
//                stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1;
//            }

            String thoroughfare = Constants.thoroughfareMap.get(bsFormulaChildInfo.getLocationCode());//获取通道
            String str = thoroughfare+"."+bsFormulaChildInfo.getProcessesCode()+".MESScrew";

 jcdm-ui/package.json

@@ -57,6 +57,7 @@
    "vue-count-to": "1.0.13",
    "vue-cropper": "0.5.5",
    "vue-meta": "2.4.0",
    "vue-print-nb": "^1.7.5",
    "vue-router": "3.4.9",
    "vuedraggable": "2.24.3",
    "vuex": "3.6.0"

 jcdm-ui/src/main.js

@@ -38,6 +38,8 @@
// 字典数据组件
import DictData from '@/components/DictData'
import './router/directives.js';
import Print from 'vue-print-nb';


// 全局方法挂载
Vue.prototype.getDicts = getDicts
@@ -62,6 +64,7 @@
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
Vue.use(Print);
DictData.install()

/**

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

@@ -14,7 +14,9 @@
      <el-col :span="10">
        <el-card shadow="never">
          <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span>
          <el-button @click="print1">打印</el-button>
<!--          <el-button @click="print1">打印</el-button>-->
          <el-button id="print" v-print="'#printMe'" type="primary">打印</el-button>


          <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">串口连接</el-button>
          <el-button @click="clearClick" style="float: right" type="danger" size="mini">清除</el-button>
@@ -630,7 +632,11 @@
        this.$message('websocket连接成功！');
      };
      this.ws.onmessage = function (event) {
        if (event.data === "IN") {
        if (event.data === "print") {
          self.$message('postman调用打印方法打印！');
          // self.print1()
          document.getElementById('print').click();
        }else if (event.data === "IN") {
          self.cakeLamp.InPlace = 1;
        } else if (event.data === "IN0") {
          self.cakeLamp.InPlace = 0;

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

@@ -77,7 +77,7 @@
           </el-col>
         </el-row>
         <el-row v-show="orderFlag" style="margin-top: 20px">
           <el-button @click="getWorkOrders" type="warning" size="mini">接收工单</el-button>
<!--           <el-button @click="getWorkOrders" type="warning" size="mini">接收工单</el-button>-->
         </el-row>
       </el-card>

@@ -239,24 +239,24 @@
      this.setFocus();
      this.materialCode="";
    },
    getWorkOrders(){
      if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
        //接收工单
        const param = {
          lineCode: this.headContent.processesCode
        }
        mozuReceivingWorkOrders(param).then(response => {
          this.headContent.sfcCode = response.msg;
          this.queryParams.productNum = response.msg;
          this.getList()
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
          this.cakeLamp.InPlace = 1
        });
      }else {
        this.$message.error("已经有工单了，不能接收！");
      }
    },
    // getWorkOrders(){
    //   if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
    //     //接收工单
    //     const param = {
    //       lineCode: this.headContent.processesCode
    //     }
    //     mozuReceivingWorkOrders(param).then(response => {
    //       this.headContent.sfcCode = response.msg;
    //       this.queryParams.productNum = response.msg;
    //       this.getList()
    //       this.cakeLamp.scanFinish = 1
    //       this.cakeLamp.startWork = 1
    //       this.cakeLamp.InPlace = 1
    //     });
    //   }else {
    //     this.$message.error("已经有工单了，不能接收！");
    //   }
    // },
    serialLink() {
      this.open1 = true
    },
@@ -359,6 +359,7 @@
      });
      this.getListFormulaChild()
      this.workpieceInformation.inboundTime = this.getCurrentTime()

    },

    initializedData(){
@@ -478,6 +479,14 @@
          self.cakeLamp.startWork = 1
          self.cakeLamp.InPlace = 1

          const param = {
            processesCode: self.headContent.processesCode,
            productCode: self.workpieceInformation.productCode
          }
          fistSetpNumber(param).then(response => {
            console.log("fistSetpNumber------"+response.msg)
          });

        }else if (event.data.includes("[")) {//拧紧
          let formulaChilds = "";
          self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);