返修标记

懒羊羊

2024-01-24 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96

返修标记

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

@@ -50,6 +50,17 @@
        return getDataTable(list);
    }

    /**
     * 查询产品过站采集列表
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/noPageList")
    public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
    {
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getProduceNumToday")
    public R getProduceNumToday(String fieldName)

 jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java

@@ -47,6 +47,16 @@
    }

    /**
     * 不分页查询返修记录列表
     */
    @GetMapping("/noPagelist")
    public TableDataInfo noPagelist(RmRepairRecord rmRepairRecord)
    {
        List<RmRepairRecord> list = rmRepairRecordService.selectRmRepairRecordList(rmRepairRecord);
        return getDataTable(list);
    }

    /**
     * 导出返修记录列表
     */
    @PreAuthorize("@ss.hasPermi('rm:repairRecord:export')")

 jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js

@@ -9,6 +9,15 @@
  })
}

// 不分页查询产品过站采集列表
export function noPageList(query) {
  return request({
    url: '/da/passingStationCollection/noPageList',
    method: 'get',
    params: query
  })
}

// 获取首页单日累计量产数据
export function getProduceNumToday(query) {
  return request({

 jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js

@@ -9,7 +9,16 @@
  })
}

// 查询返修记录详细
// 查询返修记录列表
export function noPagelist(query) {
  return request({
    url: '/rm/repairRecord/noPagelist',
    method: 'get',
    params: query
  })
}

// 不分页查询返修记录详细
export function getRepairRecord(id) {
  return request({
    url: '/rm/repairRecord/' + id,

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

@@ -24,40 +24,54 @@
    <el-row>
      <el-col :span="20">
        <el-card style="margin-top: 10px; height: 490px;" class="box-card">
          <el-table border ref="multipleTable" :data="passingStationCollectionList"  @selection-change="handleSelectionChange">
            <el-table-column type="selection" width="55" align="center" />
            <el-table-column label="工单编号" width="120" align="center" prop="workOrderNo">
            </el-table-column>
            <el-table-column label="总成序列号" width="150" align="center" prop="sfcCode">
            </el-table-column>
            <el-table-column label="产品编号" align="center" prop="productCode">
            </el-table-column>
            <el-table-column label="产线编号" align="center" prop="productionLine">
            </el-table-column>
            <el-table-column label="工位编号" align="center" prop="locationCode">
            </el-table-column>
            <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="出站时间" align="center" prop="outboundTime" width="100">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="是否合格" align="center" prop="outRsSign">
            </el-table-column>
            <el-table-column label="NG原因" align="center" prop="outMsgSign">
            </el-table-column>
            <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
              <template slot-scope="scope">
                <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="节拍时间" align="center" prop="beatTime">
            </el-table-column>
          </el-table>
          <el-tabs v-model="activeName" @tab-click="handleClick">
            <el-tab-pane label="过站采集" name="first">
              <el-table max-height="410px" border ref="multipleTable" :data="passingStationCollectionList"  @selection-change="handleSelectionChange">
                <el-table-column type="selection" width="55" align="center" />
                <el-table-column label="工单编号" width="120" align="center" prop="workOrderNo">
                </el-table-column>
                <el-table-column label="总成序列号" width="150" align="center" prop="sfcCode">
                </el-table-column>
                <el-table-column label="产品编号" align="center" prop="productCode">
                </el-table-column>
                <el-table-column label="产线编号" align="center" prop="productionLine">
                </el-table-column>
                <el-table-column label="工位编号" align="center" prop="locationCode">
                </el-table-column>
                <el-table-column label="入站时间" align="center" prop="inboundTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="出站时间" align="center" prop="outboundTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="是否合格" align="center" prop="outRsSign">
                </el-table-column>
                <el-table-column label="NG原因" align="center" prop="outMsgSign">
                </el-table-column>
                <el-table-column label="采集时间" align="center" prop="collectionTime" width="160">
                  <template slot-scope="scope">
                    <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="节拍时间" align="center" prop="beatTime">
                </el-table-column>
              </el-table>
            </el-tab-pane>
            <el-tab-pane label="返修记录" name="second">
              <el-table max-height="410px" border :data="repairRecordList">
                <el-table-column label="发动机号" width="150" align="center" prop="boxCode" />
                <el-table-column label="工位号" align="center" prop="processesCode" />
                <el-table-column label="返修结果" align="center" prop="repairResults" />
                <el-table-column label="原结果" align="center" prop="originalResult" />
                <el-table-column label="返修时间" align="center" width="160" prop="repairTime" />
              </el-table>
            </el-tab-pane>
          </el-tabs>

        </el-card>
      </el-col>
      <el-col :span="4">
@@ -80,34 +94,9 @@
          <el-row class="centered-row">
            <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-date" @click="operationLog" >操 作 日 志</el-button>
          </el-row>



<!--          <el-button type="success" icon="el-icon-close" @click="clearAll">取消选择</el-button>-->
<!--          <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">选择不合格</el-button>-->
<!--          <el-button type="success" icon="el-icon-s-flag" @click="markComplete">标记完成</el-button>-->
<!--          <el-button type="success" icon="el-icon-files" @click="repairRecord">返修记录</el-button>-->
<!--          <el-button type="success" icon="el-icon-date" @click="operationLog" >操作日志</el-button>-->
        </el-card>
      </el-col>
    </el-row>

    <el-dialog v-dialogpop-up :visible.sync="open" width="700px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        返修进度
      </span>
      <el-table border :data="repairRecordList">
        <el-table-column label="发动机号" width="150" align="center" prop="boxCode" />
        <el-table-column label="工位号" align="center" prop="processesCode" />
        <el-table-column label="返修结果" align="center" prop="repairResults" />
        <el-table-column label="原结果" align="center" prop="originalResult" />
        <el-table-column label="返修时间" align="center" width="160" prop="repairTime" />
      </el-table>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>


  </div>
@@ -115,15 +104,17 @@

<script>
import {
  listPassingStationCollection,
  noPageList,
  insertRepairRecordByIds
} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {listRepairRecord} from "@/api/main/rm/repairRecord/repairRecord";
import {noPagelist} from "@/api/main/rm/repairRecord/repairRecord";
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
  data(){
    return{
      activeName: 'first',

      // 返修记录表格数据
      repairRecordList: [],
      // 是否显示弹出层
@@ -136,12 +127,13 @@
        outRsSign: '',
      },
      ids: [],
      allSelected: false
      allSelected: false,
      boxCode: '',

    }
  },
  mounted() {
    this.getList()
    // this.getList()
  },
  methods:{
    // 取消按钮
@@ -189,26 +181,25 @@
      this.multiple = !selection.length
    },
    repairProgressHandleQuery(){
      this.open = true;
      if(this.queryParams.engineNo === ''||this.queryParams.engineNo=== null){
        this.$modal.msgSuccess('请输入发动机号');
      }else {
        /** 查询返修记录列表 */
        let queryParams = {
          boxCode: this.queryParams.engineNo
        }
        listRepairRecord(queryParams).then(response => {
          this.repairRecordList = response.rows;
        });
      this.activeName = 'second'
    },
    initRepairRecord(){
      /** 查询返修记录列表 */
      let queryParams = {
        boxCode: this.queryParams.sfcCode
      }
      noPagelist(queryParams).then(response => {
        this.repairRecordList = response.rows;
      });
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.getList();
      this.initRepairRecord();
    },
    /** 查询产品过站采集列表 */
    getList() {
      listPassingStationCollection(this.queryParams).then(response => {
      noPageList(this.queryParams).then(response => {
        this.passingStationCollectionList = response.rows;
        this.total = response.total;
      });