From c9a5c5c9a57abee05470e958e4dc161809f73cf4 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期五, 12 一月 2024 09:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 62 ++++++++++++++++++-------------
jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java | 12 +++---
jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml | 12 +++---
jcdm-ui/src/views/main/em/equipmentArchives/index.vue | 4 +-
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 13 ++++++
jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml | 7 +++
6 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
index 7c1d0d5..2edf9f0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
@@ -56,7 +56,7 @@
/** 宸ュ簭缂栫爜 */
@Excel(name = "宸ュ簭缂栫爜")
- private String processes;
+ private String processesCode;
/** 璁惧鐘舵�� */
@Excel(name = "璁惧鐘舵��")
@@ -176,14 +176,14 @@
{
return lineCode;
}
- public void setProcesses(String processes)
+ public void setProcessesCode(String processesCode)
{
- this.processes = processes;
+ this.processesCode = processesCode;
}
- public String getProcesses()
+ public String getProcessesCode()
{
- return processes;
+ return processesCode;
}
public void setStatus(String status)
{
@@ -262,7 +262,7 @@
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopCode", getWorkshopCode())
.append("lineCode", getLineCode())
- .append("processes", getProcesses())
+ .append("processesCode", getProcessesCode())
.append("status", getStatus())
.append("remark", getRemark())
.append("createUser", getCreateUser())
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index 6a51915..ea3c884 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -145,6 +145,8 @@
/** 浜у搧鍏徃缂栫爜 */
@Excel(name = "浜у搧鍏徃缂栫爜")
private String productCompanyCode;
+ @Excel(name = "绉嶇被")
+ private String typeZ;
/** 棰勭暀瀛楁1 */
private String spareField1;
@@ -510,12 +512,23 @@
{
return spareField4;
}
+ public void setTypeZ(String typeZ)
+ {
+ this.typeZ = typeZ;
+ }
+
+ public String getTypeZ()
+ {
+ return typeZ;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("workOrderNo", getWorkOrderNo())
+ .append("typeZ", getTypeZ())
.append("salesOrderCode", getSalesOrderCode())
.append("productCode", getProductCode())
.append("productName", getProductName())
diff --git a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
index b3342ef..43292df 100644
--- a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
@@ -15,7 +15,7 @@
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopCode" column="workshop_code" />
<result property="lineCode" column="line_code" />
- <result property="processes" column="processes" />
+ <result property="processesCode" column="processes_code" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createUser" column="create_user" />
@@ -29,7 +29,7 @@
</resultMap>
<sql id="selectEmEquipmentArchivesVo">
- select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
+ select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes_code, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
</sql>
<select id="selectEmEquipmentArchivesList" parameterType="EmEquipmentArchives" resultMap="EmEquipmentArchivesResult">
@@ -44,7 +44,7 @@
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
- <if test="processes != null and processes != ''"> and processes = #{processes}</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -73,7 +73,7 @@
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="lineCode != null">line_code,</if>
- <if test="processes != null">processes,</if>
+ <if test="processesCode != null">processes_code,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createUser != null">create_user,</if>
@@ -96,7 +96,7 @@
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="lineCode != null">#{lineCode},</if>
- <if test="processes != null">#{processes},</if>
+ <if test="processesCode != null">#{processesCode},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createUser != null">#{createUser},</if>
@@ -122,7 +122,7 @@
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="lineCode != null">line_code = #{lineCode},</if>
- <if test="processes != null">processes = #{processes},</if>
+ <if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createUser != null">create_user = #{createUser},</if>
diff --git a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
index 5aee192..1345685 100644
--- a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
@@ -43,10 +43,11 @@
<result property="spareField2" column="spare_field_2" />
<result property="spareField3" column="spare_field_3" />
<result property="spareField4" column="spare_field_4" />
+ <result property="typeZ" column="type_z" />
</resultMap>
<sql id="selectOmProductionOrdeInfoVo">
- select id, work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from om_production_orde_info
+ select id, work_order_no, sales_order_code,type_z, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from om_production_orde_info
</sql>
<select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
@@ -65,6 +66,7 @@
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
<if test="custom != null and custom != ''"> and custom like concat('%', #{custom}, '%')</if>
<if test="marketAreaCode != null and marketAreaCode != ''"> and market_area_code like concat('%', #{marketAreaCode}, '%')</if>
+ <if test="typeZ != null and typeZ != ''"> and type_z like concat('%', #{typeZ}, '%')</if>
<if test="softwareVersionCode != null and softwareVersionCode != ''"> and software_version_code like concat('%', #{softwareVersionCode}, '%')</if>
<if test="productCompanyCode != null and productCompanyCode != ''"> and product_company_code like concat('%', #{productCompanyCode}, '%')</if>
</where>
@@ -81,6 +83,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="workOrderNo != null">work_order_no,</if>
+ <if test="typeZ != null">type_z,</if>
<if test="salesOrderCode != null">sales_order_code,</if>
<if test="productCode != null">product_code,</if>
<if test="productName != null">product_name,</if>
@@ -121,6 +124,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="workOrderNo != null">#{workOrderNo},</if>
+ <if test="typeZ != null">#{typeZ},</if>
<if test="salesOrderCode != null">#{salesOrderCode},</if>
<if test="productCode != null">#{productCode},</if>
<if test="productName != null">#{productName},</if>
@@ -166,6 +170,7 @@
<if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="productCode != null">product_code = #{productCode},</if>
+ <if test="typeZ != null">type_z = #{typeZ},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="lineCode != null">line_code = #{lineCode},</if>
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index c3dd8e1..db4bb36 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -217,7 +217,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
createUser: null,
updateUser: null,
@@ -295,7 +295,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
remark: null,
createUser: null,
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 5c5df66..7628926 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -159,6 +159,18 @@
@click="moveUp(val => val, 'down')"
>涓嬬Щ</el-button>
</el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['om:productionOrde:add']"
+ >鐢熸垚</el-button>
+ </el-col>
+
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -176,6 +188,8 @@
<el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="160" align="center" prop="productName">
+ </el-table-column>
+ <el-table-column label="绉嶇被" width="160" align="center" prop="typeZ">
</el-table-column>
<el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
<template slot-scope="scope">
@@ -225,31 +239,20 @@
<el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 -->
- <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">寮�濮�</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">鍐荤粨</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">瑙ｅ喕</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">鍏抽棴</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">鍚敤</el-button>
-<!-- <el-button-->
-<!-- :disabled="scope.row.orderStatus !== '1'"-->
-<!-- size="mini"-->
-<!-- type="success"-->
-<!-- style="width: 72px"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['om:productionOrde:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- <el-button-->
-<!-- :disabled="scope.row.orderStatus !== '1'"-->
-<!-- size="mini"-->
-<!-- type="warning"-->
-<!-- style="width: 72px"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['om:productionOrde:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">瀹屾垚</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">鍚敤</el-button>
+ <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">
+ 寮�濮�</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">
+ 鍐荤粨</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">
+ 瑙ｅ喕</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">
+ 鍏抽棴</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
+ 鍚敤</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">
+ 瀹屾垚</el-button>
+ <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
+ 鍚敤</el-button>
</template>
</el-table-column>
</el-table>
@@ -285,6 +288,9 @@
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-input v-model="form.typeZ" disabled placeholder="璇疯緭鍏ョ绫�" />
</el-form-item>
<el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
<el-select style="width: 93%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="璇烽�夋嫨杞﹂棿缂栧彿">
@@ -426,6 +432,7 @@
productCompanyCode: null,
frontEndId: 0,
idNums: null,
+ typeZ: null,
flag: null,
},
@@ -482,7 +489,9 @@
let productCode = obj.materialCode;
this.form.productCode = productCode;
this.form.productName = obj.materialName;
- this.queryParams.productCode = productCode
+ this.form.typeZ = obj.typeZ;
+ this.queryParams.productCode = productCode;
+ this.queryParams.typeZ = typeZ
listTechnologyRoute(this.queryParams).then(response => {
this.form.routeCode = response.rows[0].routeCode;
});
@@ -561,6 +570,7 @@
spareField1: null,
spareField2: null,
spareField3: null,
+ typeZ: null,
spareField4: null
};
this.resetForm("form");
--
Gitblit v1.9.3