下片添加显示扫码枪玻璃信息，添加下片任务状态

ZengTao

2024-09-05 75c5e7ac09345c5ee636e16f1d54e903b9ef0859

下片添加显示扫码枪玻璃信息，添加下片任务状态

 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue

@@ -1,26 +1,30 @@
<script setup>
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
import {useI18n} from 'vue-i18n'
import {ElMessage} from 'element-plus'
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
import { useRouter } from "vue-router"
import { useI18n } from 'vue-i18n'
import { ElMessage } from 'element-plus'
import request from "@/utils/request";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {host, WebSocketHost} from '@/utils/constants'
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { host, WebSocketHost } from '@/utils/constants'
import PrintFlow from "@/views/UnLoadGlass/PrintFlow.vue";
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
import PrintLabel from "@/views/UnLoadGlass/PrintCustomLabelSemi1.vue";

const router = useRouter()
const {t} = useI18n()
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const printLoading = ref(true)
const fullFlowCard = ref('')
const autoPrint = ref(false)
const takeGlass = ref([])
const scanGlass = ref([])


const dialogFormVisiblea = ref(false)
const dialogFormVisiblea2 = ref(false)
const dialogFormVisibleaDownGlass = ref(false)
const dialogFormVisibleaDownGlasss = ref(false)
// 数据
const loading = ref(false);
// 弹框显示控制
@@ -42,7 +46,7 @@
const printLayer = ref('')
const now = new Date();
const timeRange = ref([])
const browser=ref(false)
const browser = ref(false)

const handleChange = async () => {
  console.log("触发开关")
@@ -65,14 +69,14 @@
    console.error(error);
  }
}
const confirmBrowser = () =>{
const confirmBrowser = () => {
  if (/chrome|chromium/i.test(navigator.userAgent) && !/edg/i.test(navigator.userAgent)) {
    browser.value=true
} else if (/edg/i.test(navigator.userAgent)) {
  browser.value=false
} else {
  browser.value=false
}
    browser.value = true
  } else if (/edg/i.test(navigator.userAgent)) {
    browser.value = false
  } else {
    browser.value = false
  }
}

