From 0ae9acad17724f5da4bfd68250ae2b5f3aefd188 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 18 一月 2024 13:56:46 +0800
Subject: [PATCH] add prepareOnline
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java | 32 ++++++++
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 14 +++
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java | 17 ++++
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 24 ++++--
jcdm-ui/src/api/main/bs/prepareOnline/prepareOnline.js | 10 ++
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 2
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java | 12 ++
jcdm-ui/src/views/main/kb/prepareOnline/index.vue | 81 ++++++++++++++++++++
8 files changed, 181 insertions(+), 11 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java
new file mode 100644
index 0000000..a81f799
--- /dev/null
+++ b/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;
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java
new file mode 100644
index 0000000..05be5aa
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java
index 3c83ec0..11a711b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java
+++ b/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 璁㈠崟鎺掍骇
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 53aa72b..83b3669 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/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);
+ }
/**
* 鏂板璁㈠崟鎺掍骇
*
diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index 71466b5..d64a55c 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/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=",">
diff --git a/jcdm-ui/src/api/main/bs/prepareOnline/prepareOnline.js b/jcdm-ui/src/api/main/bs/prepareOnline/prepareOnline.js
new file mode 100644
index 0000000..d502f42
--- /dev/null
+++ b/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
+ })
+}
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 7097c32..1027de8 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -241,7 +241,7 @@
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
this.queryParams.productCode = val;
listFormulaChild(this.queryParams).then(response => {
- // this.tableData = [];
+ this.tableData = [];
this.tableData = response.rows;
console.log(response.rows)
this.$nextTick(() => {
diff --git a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
new file mode 100644
index 0000000..e6328b4
--- /dev/null
+++ b/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>
--
Gitblit v1.9.3