From 23213c63022ee4dd7f4d8f678838865f01e9b2df Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 19 一月 2024 11:06:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-ui/src/views/main/bs/technologyRoute/index.vue | 4 ++
jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml | 12 +++++
jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue | 40 ++++++++++++++++----
jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java | 25 ++++++++++++
4 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
index dcb3daf..736590c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
@@ -25,7 +25,12 @@
/** 宸ヨ壓娴佺▼鍚嶇О */
@Excel(name = "宸ヨ壓娴佺▼鍚嶇О")
private String routeName;
+ @Excel(name = "浜х嚎缂栧彿")
+ private String lineCode;
+ /** 浜х嚎鍚嶇О */
+ @Excel(name = "浜х嚎鍚嶇О")
+ private String lineName;
/** 浜у搧缂栫爜 */
@Excel(name = "浜у搧缂栫爜")
private String productCode;
@@ -74,6 +79,24 @@
public Long getId()
{
return id;
+ }
+ public void setLineCode(String lineCode)
+ {
+ this.lineCode = lineCode;
+ }
+
+ public String getLineCode()
+ {
+ return lineCode;
+ }
+ public void setLineName(String lineName)
+ {
+ this.lineName = lineName;
+ }
+
+ public String getLineName()
+ {
+ return lineName;
}
public void setRouteCode(String routeCode)
{
@@ -199,6 +222,8 @@
.append("id", getId())
.append("routeCode", getRouteCode())
.append("routeName", getRouteName())
+ .append("lineCode", getLineCode())
+ .append("lineName", getLineName())
.append("productCode", getProductCode())
.append("productName", getProductName())
.append("version", getVersion())
diff --git a/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
index 6dad025..c18d1e1 100644
--- a/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id" />
<result property="routeCode" column="route_code" />
<result property="routeName" column="route_name" />
+ <result property="lineCode" column="line_code" />
+ <result property="lineName" column="line_name" />
<result property="productCode" column="product_code" />
<result property="productName" column="product_name" />
<result property="version" column="version" />
@@ -25,7 +27,7 @@
</resultMap>
<sql id="selectBsTechnologyRouteInfoVo">
- select id, route_code, route_name, product_code, product_name, version, status, data_source, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_info
+ select id, route_code, route_name, line_code, line_name , product_code, product_name, version, status, data_source, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_info
</sql>
<select id="selectBsTechnologyRouteInfoList" parameterType="BsTechnologyRouteInfo" resultMap="BsTechnologyRouteInfoResult">
@@ -36,6 +38,8 @@
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="lineCode != null and lineCode != ''"> and line_code like concat('%', #{lineCode}, '%')</if>
+ <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
<if test="dataSource != null and dataSource != ''"> and data_source like concat('%', #{dataSource}, '%')</if>
</where>
</select>
@@ -50,6 +54,8 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="routeCode != null and routeCode != ''">route_code,</if>
+ <if test="lineCode != null and lineCode != ''">line_code,</if>
+ <if test="lineName != null and lineName != ''">line_name,</if>
<if test="routeName != null">route_name,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productName != null">product_name,</if>
@@ -70,6 +76,8 @@
<if test="id != null">#{id},</if>
<if test="routeCode != null and routeCode != ''">#{routeCode},</if>
<if test="routeName != null">#{routeName},</if>
+ <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
+ <if test="lineName != null and lineName != ''">#{lineName},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productName != null">#{productName},</if>
<if test="version != null">#{version},</if>
@@ -91,6 +99,8 @@
update bs_technology_route_info
<trim prefix="SET" suffixOverrides=",">
<if test="routeCode != null and routeCode != ''">route_code = #{routeCode},</if>
+ <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
+ <if test="lineName != null and lineName != ''">line_name = #{lineName},</if>
<if test="routeName != null">route_name = #{routeName},</if>
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productName != null">product_name = #{productName},</if>
diff --git a/jcdm-ui/src/views/main/bs/technologyRoute/index.vue b/jcdm-ui/src/views/main/bs/technologyRoute/index.vue
index 12ef123..f1be242 100644
--- a/jcdm-ui/src/views/main/bs/technologyRoute/index.vue
+++ b/jcdm-ui/src/views/main/bs/technologyRoute/index.vue
@@ -227,6 +227,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ lineCode: null,
+ lineName: null,
routeCode: null,
routeName: null,
productCode: null,
@@ -276,6 +278,8 @@
id: null,
routeCode: null,
routeName: null,
+ lineCode: null,
+ lineName: null,
productCode: null,
productName: null,
version: null,
diff --git a/jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue b/jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
index 0a22f6c..ed644c8 100644
--- a/jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
@@ -193,21 +193,27 @@
<el-form-item label="娴佺▼缂栫爜">
<el-input v-model="queryRouteCode" :disabled="true" />
</el-form-item>
-<!-- <el-form-item label="宸ュ簭缂栫爜" prop="processesCode">-->
+ <el-form-item label="宸ュ簭缂栫爜" prop="processesCode">
<!-- <el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">-->
-<!-- <el-input v-model="form.processesName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />-->
-<!-- </el-form-item>-->
- <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
- <el-select style="width: 100%" v-model="form.processesCode" placeholder="璇烽�夋嫨">
+ <el-select style="width: 100%" @change="handleSelectChange(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨">
<el-option
v-for="item in options"
:key="item.processesCode"
- :label="item.processesName"
+ :label="item.processesCode"
:value="item.processesCode">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+ <el-input disabled v-model="form.processesName" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+<!-- <el-select style="width: 100%" v-model="form.processesCode" placeholder="璇烽�夋嫨">-->
+<!-- <el-option-->
+<!-- v-for="item in options"-->
+<!-- :key="item.processesCode"-->
+<!-- :label="item.processesName"-->
+<!-- :value="item.processesCode">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item label="鍔犲伐椤哄簭" prop="stepNo">
<el-input v-model="form.stepNo" placeholder="璇疯緭鍏ュ姞宸ラ『搴�" />
@@ -260,6 +266,7 @@
import { listProcesses} from "@/api/main/bs/processes/processes";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import { listTechnologyRouteChild, getTechnologyRouteChild, delTechnologyRouteChild, addTechnologyRouteChild, updateTechnologyRouteChild } from "@/api/main/bs/technologyRouteChild/technologyRouteChild";
+import {listProductBom} from "@/api/main/bs/ProductBom/ProductBom";
export default {
name: "TechnologyRouteChild",
@@ -298,6 +305,14 @@
keyProcessesFlag: null,
routeCode: undefined,
},
+ ProcessesqueryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ processesCode: null,
+ processesName: null,
+ keyProcessesFlag: null,
+ routeCode: undefined,
+ },
headerInformationData:{
routeCode: "",
routeName: "",
@@ -326,8 +341,17 @@
this.getList();
this.headerInformation();
this.getProcesses();
+ this.initProcesses();
},
methods: {
+
+ handleSelectChange(selectedOption) {
+ this.ProcessesqueryParams.processesCode = selectedOption;
+ listProcesses(this.ProcessesqueryParams).then(response => {
+ this.form.processesName = response.rows[0].processesName;
+ });
+ },
+
getProcesses() {
listProcesses(null).then(response => {
this.options = response.rows;
--
Gitblit v1.9.3