add 合箱上线

wujian

2024-01-20 b849f1f5004bbad8f47bea2f4471e6ff699fe73c

add 合箱上线

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -41,7 +41,7 @@
    @GetMapping("/list")
    public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
    {
        startPage();
//        startPage();
        List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
        return getDataTable(list);
    }

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

@@ -1,44 +1,64 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
        <el-form-item label-width="120" label="工艺流程编码" prop="routeCode">
    <el-card class="box-card" >
      <el-form :model="queryParams.orderNo" ref="queryForm" :inline="true" label-width="68px" >
        <el-form-item label-width="120" label="工单编号:" prop="orderNo">
          <el-input
            v-model="queryParams.routeCode"
            placeholder="请输入工艺流程编码"
            v-model="queryParams.orderNo"
            placeholder="请输入工单编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item style="float: right">
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-form-item style="margin-left: 20px">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
        </el-form-item>
        <el-form-item style="margin-left: 360px">
          <el-checkbox-group v-model="queryParams.isRepairFlag">
            <el-checkbox  name="type"></el-checkbox>
          </el-checkbox-group>
        </el-form-item>
        <el-form-item label-width="120" label="返修发动机号:" prop="engineNo" style="margin-left: 5px">

          <el-input
            :disabled="!queryParams.isRepairFlag"
            v-model="queryParams.engineNo"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>


      </el-form>
    </el-card>
    <el-row :gutter="0">
      <el-col :span="18">
        <div style="height: 490px; overflow: auto">
          <el-card style="margin-top: 10px" class="box-card">
            <el-table border v-loading="loading" :data="dataList" height="490"
      <el-col :span="20">
        <div style="height: 490px;">
          <el-card style="margin-top: 10px; height: 490px; " class="box-card">
            <el-table border v-loading="loading" :data="dataList" height="460"
                      style="width: 100%" v-if="dataList.length > 0">
              <el-table-column type="selection" width="55" align="center" />
              <el-table-column :show-overflow-tooltip='true' label="工单编号" width="130" align="center" prop="orderNo">

              <el-table-column :show-overflow-tooltip='true' label="工单编号" width="230" align="center" prop="orderNo">
              </el-table-column>
              <el-table-column  :show-overflow-tooltip='true' label="产品小系列" width="130" align="center" prop="model">
              <el-table-column  :show-overflow-tooltip='true' label="产品小系列" width="230" align="center" prop="model">
              </el-table-column>
              <el-table-column label="SN流水号" width="180" align="center" prop="engineNo">
              <el-table-column :show-overflow-tooltip='true' label="SN流水号" width="230" align="center" prop="engineNo">
              </el-table-column>
              <el-table-column label="状态" width="80" align="center" prop="productionStatus">
<!--                <template slot-scope="scope">-->
<!--                  <span v-if="scope.row.productionStatus === '1'">是</span>-->
<!--                  <span v-if="scope.row.productionStatus === '0'">否</span>-->
<!--                </template>-->
                <template slot-scope="scope">
                  <span v-if="scope.row.whetherOrPrint === '1'">是</span>
                  <span v-if="scope.row.whetherOrPrint === '0'">否</span>
                  <dict-tag :options="dict.type.order_scheduling_produce_status" :value="scope.row.productionStatus"/>
                </template>
              </el-table-column>
              <el-table-column label="是否打印" align="center" prop="whetherOrPrint">
              <el-table-column label="是否打印" width="80"  align="center" prop="whetherOrPrint">

                <template slot-scope="scope">
                  <span v-if="scope.row.whetherOrPrint === '1'">是</span>
                  <span v-if="scope.row.whetherOrPrint === '0'">否</span>
                  <dict-tag :options="dict.type.print_status" :value="scope.row.whetherOrPrint"/>
                </template>

              </el-table-column>
              <el-table-column label="打印时间" align="center" prop="null">
              </el-table-column>
@@ -50,9 +70,19 @@
        </div>

      </el-col>
      <el-col :span="6">
      <el-col :span="4">
        <el-card style="margin-top: 10px; min-height: 490px" class="box-card">
          <div style="min-width: 180px;min-height: 185px">
            <vue-qr
              v-if="qrCode !==''"
              ref="qrCode"
              :text="qrCode"
              width="180"
              height="180"
            ></vue-qr>
          </div>

          <el-button type="success" style="margin-top: 190px; margin-left: 50px; width: 100px">系统设置</el-button>
        </el-card>
      </el-col>
    </el-row>
@@ -66,19 +96,18 @@
import VueQr from 'vue-qr'
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
  dicts: ['sys_normal_disable','order_scheduling_produce_status','print_status'],
  components: {
    VueQr,
  },
  data(){
    return{
      qrCode: '',
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        routeCode: null,
        routeName: null,
        productCode: null,
        productName: null,
        status: null,
        dataSource: null,
        orderNo: '',
        isRepairFlag: '',
        engineNo: ''
      },
      dataList: []
    }
@@ -86,13 +115,23 @@
  methods:{
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    getList(){
      listOrderScheduling(this.queryParams).then(response => {
        console.log("--------------------"+response.rows)
        this.dataList = response.rows
        if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){
          this.qrCode = ''
        }else {
          if (this.dataList.length > 0){
            this.qrCode = this.queryParams.orderNo
          }else {
            this.qrCode = ''
          }
        }
        console.log("qrcode",this.qrCode)

      });
    },
    filterTag(value, row) {
@@ -101,7 +140,8 @@
    filterHandler(value, row, column) {
      const property = column['property'];
      return row[property] === value;
    }
    },

  },
  mounted() {
    this.getList()
@@ -110,5 +150,10 @@
</script>

<style scoped>

::v-deep .el-form-item__label{
  font-size: large;
}
::v-deep .el-card__body{
  padding: 15px 20px 0px 20px;
}
</style>