Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-18 ee8c6f62e8556fbd3b20912a7bec5d167004d0a5

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.jcdm.main.bs.orderScheduling.Query;

import lombok.Data;

@Data
public class PrepareOnlineQuery {

    /**
     * å·¥å•ç¼–号
     */
    private String orderNo;

    /**
     * è¿”修发送机号
     */
    private String engineNo;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.jcdm.main.bs.orderScheduling.controller;


import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.page.TableDataInfo;
import com.jcdm.main.bs.orderScheduling.Query.PrepareOnlineQuery;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.service.impl.BsOrderSchedulingServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
@RequestMapping("/bs/prepareOnline")
public class PrepareOnlineController extends BaseController {

    @Autowired
    private BsOrderSchedulingServiceImpl bsOrderSchedulingService;


//    @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody PrepareOnlineQuery prepareOnlineQuery)
    {
        List<BsOrderScheduling> list = bsOrderSchedulingService.getPrepareOnlineList(prepareOnlineQuery);
        return getDataTable(list);
    }
}

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java

@@ -1,7 +1,9 @@
package com.jcdm.main.bs.orderScheduling.mapper;

import java.util.List;
import com.jcdm.main.bs.orderScheduling.Query.PrepareOnlineQuery;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;

import java.util.List;

/**
 * è®¢å•æŽ’产Mapper接口
@@ -28,6 +30,14 @@
    public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling);

    /**
     * æŸ¥è¯¢åˆç®±ä¸Šçº¿åˆ—表
     *
     * @param prepareOnlineQuery è®¢å•æŽ’产
     * @return åˆç®±ä¸Šçº¿åˆ—表
     */
    public List<BsOrderScheduling> getPrepareOnlineList(PrepareOnlineQuery prepareOnlineQuery);

    /**
     * æ–°å¢žè®¢å•æŽ’产
     * 
     * @param bsOrderScheduling è®¢å•æŽ’产

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java

@@ -1,15 +1,14 @@
package com.jcdm.main.bs.orderScheduling.service.impl;

import java.util.List;

import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.orderScheduling.Query.PrepareOnlineQuery;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;

import java.util.List;

/**
 * è®¢å•æŽ’产Service业务层处理
@@ -18,7 +17,7 @@
 * @date 2024-01-13
 */
@Service
public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService 
public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService
{
    @Autowired
    private BsOrderSchedulingMapper bsOrderSchedulingMapper;
@@ -52,6 +51,15 @@
        return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
    }


    /**
     * æŸ¥è¯¢åˆç®±ä¸Šçº¿åˆ—表
     * @param prepareOnlineQuery
     * @return list
     */
    public List<BsOrderScheduling> getPrepareOnlineList(PrepareOnlineQuery prepareOnlineQuery){
        return bsOrderSchedulingMapper.getPrepareOnlineList(prepareOnlineQuery);
    }
    /**
     * æ–°å¢žè®¢å•æŽ’产
     * 

 jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml

@@ -76,7 +76,19 @@
        <include refid="selectBsOrderSchedulingVo"/>
        where id = #{id}
    </select>
        
    <select id="getPrepareOnlineList" resultType="com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling">
        select bos.* from bs_order_scheduling bos
        <where>
            <if test="prepareOnlineQuery.orderNo != null and prepareOnlineQuery.orderNo != '' ">
                and bos.order_no = #{prepareOnlineQuery.orderNo}
            </if>
            <if test="prepareOnlineQuery.engineNo != null and prepareOnlineQuery.engineNo != '' ">
                and bos.engine_no = #{prepareOnlineQuery.engineNo}
            </if>
        </where>
    </select>


    <insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
        insert into bs_order_scheduling
        <trim prefix="(" suffix=")" suffixOverrides=",">

 jcdm-ui/package.json

@@ -41,7 +41,7 @@
    "clipboard": "2.0.8",
    "core-js": "3.25.3",
    "echarts": "5.4.0",
    "element-ui": "2.15.13",
    "element-ui": "^2.15.13",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",
    "highlight.js": "9.18.5",

 jcdm-ui/src/api/main/bs/prepareOnline/prepareOnline.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
import request from '@/utils/request'

// æŸ¥è¯¢åˆ—表
export function listTechnologyRoute(query) {
  return request({
    url: '/bs/technologyRoute/list',
    method: 'get',
    params: query
  })
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
<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-input
            v-model="queryParams.routeCode"
            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>
      </el-form>
    </el-card>
    <el-card style="margin-top: 10px" class="box-card">
      <el-table border v-loading="loading" :data="dataList" 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">
          <template slot-scope="scope">
            <router-link :to="{path: '/main/route-data/index/', query: {routeCode: scope.row.routeCode,routeId: scope.row.id} }" class="link-type">
              <span>{{ scope.row.routeCode }}</span>
            </router-link>
          </template>
        </el-table-column>
        <el-table-column  :show-overflow-tooltip='true' label="产品小系列" width="130" align="center" prop="routeName">
        </el-table-column>
        <el-table-column label="SN流水号" width="130" align="center" prop="productCode">
        </el-table-column>
        <el-table-column label="状态" width="160" align="center" prop="productName">
        </el-table-column>
        <el-table-column label="是否打印" align="center" prop="version">
        </el-table-column>
        <el-table-column label="打印时间" align="center" prop="status">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
          </template>
        </el-table-column>
      </el-table>
      <el-empty v-else>
        <span slot="description">暂无数据</span>
      </el-empty>
    </el-card>
  </div>
</template>

<script>
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
  data(){
    return{
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        routeCode: null,
        routeName: null,
        productCode: null,
        productName: null,
        status: null,
        dataSource: null,
      },
      dataList: []
    }
  },
  methods:{
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
  }
}
</script>

<style scoped>

</style>