const handleInputChangea = (value, rowId) => {
@@ -98,7 +102,7 @@
    if (response.code === 200) {

      flowCardOptions.value = response.data.filter(item => item !== null)
          .map(item => ({flowcard_id: item.flow_card_id}));
        .map(item => ({ flowcard_id: item.flow_card_id }));
      console.log(flowCardOptions.value);
    }
    else {
@@ -143,7 +147,7 @@
const handleBindRack2 = (row) => {
  workstationId.value = row.workstationId; // 假设rackNumber是架号字段的属性名
  dialogFormVisiblea2.value = true; // 打开绑定架子对话框
  workFlowCard.value=row.flowCardId;
  workFlowCard.value = row.flowCardId;
};
//清除内容
const handleclear = async () => {
@@ -158,8 +162,8 @@
      console.log('清除成功');
      ElMessage.success(response.message);
      dialogFormVisiblea2.value = false;
      if(fullFlowCard.value==workFlowCard.value){
        fullFlowCard.value="";
      if (fullFlowCard.value == workFlowCard.value) {
        fullFlowCard.value = "";
      }
    } else if (response.code === 500) {
      // 清除失败的逻辑
@@ -209,9 +213,15 @@
  if (data.autoPrint != null) {
    autoPrint.value = data.autoPrint[0];
  }
  if (data.takeGlass != null) {
    takeGlass.value = data.takeGlass[0];
  }
  if (data.scanGlass != null) {
    scanGlass.value = data.scanGlass[0];
  }

  //自动打印
  if (fullFlowCard.value == ""&&autoPrint.value==true&&browser.value==true) {
  if (fullFlowCard.value == "" && autoPrint.value == true && browser.value == true) {
    for (let i = 0; i < tableData.length; i++) {
      if (tableData[i].totalQuantity != 0) {
        if (tableData[i].totalQuantity == tableData[i].racksNumber + tableData[i].otherNumber && fullFlowCard.value != tableData[i].flowCardId) {
@@ -225,7 +235,7 @@
      }
    }
  }
  if(data.params!=null){
  if (data.params != null) {
    tableData.splice(0, tableData.length, ...data.params[0]);
  }

@@ -304,19 +314,19 @@
  printLayer.value = row.layer
  dialogTableVisible.value = true;
  setTimeout(() => {
    printFlowCard(); 
    printFlowCard();
    dialogTableVisible.value = false;
  }, 2000);
}
const open1 = async (row) => {

printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
dialogTableVisible1.value = true;
setTimeout(() => {
  printFlowCard1(); 
  //dialogTableVisible1.value = false;
}, 1000);
  printFlowCardId.value = row.flowCardId;
  printLayer.value = row.layer
  dialogTableVisible1.value = true;
  setTimeout(() => {
    printFlowCard1();
    //dialogTableVisible1.value = false;
  }, 1000);
}

const printFlowCard = () => {
@@ -334,22 +344,22 @@

  // 样式控制与打印无关的元素隐藏
  let style = doc.createElement("style");
  console.log("style1:"+style.innerHTML)
  console.log("style1:" + style.innerHTML)
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none;}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 10mm 5mm 10mm 5mm; " +
      "  }body>:not(#" +
      printId +
      "){display:none !important;}body>#" +
      printId +
      "{display:block;}#" +
      printId +
      "{display: block; padding: 0; margin: 0;  width: 100%;  position: absolute; top: 0; left: 0; height: 100vh;  box-sizing: border-box;}} ";
      
    "body>#" +
    printId +
    "{display:none;}@media print{" +
    "@page {" +
    "    size: auto; " +
    "    margin: 10mm 5mm 10mm 5mm; " +
    "  }body>:not(#" +
    printId +
    "){display:none !important;}body>#" +
    printId +
    "{display:block;}#" +
    printId +
    "{display: block; padding: 0; margin: 0;  width: 100%;  position: absolute; top: 0; left: 0; height: 100vh;  box-sizing: border-box;}} ";

  content.innerHTML = el.outerHTML;
  // // console.log("el.outerHTML", el.outerHTML);
  body.appendChild(style);
@@ -378,17 +388,17 @@
  // 样式控制与打印无关的元素隐藏
  let style = doc.createElement("style");
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 2mm 2mm 2mm 2mm;  " +
      "  }body>:not(#" +
      printId +
      "){display:none !important}body>#" +
      printId +
      "{display:block;padding-top:1px}}";
    "body>#" +
    printId +
    "{display:none}@media print{" +
    "@page {" +
    "    size: auto; " +
    "    margin: 2mm 2mm 2mm 2mm;  " +
    "  }body>:not(#" +
    printId +
    "){display:none !important}body>#" +
    printId +
    "{display:block;padding-top:1px}}";
  //
  content.innerHTML = el.outerHTML;
  // // console.log("el.outerHTML", el.outerHTML);
@@ -415,24 +425,27 @@
<template>
  <div>
    <el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
               @click="dialogFormVisibleaDownGlass = true">落架详情
      @click="dialogFormVisibleaDownGlass = true">落架详情
    </el-button>
    <el-switch style="margin-top: 10px;margin-left: 15px;margin-bottom: 10px;" v-model="autoPrint" class="mb-2" :inactive-text="$t('自动打印')"
               @change="handleChange"/>
    <el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
      @click="dialogFormVisibleaDownGlasss = true">人工下片
    </el-button>
    <el-switch style="margin-top: 10px;margin-left: 15px;margin-bottom: 10px;" v-model="autoPrint" class="mb-2"
      :inactive-text="$t('自动打印')" @change="handleChange" />
    <el-card style="flex: 1;" v-loading="loading">
      <el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
        <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
          <el-table height="350px" ref="table" @selection-change="handleSelectionChange" :data="tableData"
                    :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
            <el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80"/>
            :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
            <el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
            <el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')"
                             min-width="120"/>
            <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150"/>
              min-width="120" />
            <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
            <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')"
                             min-width="120"/>
            <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120"/>
            <el-table-column prop="layer" align="center" label="层数" min-width="120"/>
            <el-table-column prop="otherNumber" align="center" label="人工下片数" min-width="120"/>
              min-width="120" />
            <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
            <el-table-column prop="layer" align="center" label="层数" min-width="120" />
            <el-table-column prop="otherNumber" align="center" label="人工下片数" min-width="120" />
            <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
            <el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
            <el-table-column align="center" :label="$t('reportWork.startstatus')" min-width="80" prop="enableState">
@@ -445,7 +458,7 @@
            <el-table-column fixed="right" :label="$t('reportWork.operate')" align="center" width="400">
              <template #default="scope">
                <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '已启用'"
                           @click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}
                  @click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}
                </el-button>
                <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear')
                  }}</el-button>
@@ -457,8 +470,7 @@
          </el-table>

        </div>
        <el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%"
                   :title="$t('searchOrder.cageinformation')">
        <el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('落架信息')">
          <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('请选择工位')" clearable>
            <el-option label="全部" value="0"></el-option>
            <el-option label="1" value="1"></el-option>
@@ -471,35 +483,57 @@
          </el-select>

          <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('basicData.plselectproject')" clearable
                     @input="handleInputChangea($event, row.id)">
            <el-option v-for="item in selectOptionsa" :key="item" :label="item" :value="item"/>
            @input="handleInputChangea($event, row.id)">
            <el-option v-for="item in selectOptionsa" :key="item" :label="item" :value="item" />
          </el-select>

          <span class="demonstration">时间段</span>
          <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="开始日期" value-format = "YYYY-MM-DD hh:mm:ss"
                          end-placeholder="结束日期">
          <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="开始日期"
            value-format="YYYY-MM-DD hh:mm:ss" end-placeholder="结束日期">
          </el-date-picker>

          <el-button type="primary" style="margin-left: 10px;" @click="selectDownGlassData()">{{
              $t('reportmanage.inquire')
            }}
        $t('reportmanage.inquire')
      }}
          </el-button>
          <el-table height="200px" ref="table" @selection-change="handleSelectionChange" :data="downGlass"
                    :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
            <el-table-column prop="workStationId" align="center" :label="$t('工位号')" min-width="80"/>
            <el-table-column prop="engineerId" align="center" :label="$t('工程号')" min-width="80"/>
            <el-table-column prop="flowCardId" align="center" :label="$t('流程卡号')" min-width="80"/>
            <el-table-column prop="layer" align="center" :label="$t('层')" min-width="120"/>
            <el-table-column prop="sequence" align="center" :label="$t('顺序')" min-width="150"/>
            <el-table-column prop="width" align="center" :label="$t('宽')" min-width="120"/>
            <el-table-column prop="height" align="center" :label="$t('高')" min-width="120"/>
            <el-table-column prop="Filmsid" align="center" :label="$t('膜系')" min-width="120"/>
            <el-table-column prop="thickness" align="center" label="厚度" min-width="120"/>
            <el-table-column prop="glassId" align="center" :label="$t('玻璃id')" min-width="120"/>

            :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
            <el-table-column prop="workStationId" align="center" :label="$t('工位号')" min-width="80" />
            <el-table-column prop="engineerId" align="center" :label="$t('工程号')" min-width="80" />
            <el-table-column prop="flowCardId" align="center" :label="$t('流程卡号')" min-width="80" />
            <el-table-column prop="layer" align="center" :label="$t('层')" min-width="120" />
            <el-table-column prop="sequence" align="center" :label="$t('顺序')" min-width="150" />
            <el-table-column prop="width" align="center" :label="$t('宽')" min-width="120" />
            <el-table-column prop="height" align="center" :label="$t('高')" min-width="120" />
            <el-table-column prop="Filmsid" align="center" :label="$t('膜系')" min-width="120" />
            <el-table-column prop="thickness" align="center" label="厚度" min-width="120" />
            <el-table-column prop="glassId" align="center" :label="$t('玻璃id')" min-width="120" />
          </el-table>
        </el-dialog>

        <el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('人工下片信息')">
          <div style="display:flex;justify-content: space-around;">
            <el-card style="display: flex; justify-content: center; align-items: center; width:800px; height: 800px;">
              <div
                :style="{ width: takeGlass.width + 'px', height: takeGlass.height + 'px', backgroundColor: '#e1f3d8', transform: 'scale(' + 800 / (takeGlass.width > takeGlass.height ? takeGlass.width : takeGlass.height) + ')' }">
                <div style="font-size: 50px; text-align: center;">
                  <div>{{ takeGlass.flowCardId }}</div>
                  <div>{{ takeGlass.width }}</div>
                  <div>{{ takeGlass.height }}</div>
                </div>
              </div>
            </el-card>
            <el-card style="display: flex; justify-content: center; align-items: center; width: 800px; height: 800px;">
              <div
                :style="{ width: scanGlass.width + 'px', height: scanGlass.height + 'px', backgroundColor: '#e1f3d8', transform: 'scale(' + 800 / (scanGlass.width > scanGlass.height ? scanGlass.width : scanGlass.height) + ')' }">
                <div style="font-size: 50px; text-align: center;">
                  <div>{{ scanGlass.flowCardId }}</div>
                  <div>{{ scanGlass.width }}</div>
                  <div>{{ scanGlass.height }}</div>
                </div>
              </div>
            </el-card>
          </div>
        </el-dialog>
      </el-card>
      <!-- workstationId: '1',
    workstationId: '1005',
