yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

生产计划 增加项目变更日期

Browse Source 
生产计划 增加项目变更日期
pull/4/head
siontion 8 months ago
parent 9477f4e68e
commit bc2a6c8098
6 changed files with 176 additions and 134 deletions
Show Stats Download Patch File Download Diff File

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plan/vo/PlanRespVO.java
Unescape View File

@ -128,6 +128,10 @@ public class PlanRespVO {
@ExcelProperty("项目变更次数") @ExcelProperty("项目变更次数")
private Integer changeNum; private Integer changeNum;
@Schema(description = "项目变更日期")
@ExcelProperty("项目变更日期")
private LocalDateTime changeLastDate;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java
Unescape View File

@ -102,6 +102,10 @@ public class PlanDO extends BaseDO {
* 项目变更次数 * 项目变更次数
*/ */
private Integer changeNum; private Integer changeNum;
/**
* 项目变更日期
*/
private String changeLastDate;
@TableField(exist = false) @TableField(exist = false)
private String projectCode; private String projectCode;

59
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/add.vue
Unescape View File

@ -12,6 +12,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -48,15 +49,22 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制人" prop="editor"> <el-form-item label="计划编制人" prop="editor">
<el-input class="!w-265px" placeholder="编制人" v-model="formData.editor" /> <el-input class="!w-265px" placeholder="计划编制人" v-model="formData.editor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制日期" prop="editorDate"> <el-form-item label="计划编制日期" prop="editorDate">
<el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" placeholder="编制日期" /> <el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" placeholder="计划编制日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="80">
<el-form-item label="备注" prop="description" >
<el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -98,15 +106,15 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核人" prop="auditor"> <el-form-item label="计划审核人" prop="auditor">
<el-input class="!w-265px" placeholder="审核人" v-model="formData.auditor" /> <el-input class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核日期" prop="auditDate"> <el-form-item label="计划审核日期" prop="auditDate">
<el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" placeholder="审核日期" /> <el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" placeholder="计划审核日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -149,15 +157,22 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准人" prop="approver"> <el-form-item label="计划批准人" prop="approver">
<el-input class="!w-265px" placeholder="批准人" v-model="formData.approver"/> <el-input class="!w-265px" placeholder="计划批准人" v-model="formData.approver"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准日期" prop="approveDate"> <el-form-item label="计划批准日期" prop="approveDate">
<el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" placeholder="批准日期" /> <el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" placeholder="计划批准日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="生产状态" prop="status" >
<el-input class="!w-265px" v-model="formData.status" disabled value="未开始" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -202,6 +217,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目变更日期" prop="changeLastDate">
<el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x" placeholder="项目变更日期" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目变更次数" prop="changeNum"> <el-form-item label="项目变更次数" prop="changeNum">
@ -214,19 +236,6 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="description" >
<el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产状态" prop="planStatus" >
<el-input class="!w-265px" v-model="formData.planStatus" disabled value="未开始" />
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
</el-form> </el-form>
<div class="text-center hl-footer"> <div class="text-center hl-footer">

64
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
Unescape View File

@ -48,16 +48,24 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制人" prop="editor"> <el-form-item label="计划编制人" prop="editor">
<el-input disabled class="!w-265px" placeholder="编制人" v-model="formData.editor" /> <el-input disabled class="!w-265px" placeholder="计划编制人" v-model="formData.editor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制日期" prop="editorDate"> <el-form-item label="计划编制日期" prop="editorDate">
<el-date-picker disabled class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" <el-date-picker disabled class="!w-265px" v-model="formData.editorDate" type="date" value-format="x"
placeholder="编制日期" /> placeholder="计划编制日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="80">
<el-form-item label="备注" prop="description">
<el-input disabled class="!w-713px" type="textarea" v-model="formData.description" show-word-limit
maxlength="200" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -99,16 +107,16 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核人" prop="auditor"> <el-form-item label="计划审核人" prop="auditor">
<el-input disabled class="!w-265px" placeholder="审核人" v-model="formData.auditor" /> <el-input disabled class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核日期" prop="auditDate"> <el-form-item label="计划审核日期" prop="auditDate">
<el-date-picker disabled class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" <el-date-picker disabled class="!w-265px" v-model="formData.auditDate" type="date" value-format="x"
placeholder="审核日期" /> placeholder="计划审核日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -153,16 +161,26 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准人" prop="approver"> <el-form-item label="计划批准人" prop="approver">
<el-input disabled class="!w-265px" placeholder="批准人" v-model="formData.approver" /> <el-input disabled class="!w-265px" placeholder="计划批准人" v-model="formData.approver" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准日期" prop="approveDate"> <el-form-item label="计划批准日期" prop="approveDate">
<el-date-picker disabled class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" <el-date-picker disabled class="!w-265px" v-model="formData.approveDate" type="date" value-format="x"
placeholder="批准日期" /> placeholder="计划批准日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="生产状态" prop="status">
<el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -210,6 +228,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目变更日期" prop="changeLastDate">
<el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x" placeholder="项目变更日期" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目变更次数" prop="changeNum"> <el-form-item label="项目变更次数" prop="changeNum">
@ -223,21 +248,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="description">
<el-input disabled class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产状态" prop="status">
<el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled >
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<el-card class="hl-card-info"> <el-card class="hl-card-info">

80
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
Unescape View File

@ -12,6 +12,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -48,16 +49,24 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制人" prop="editor"> <el-form-item label="计划编制人" prop="editor">
<el-input class="!w-265px" placeholder="编制人" v-model="formData.editor" /> <el-input class="!w-265px" placeholder="计划编制人" v-model="formData.editor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="编制日期" prop="editorDate"> <el-form-item label="计划编制日期" prop="editorDate">
<el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" <el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x"
placeholder="编制日期" /> placeholder="计划编制日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="80">
<el-form-item label="备注" prop="description">
<el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit
maxlength="200" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -99,16 +108,16 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核人" prop="auditor"> <el-form-item label="计划审核人" prop="auditor">
<el-input class="!w-265px" placeholder="审核人" v-model="formData.auditor" /> <el-input class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="审核日期" prop="auditDate"> <el-form-item label="计划审核日期" prop="auditDate">
<el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" <el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x"
placeholder="审核日期" /> placeholder="计划审核日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -153,16 +162,26 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准人" prop="approver"> <el-form-item label="计划批准人" prop="approver">
<el-input class="!w-265px" placeholder="批准人" v-model="formData.approver" /> <el-input class="!w-265px" placeholder="计划批准人" v-model="formData.approver" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="批准日期" prop="approveDate"> <el-form-item label="计划批准日期" prop="approveDate">
<el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" <el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x"
placeholder="批准日期" /> placeholder="计划批准日期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="生产状态" prop="status">
<el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -210,6 +229,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="项目变更日期" prop="changeLastDate">
<el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x"
placeholder="项目变更日期" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目变更次数" prop="changeNum"> <el-form-item label="项目变更次数" prop="changeNum">
@ -223,21 +250,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="description">
<el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产状态" prop="status">
<el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled >
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<el-card class="hl-card-info"> <el-card class="hl-card-info">
@ -252,11 +264,12 @@
<el-table :data="formData.projectOrderSubs" class="hl-table"> <el-table :data="formData.projectOrderSubs" class="hl-table">
<el-table-column label="序号" type="index" width="80" fixed /> <el-table-column label="序号" type="index" width="80" fixed />
<el-table-column prop="name" label="子项目名称" min-width="120" align="center" fixed /> <el-table-column prop="name" label="子项目名称" min-width="120" align="center" fixed />
<el-table-column prop="projectSubShortName" min-width="150" align="center" :rules="subFormRules.projectSubShortName" > <el-table-column prop="projectSubShortName" min-width="150" align="center">
<template #header>子项目简称</template> <template #header><span class="hl-table_header">*</span>子项目简称</template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.projectSubShortName`" class="mb-0px!"> <el-form-item :prop="`${$index}.projectSubShortName`" :rules="subFormRules.projectSubShortName" class="mb-0px!">
<el-input v-model="row.projectSubShortName" placeholder="子项目简称" @change="(name)=>handleSubCode(row,name)" /> <el-input v-model="row.projectSubShortName" placeholder="子项目简称"
@change="(name) => handleSubCode(row, name)" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -265,7 +278,8 @@
<template #header> 模具类型 </template> <template #header> 模具类型 </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`${scope.$index}.mouldId`" class="mb-0px!"> <el-form-item :prop="`${scope.$index}.mouldId`" class="mb-0px!">
<el-select v-model="scope.row.mouldId" clearable placeholder="下拉选择" @change="(mid)=>handleMouldType(scope,mid)" style="width: 100%"> <el-select v-model="scope.row.mouldId" clearable placeholder="下拉选择"
@change="(mid) => handleMouldType(scope, mid)" style="width: 100%">
<el-option v-for="dict in mouldTypeList" :key="dict.id" :label="dict.name" :value="dict.id" /> <el-option v-for="dict in mouldTypeList" :key="dict.id" :label="dict.name" :value="dict.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -507,7 +521,7 @@ const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => {
} }
const handleSubCode = (row, name) => { const handleSubCode = (row, name) => {
row.projectSubCode = formData.value.projectCode+'-'+customerInit.value.code + '-'+ name row.projectSubCode = name.length==0?"" : (formData.value.projectCode + '-' + customerInit.value.code + '-' + name)
} }
const handleMouldType = async (scope, mid) => { const handleMouldType = async (scope, mid) => {

7
sql/v1.3.0/1.structure.sql
Unescape View File

@ -82,8 +82,8 @@ CREATE TABLE `project_plan` (
`craft_start_date` datetime DEFAULT NULL COMMENT '工艺开始日期', `craft_start_date` datetime DEFAULT NULL COMMENT '工艺开始日期',
`craft_end_date` datetime DEFAULT NULL COMMENT '工艺结束日期', `craft_end_date` datetime DEFAULT NULL COMMENT '工艺结束日期',
`craft_content` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '工艺流程数组信息[{''id'':1,''sdate'':'''',''edate'':'''',''owner'':'''',''description'':''''}]', `craft_content` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '工艺流程数组信息[{''id'':1,''sdate'':'''',''edate'':'''',''owner'':'''',''description'':''''}]',
`editor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '编辑人', `editor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '编制人',
`editor_date` datetime DEFAULT NULL COMMENT '编辑日期', `editor_date` datetime DEFAULT NULL COMMENT '编制日期',
`auditor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '审核人', `auditor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '审核人',
`audit_date` datetime DEFAULT NULL COMMENT '审核日期', `audit_date` datetime DEFAULT NULL COMMENT '审核日期',
`approver` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '批准人', `approver` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '批准人',
@ -91,6 +91,7 @@ CREATE TABLE `project_plan` (
`description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`status` tinyint(1) DEFAULT '1' COMMENT '状态,1未开始，2生产中，3已完成，4已终止 ，默认是1', `status` tinyint(1) DEFAULT '1' COMMENT '状态,1未开始，2生产中，3已完成，4已终止 ，默认是1',
`change_num` int(11) DEFAULT NULL COMMENT '项目变更次数', `change_num` int(11) DEFAULT NULL COMMENT '项目变更次数',
`change_last_date` datetime DEFAULT NULL COMMENT '项目变更日期',
`creator` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', `creator` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', `updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
@ -123,4 +124,4 @@ CREATE TABLE `project_plan_sub` (
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
`tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号', `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='生产计划子项目表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='生产计划子项目表';
Write Preview
Loading…
Cancel
Save