@@ -529,7 +563,7 @@
          <el-form-item :label="$t('reportWork.cardnumbera')" :required="true" style="width: 25vw;">
            <el-select v-model="flowCardId" :placeholder="$t('reportWork.incardnumber')">
              <el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id"
                         :value="item.flowcard_id"/>
                :value="item.flowcard_id" />
            </el-select>
          </el-form-item>
        </el-form>
@@ -556,13 +590,12 @@
    </template>
  </el-dialog>

  <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" destroy-on-close >
  <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" destroy-on-close>
    <print-flow id="child" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
                style="width: 100%;height: 100%"/>
      style="width: 100%;height: 100%" />
  </el-dialog>
  <el-dialog id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close >
    <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer"
                style=""/>
  <el-dialog id="sizePrintCalrd1" v-model="dialogTableVisible1" destroy-on-close>
    <print-label id="printFlowCard" :printFlowCardId="printFlowCardId" :printLayer="printLayer" style="" />
  </el-dialog>

</template>

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java

@@ -171,4 +171,13 @@
    public static final Integer SLOT_ON = 1;
    public static final Integer SLOT_OFF = 0;

    /**
     * 下片任务玻璃状态
     * 生成任务0
     * 出片任务2
     */
    public static final Integer UNLOAD_GLASS_CREATE = 0;
    public static final Integer UNLOAD_GLASS_OUT = 1;
    public static final Integer UNLOAD_GLASS_DOWN = 2;

}

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -167,11 +167,10 @@
                new QueryWrapper<DownGlassTask>()

                        .select("Top 1 *")

                        .eq("end_cell", Const.G13_WORK_STATION)

                        .lt("task_status", Const.UNLOAD_GLASS_DOWN)

                        .orderByDesc("id")



        );

        jsonObject4.append("takeGlass", takeGlass);





        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");

        if (sendwServer4 != null) {

@@ -205,21 +204,24 @@


    @Scheduled(fixedDelay = Long.MAX_VALUE)

    public void scanCodeTask() {

        JSONObject jsonObject = new JSONObject();

        while (true) {

            try (Socket socket = new Socket(scanIp, scanPort);

                 BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {

                // 接收服务器响应

                socket.setSoTimeout(1000);

                String response;

                while ((response = in.readLine()) != null) {

                    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");

                    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");

                    if (CollectionUtils.isNotEmpty(sendwServer)) {

                        //按照玻璃id获取玻璃信息返回给前端界面，具体需要哪些数据待确认

                        GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()

                                .eq(GlassInfo::getGlassId, response).last("limit 1"));

                                .eq(GlassInfo::getGlassId, response));

                        if (null == glassInfo) {

                            log.info("按照玻璃id：{}，无法找到玻璃信息", response);

                        } else {

                            sendwServer.get(0).sendMessage(glassInfo.toString());

                            jsonObject.append("scanGlass",glassInfo);

                            sendwServer.get(0).sendMessage(jsonObject.toString());

                        }

                    }

                }