feat(wms): 增强版本管理界面,添加方案参数功能
在版本管理页面中,新增方案参数的显示和编辑功能。用户可以通过操作按钮对方案点位和参数进行编辑和删除。后端服务也进行了相应的调整,以支持方案参数的增删改查操作。此更新提升了用户在管理方案时的灵活性和便捷性。
This commit is contained in:
@@ -0,0 +1,20 @@
|
|||||||
|
-- 方案参数表
|
||||||
|
CREATE TABLE wms_process_plan_param (
|
||||||
|
param_id BIGINT NOT NULL COMMENT '主键',
|
||||||
|
plan_id BIGINT NOT NULL COMMENT '方案点位ID',
|
||||||
|
param_code VARCHAR(64) NOT NULL COMMENT '参数编码',
|
||||||
|
param_name VARCHAR(200) NOT NULL COMMENT '参数名称',
|
||||||
|
target_value DECIMAL(24, 6) NULL COMMENT '设定值',
|
||||||
|
lower_limit DECIMAL(24, 6) NULL COMMENT '下限',
|
||||||
|
upper_limit DECIMAL(24, 6) NULL COMMENT '上限',
|
||||||
|
unit VARCHAR(32) NULL COMMENT '单位',
|
||||||
|
create_by VARCHAR(64) NULL COMMENT '创建人',
|
||||||
|
create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||||
|
update_by VARCHAR(64) NULL COMMENT '更新人',
|
||||||
|
update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||||
|
del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)',
|
||||||
|
remark VARCHAR(500) NULL COMMENT '备注',
|
||||||
|
PRIMARY KEY (param_id),
|
||||||
|
UNIQUE KEY uk_plan_param_code (plan_id, param_code),
|
||||||
|
KEY idx_plan_param_plan (plan_id)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='方案参数表';
|
||||||
39
klp-ui/src/api/wms/processPlanParam.js
Normal file
39
klp-ui/src/api/wms/processPlanParam.js
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
export function listProcessPlanParam(query) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/processPlanParam/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getProcessPlanParam(paramId) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/processPlanParam/' + paramId,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addProcessPlanParam(data) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/processPlanParam',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateProcessPlanParam(data) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/processPlanParam',
|
||||||
|
method: 'put',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function delProcessPlanParam(paramId) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/processPlanParam/' + paramId,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -58,22 +58,49 @@
|
|||||||
<span>方案点位(版本 {{ selectedVersion.versionCode }})</span>
|
<span>方案点位(版本 {{ selectedVersion.versionCode }})</span>
|
||||||
<el-button style="float: right; padding: 3px 10px" type="primary" size="mini" icon="el-icon-plus" @click="openPlanDialog()">新建方案点位</el-button>
|
<el-button style="float: right; padding: 3px 10px" type="primary" size="mini" icon="el-icon-plus" @click="openPlanDialog()">新建方案点位</el-button>
|
||||||
</div>
|
</div>
|
||||||
<KLPTable v-loading="planLoading" :data="planList">
|
<KLPTable
|
||||||
|
v-loading="planLoading"
|
||||||
|
:data="planList"
|
||||||
|
highlight-current-row
|
||||||
|
@row-click="onPlanRowClick"
|
||||||
|
>
|
||||||
<el-table-column label="段类型" prop="segmentType" width="110" align="center" />
|
<el-table-column label="段类型" prop="segmentType" width="110" align="center" />
|
||||||
<el-table-column label="段名称" prop="segmentName" min-width="100" show-overflow-tooltip align="center" />
|
<el-table-column label="段名称" prop="segmentName" min-width="100" show-overflow-tooltip align="center" />
|
||||||
<el-table-column label="点位名称" prop="pointName" min-width="120" show-overflow-tooltip align="center" />
|
<el-table-column label="点位名称" prop="pointName" min-width="120" show-overflow-tooltip align="center" />
|
||||||
<el-table-column label="点位编码" prop="pointCode" min-width="120" align="center" />
|
<el-table-column label="点位编码" prop="pointCode" min-width="120" align="center" />
|
||||||
<el-table-column label="排序" prop="sortOrder" width="80" align="center" />
|
<el-table-column label="排序" prop="sortOrder" width="80" align="center" />
|
||||||
<el-table-column label="操作" width="140" align="center" fixed="right">
|
<el-table-column label="操作" width="200" align="center" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="mini" @click="openPlanDialog(scope.row)">编辑</el-button>
|
<el-button type="text" size="mini" @click.stop="openPlanDialog(scope.row)">编辑</el-button>
|
||||||
<el-button type="text" size="mini" @click="removePlan(scope.row)">删除</el-button>
|
<el-button type="text" size="mini" @click.stop="removePlan(scope.row)">删除</el-button>
|
||||||
|
<el-button type="text" size="mini" @click.stop="onPlanRowClick(scope.row)">维护参数</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</KLPTable>
|
</KLPTable>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card shadow="never" v-else class="mb8">
|
<el-card shadow="never" v-if="selectedVersion && selectedPlan" class="mb8">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span>方案参数({{ selectedPlan.pointName || selectedPlan.pointCode }})</span>
|
||||||
|
<el-button style="float: right; padding: 3px 10px" type="primary" size="mini" icon="el-icon-plus" @click="openParamDialog()">新建参数</el-button>
|
||||||
|
</div>
|
||||||
|
<KLPTable v-loading="paramLoading" :data="paramList">
|
||||||
|
<el-table-column label="参数编码" prop="paramCode" min-width="100" align="center" />
|
||||||
|
<el-table-column label="参数名称" prop="paramName" min-width="120" show-overflow-tooltip align="center" />
|
||||||
|
<el-table-column label="设定值" prop="targetValue" width="100" align="center" />
|
||||||
|
<el-table-column label="下限" prop="lowerLimit" width="90" align="center" />
|
||||||
|
<el-table-column label="上限" prop="upperLimit" width="90" align="center" />
|
||||||
|
<el-table-column label="单位" prop="unit" width="80" align="center" />
|
||||||
|
<el-table-column label="操作" width="140" align="center" fixed="right">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button type="text" size="mini" @click="openParamDialog(scope.row)">编辑</el-button>
|
||||||
|
<el-button type="text" size="mini" @click="removeParam(scope.row)">删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</KLPTable>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
<el-card v-if="specInfo.specId && !selectedVersion" shadow="never" class="mb8">
|
||||||
<el-empty description="请在上方选择一个规程版本以维护方案点位" />
|
<el-empty description="请在上方选择一个规程版本以维护方案点位" />
|
||||||
</el-card>
|
</el-card>
|
||||||
</template>
|
</template>
|
||||||
@@ -131,6 +158,37 @@
|
|||||||
<el-button @click="planOpen = false">取 消</el-button>
|
<el-button @click="planOpen = false">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<!-- 方案参数 -->
|
||||||
|
<el-dialog :title="paramTitle" :visible.sync="paramOpen" width="560px" append-to-body @close="paramForm = {}">
|
||||||
|
<el-form ref="paramFormRef" :model="paramForm" :rules="paramRules" label-width="100px">
|
||||||
|
<el-form-item label="参数编码" prop="paramCode">
|
||||||
|
<el-input v-model="paramForm.paramCode" maxlength="64" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="参数名称" prop="paramName">
|
||||||
|
<el-input v-model="paramForm.paramName" maxlength="200" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="设定值" prop="targetValue">
|
||||||
|
<el-input v-model="paramForm.targetValue" placeholder="数值" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="下限" prop="lowerLimit">
|
||||||
|
<el-input v-model="paramForm.lowerLimit" placeholder="数值" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="上限" prop="upperLimit">
|
||||||
|
<el-input v-model="paramForm.upperLimit" placeholder="数值" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="单位" prop="unit">
|
||||||
|
<el-input v-model="paramForm.unit" maxlength="32" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="paramForm.remark" type="textarea" rows="2" maxlength="500" show-word-limit />
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button :loading="paramSubmitLoading" type="primary" @click="submitParam">确 定</el-button>
|
||||||
|
<el-button @click="paramOpen = false">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -144,6 +202,7 @@ import {
|
|||||||
activateProcessSpecVersion
|
activateProcessSpecVersion
|
||||||
} from '@/api/wms/processSpecVersion'
|
} from '@/api/wms/processSpecVersion'
|
||||||
import { listProcessPlan, addProcessPlan, updateProcessPlan, delProcessPlan } from '@/api/wms/processPlan'
|
import { listProcessPlan, addProcessPlan, updateProcessPlan, delProcessPlan } from '@/api/wms/processPlan'
|
||||||
|
import { listProcessPlanParam, addProcessPlanParam, updateProcessPlanParam, delProcessPlanParam } from '@/api/wms/processPlanParam'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ProcessSpecVersionManage',
|
name: 'ProcessSpecVersionManage',
|
||||||
@@ -156,6 +215,9 @@ export default {
|
|||||||
selectedVersion: null,
|
selectedVersion: null,
|
||||||
planList: [],
|
planList: [],
|
||||||
planLoading: false,
|
planLoading: false,
|
||||||
|
selectedPlan: null,
|
||||||
|
paramList: [],
|
||||||
|
paramLoading: false,
|
||||||
statusOptions: ['DRAFT', 'PUBLISHED', 'OBSOLETE'],
|
statusOptions: ['DRAFT', 'PUBLISHED', 'OBSOLETE'],
|
||||||
segmentOptions: [
|
segmentOptions: [
|
||||||
{ label: '入口', value: 'INLET' },
|
{ label: '入口', value: 'INLET' },
|
||||||
@@ -182,7 +244,15 @@ export default {
|
|||||||
},
|
},
|
||||||
specPickerId: '',
|
specPickerId: '',
|
||||||
specPickerOptions: [],
|
specPickerOptions: [],
|
||||||
specPickerLoading: false
|
specPickerLoading: false,
|
||||||
|
paramOpen: false,
|
||||||
|
paramTitle: '',
|
||||||
|
paramSubmitLoading: false,
|
||||||
|
paramForm: {},
|
||||||
|
paramRules: {
|
||||||
|
paramCode: [{ required: true, message: '参数编码不能为空', trigger: 'blur' }],
|
||||||
|
paramName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -244,6 +314,8 @@ export default {
|
|||||||
this.versionList = res.rows || []
|
this.versionList = res.rows || []
|
||||||
this.selectedVersion = null
|
this.selectedVersion = null
|
||||||
this.planList = []
|
this.planList = []
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
console.error('加载规程版本失败', e)
|
console.error('加载规程版本失败', e)
|
||||||
@@ -254,13 +326,23 @@ export default {
|
|||||||
},
|
},
|
||||||
onVersionRowClick(row) {
|
onVersionRowClick(row) {
|
||||||
this.selectedVersion = row
|
this.selectedVersion = row
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
this.loadPlans(row.versionId)
|
this.loadPlans(row.versionId)
|
||||||
},
|
},
|
||||||
|
onPlanRowClick(row) {
|
||||||
|
this.selectedPlan = row
|
||||||
|
this.loadParams(row.planId)
|
||||||
|
},
|
||||||
loadPlans(versionId) {
|
loadPlans(versionId) {
|
||||||
if (!versionId) {
|
if (!versionId) {
|
||||||
this.planList = []
|
this.planList = []
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
this.planLoading = true
|
this.planLoading = true
|
||||||
listProcessPlan({ versionId, pageNum: 1, pageSize: 500 })
|
listProcessPlan({ versionId, pageNum: 1, pageSize: 500 })
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
@@ -273,6 +355,23 @@ export default {
|
|||||||
this.planLoading = false
|
this.planLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
loadParams(planId) {
|
||||||
|
if (!planId) {
|
||||||
|
this.paramList = []
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.paramLoading = true
|
||||||
|
listProcessPlanParam({ planId, pageNum: 1, pageSize: 500 })
|
||||||
|
.then((res) => {
|
||||||
|
this.paramList = res.rows || []
|
||||||
|
})
|
||||||
|
.catch((e) => {
|
||||||
|
console.error('加载方案参数失败', e)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.paramLoading = false
|
||||||
|
})
|
||||||
|
},
|
||||||
openVersionDialog(row) {
|
openVersionDialog(row) {
|
||||||
this.versionForm = row
|
this.versionForm = row
|
||||||
? { ...row }
|
? { ...row }
|
||||||
@@ -321,6 +420,8 @@ export default {
|
|||||||
this.$modal.msgSuccess('删除成功')
|
this.$modal.msgSuccess('删除成功')
|
||||||
this.selectedVersion = null
|
this.selectedVersion = null
|
||||||
this.planList = []
|
this.planList = []
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
this.initPage()
|
this.initPage()
|
||||||
}).catch(() => {})
|
}).catch(() => {})
|
||||||
},
|
},
|
||||||
@@ -366,8 +467,74 @@ export default {
|
|||||||
return delProcessPlan(row.planId)
|
return delProcessPlan(row.planId)
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$modal.msgSuccess('删除成功')
|
this.$modal.msgSuccess('删除成功')
|
||||||
|
if (this.selectedPlan && this.selectedPlan.planId === row.planId) {
|
||||||
|
this.selectedPlan = null
|
||||||
|
this.paramList = []
|
||||||
|
}
|
||||||
this.loadPlans(this.selectedVersion.versionId)
|
this.loadPlans(this.selectedVersion.versionId)
|
||||||
}).catch(() => {})
|
}).catch(() => {})
|
||||||
|
},
|
||||||
|
openParamDialog(row) {
|
||||||
|
if (!this.selectedPlan) {
|
||||||
|
this.$modal.msgWarning('请先在上方方案点位表格中选中一行')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.paramForm = row
|
||||||
|
? { ...row }
|
||||||
|
: {
|
||||||
|
planId: this.selectedPlan.planId,
|
||||||
|
paramCode: undefined,
|
||||||
|
paramName: undefined,
|
||||||
|
targetValue: undefined,
|
||||||
|
lowerLimit: undefined,
|
||||||
|
upperLimit: undefined,
|
||||||
|
unit: undefined,
|
||||||
|
remark: undefined
|
||||||
|
}
|
||||||
|
this.paramTitle = row ? '编辑方案参数' : '新建方案参数'
|
||||||
|
this.paramOpen = true
|
||||||
|
this.$nextTick(() => this.$refs.paramFormRef && this.$refs.paramFormRef.clearValidate())
|
||||||
|
},
|
||||||
|
parseDecimal(val) {
|
||||||
|
if (val === undefined || val === null || val === '') {
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
const n = Number(val)
|
||||||
|
return Number.isFinite(n) ? n : undefined
|
||||||
|
},
|
||||||
|
buildParamPayload() {
|
||||||
|
return {
|
||||||
|
...this.paramForm,
|
||||||
|
targetValue: this.parseDecimal(this.paramForm.targetValue),
|
||||||
|
lowerLimit: this.parseDecimal(this.paramForm.lowerLimit),
|
||||||
|
upperLimit: this.parseDecimal(this.paramForm.upperLimit)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
submitParam() {
|
||||||
|
this.$refs.paramFormRef.validate((ok) => {
|
||||||
|
if (!ok) return
|
||||||
|
this.paramSubmitLoading = true
|
||||||
|
const payload = this.buildParamPayload()
|
||||||
|
const req = payload.paramId ? updateProcessPlanParam(payload) : addProcessPlanParam(payload)
|
||||||
|
req
|
||||||
|
.then(() => {
|
||||||
|
this.$modal.msgSuccess('保存成功')
|
||||||
|
this.paramOpen = false
|
||||||
|
this.loadParams(this.selectedPlan.planId)
|
||||||
|
})
|
||||||
|
.catch((e) => console.error('保存方案参数失败', e))
|
||||||
|
.finally(() => {
|
||||||
|
this.paramSubmitLoading = false
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
removeParam(row) {
|
||||||
|
this.$modal.confirm('确认删除该方案参数?').then(() => {
|
||||||
|
return delProcessPlanParam(row.paramId)
|
||||||
|
}).then(() => {
|
||||||
|
this.$modal.msgSuccess('删除成功')
|
||||||
|
this.loadParams(this.selectedPlan.planId)
|
||||||
|
}).catch(() => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package com.klp.controller;
|
||||||
|
|
||||||
|
import com.klp.common.annotation.Log;
|
||||||
|
import com.klp.common.annotation.RepeatSubmit;
|
||||||
|
import com.klp.common.core.controller.BaseController;
|
||||||
|
import com.klp.common.core.domain.PageQuery;
|
||||||
|
import com.klp.common.core.domain.R;
|
||||||
|
import com.klp.common.core.page.TableDataInfo;
|
||||||
|
import com.klp.common.core.validate.AddGroup;
|
||||||
|
import com.klp.common.core.validate.EditGroup;
|
||||||
|
import com.klp.common.enums.BusinessType;
|
||||||
|
import com.klp.common.utils.poi.ExcelUtil;
|
||||||
|
import com.klp.domain.bo.WmsProcessPlanParamBo;
|
||||||
|
import com.klp.domain.vo.WmsProcessPlanParamVo;
|
||||||
|
import com.klp.service.IWmsProcessPlanParamService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
@Validated
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/wms/processPlanParam")
|
||||||
|
public class WmsProcessPlanParamController extends BaseController {
|
||||||
|
|
||||||
|
private final IWmsProcessPlanParamService wmsProcessPlanParamService;
|
||||||
|
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo<WmsProcessPlanParamVo> list(WmsProcessPlanParamBo bo, PageQuery pageQuery) {
|
||||||
|
return wmsProcessPlanParamService.queryPageList(bo, pageQuery);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Log(title = "方案参数", businessType = BusinessType.EXPORT)
|
||||||
|
@PostMapping("/export")
|
||||||
|
public void export(WmsProcessPlanParamBo bo, HttpServletResponse response) {
|
||||||
|
List<WmsProcessPlanParamVo> list = wmsProcessPlanParamService.queryList(bo);
|
||||||
|
ExcelUtil.exportExcel(list, "方案参数", WmsProcessPlanParamVo.class, response);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{paramId}")
|
||||||
|
public R<WmsProcessPlanParamVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long paramId) {
|
||||||
|
return R.ok(wmsProcessPlanParamService.queryById(paramId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Log(title = "方案参数", businessType = BusinessType.INSERT)
|
||||||
|
@RepeatSubmit()
|
||||||
|
@PostMapping()
|
||||||
|
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProcessPlanParamBo bo) {
|
||||||
|
return toAjax(wmsProcessPlanParamService.insertByBo(bo));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Log(title = "方案参数", businessType = BusinessType.UPDATE)
|
||||||
|
@RepeatSubmit()
|
||||||
|
@PutMapping()
|
||||||
|
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProcessPlanParamBo bo) {
|
||||||
|
return toAjax(wmsProcessPlanParamService.updateByBo(bo));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Log(title = "方案参数", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/{paramIds}")
|
||||||
|
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] paramIds) {
|
||||||
|
return toAjax(wmsProcessPlanParamService.deleteWithValidByIds(Arrays.asList(paramIds), true));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package com.klp.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数对象 wms_process_plan_param
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@TableName("wms_process_plan_param")
|
||||||
|
public class WmsProcessPlanParam extends BaseEntity {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@TableId(value = "param_id")
|
||||||
|
private Long paramId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案点位ID
|
||||||
|
*/
|
||||||
|
private Long planId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 参数编码
|
||||||
|
*/
|
||||||
|
private String paramCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 参数名称
|
||||||
|
*/
|
||||||
|
private String paramName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设定值
|
||||||
|
*/
|
||||||
|
private BigDecimal targetValue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下限
|
||||||
|
*/
|
||||||
|
private BigDecimal lowerLimit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 上限
|
||||||
|
*/
|
||||||
|
private BigDecimal upperLimit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
private String unit;
|
||||||
|
|
||||||
|
@TableLogic
|
||||||
|
private Integer delFlag;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package com.klp.domain.bo;
|
||||||
|
|
||||||
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
|
import com.klp.common.core.validate.AddGroup;
|
||||||
|
import com.klp.common.core.validate.EditGroup;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数业务对象 wms_process_plan_param
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class WmsProcessPlanParamBo extends BaseEntity {
|
||||||
|
|
||||||
|
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||||
|
private Long paramId;
|
||||||
|
|
||||||
|
@NotNull(message = "方案点位不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
|
private Long planId;
|
||||||
|
|
||||||
|
@NotBlank(message = "参数编码不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
|
private String paramCode;
|
||||||
|
|
||||||
|
@NotBlank(message = "参数名称不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
|
private String paramName;
|
||||||
|
|
||||||
|
private BigDecimal targetValue;
|
||||||
|
|
||||||
|
private BigDecimal lowerLimit;
|
||||||
|
|
||||||
|
private BigDecimal upperLimit;
|
||||||
|
|
||||||
|
private String unit;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.klp.domain.vo;
|
||||||
|
|
||||||
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||||
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数视图对象 wms_process_plan_param
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@ExcelIgnoreUnannotated
|
||||||
|
public class WmsProcessPlanParamVo {
|
||||||
|
|
||||||
|
@ExcelProperty(value = "参数ID")
|
||||||
|
private Long paramId;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "方案点位ID")
|
||||||
|
private Long planId;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "参数编码")
|
||||||
|
private String paramCode;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "参数名称")
|
||||||
|
private String paramName;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "设定值")
|
||||||
|
private BigDecimal targetValue;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "下限")
|
||||||
|
private BigDecimal lowerLimit;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "上限")
|
||||||
|
private BigDecimal upperLimit;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "单位")
|
||||||
|
private String unit;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "备注")
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "创建时间")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
@ExcelProperty(value = "更新时间")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date updateTime;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.klp.mapper;
|
||||||
|
|
||||||
|
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||||
|
import com.klp.domain.WmsProcessPlanParam;
|
||||||
|
import com.klp.domain.vo.WmsProcessPlanParamVo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数Mapper
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
public interface WmsProcessPlanParamMapper extends BaseMapperPlus<WmsProcessPlanParamMapper, WmsProcessPlanParam, WmsProcessPlanParamVo> {
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package com.klp.service;
|
||||||
|
|
||||||
|
import com.klp.common.core.domain.PageQuery;
|
||||||
|
import com.klp.common.core.page.TableDataInfo;
|
||||||
|
import com.klp.domain.bo.WmsProcessPlanParamBo;
|
||||||
|
import com.klp.domain.vo.WmsProcessPlanParamVo;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数Service
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
public interface IWmsProcessPlanParamService {
|
||||||
|
|
||||||
|
WmsProcessPlanParamVo queryById(Long paramId);
|
||||||
|
|
||||||
|
TableDataInfo<WmsProcessPlanParamVo> queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery);
|
||||||
|
|
||||||
|
List<WmsProcessPlanParamVo> queryList(WmsProcessPlanParamBo bo);
|
||||||
|
|
||||||
|
Boolean insertByBo(WmsProcessPlanParamBo bo);
|
||||||
|
|
||||||
|
Boolean updateByBo(WmsProcessPlanParamBo bo);
|
||||||
|
|
||||||
|
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package com.klp.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.klp.common.core.domain.PageQuery;
|
||||||
|
import com.klp.common.core.page.TableDataInfo;
|
||||||
|
import com.klp.common.exception.ServiceException;
|
||||||
|
import com.klp.common.utils.StringUtils;
|
||||||
|
import com.klp.domain.WmsProcessPlan;
|
||||||
|
import com.klp.domain.WmsProcessPlanParam;
|
||||||
|
import com.klp.domain.bo.WmsProcessPlanParamBo;
|
||||||
|
import com.klp.domain.vo.WmsProcessPlanParamVo;
|
||||||
|
import com.klp.mapper.WmsProcessPlanMapper;
|
||||||
|
import com.klp.mapper.WmsProcessPlanParamMapper;
|
||||||
|
import com.klp.service.IWmsProcessPlanParamService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方案参数Service实现
|
||||||
|
*
|
||||||
|
* @author klp
|
||||||
|
*/
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Service
|
||||||
|
public class WmsProcessPlanParamServiceImpl implements IWmsProcessPlanParamService {
|
||||||
|
|
||||||
|
private final WmsProcessPlanParamMapper baseMapper;
|
||||||
|
private final WmsProcessPlanMapper wmsProcessPlanMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public WmsProcessPlanParamVo queryById(Long paramId) {
|
||||||
|
return baseMapper.selectVoById(paramId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TableDataInfo<WmsProcessPlanParamVo> queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery) {
|
||||||
|
LambdaQueryWrapper<WmsProcessPlanParam> lqw = buildQueryWrapper(bo);
|
||||||
|
Page<WmsProcessPlanParamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
|
return TableDataInfo.build(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WmsProcessPlanParamVo> queryList(WmsProcessPlanParamBo bo) {
|
||||||
|
return baseMapper.selectVoList(buildQueryWrapper(bo));
|
||||||
|
}
|
||||||
|
|
||||||
|
private LambdaQueryWrapper<WmsProcessPlanParam> buildQueryWrapper(WmsProcessPlanParamBo bo) {
|
||||||
|
LambdaQueryWrapper<WmsProcessPlanParam> lqw = Wrappers.lambdaQuery();
|
||||||
|
lqw.eq(bo.getPlanId() != null, WmsProcessPlanParam::getPlanId, bo.getPlanId());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getParamCode()), WmsProcessPlanParam::getParamCode, bo.getParamCode());
|
||||||
|
lqw.like(StringUtils.isNotBlank(bo.getParamName()), WmsProcessPlanParam::getParamName, bo.getParamName());
|
||||||
|
lqw.orderByAsc(WmsProcessPlanParam::getParamId);
|
||||||
|
return lqw;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean insertByBo(WmsProcessPlanParamBo bo) {
|
||||||
|
WmsProcessPlan plan = wmsProcessPlanMapper.selectById(bo.getPlanId());
|
||||||
|
if (plan == null) {
|
||||||
|
throw new ServiceException("方案点位不存在");
|
||||||
|
}
|
||||||
|
WmsProcessPlanParam add = BeanUtil.toBean(bo, WmsProcessPlanParam.class);
|
||||||
|
validEntityBeforeSave(add);
|
||||||
|
boolean flag = baseMapper.insert(add) > 0;
|
||||||
|
if (flag) {
|
||||||
|
bo.setParamId(add.getParamId());
|
||||||
|
}
|
||||||
|
return flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean updateByBo(WmsProcessPlanParamBo bo) {
|
||||||
|
WmsProcessPlanParam update = BeanUtil.toBean(bo, WmsProcessPlanParam.class);
|
||||||
|
validEntityBeforeSave(update);
|
||||||
|
return baseMapper.updateById(update) > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validEntityBeforeSave(WmsProcessPlanParam entity) {
|
||||||
|
LambdaQueryWrapper<WmsProcessPlanParam> lqw = Wrappers.lambdaQuery();
|
||||||
|
lqw.eq(WmsProcessPlanParam::getPlanId, entity.getPlanId());
|
||||||
|
lqw.eq(WmsProcessPlanParam::getParamCode, entity.getParamCode());
|
||||||
|
if (entity.getParamId() != null) {
|
||||||
|
lqw.ne(WmsProcessPlanParam::getParamId, entity.getParamId());
|
||||||
|
}
|
||||||
|
if (baseMapper.selectCount(lqw) > 0) {
|
||||||
|
throw new ServiceException("同一方案点位下参数编码已存在");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||||
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,10 +9,12 @@ import com.klp.common.core.page.TableDataInfo;
|
|||||||
import com.klp.common.exception.ServiceException;
|
import com.klp.common.exception.ServiceException;
|
||||||
import com.klp.common.utils.StringUtils;
|
import com.klp.common.utils.StringUtils;
|
||||||
import com.klp.domain.WmsProcessPlan;
|
import com.klp.domain.WmsProcessPlan;
|
||||||
|
import com.klp.domain.WmsProcessPlanParam;
|
||||||
import com.klp.domain.WmsProcessSpecVersion;
|
import com.klp.domain.WmsProcessSpecVersion;
|
||||||
import com.klp.domain.bo.WmsProcessPlanBo;
|
import com.klp.domain.bo.WmsProcessPlanBo;
|
||||||
import com.klp.domain.vo.WmsProcessPlanVo;
|
import com.klp.domain.vo.WmsProcessPlanVo;
|
||||||
import com.klp.mapper.WmsProcessPlanMapper;
|
import com.klp.mapper.WmsProcessPlanMapper;
|
||||||
|
import com.klp.mapper.WmsProcessPlanParamMapper;
|
||||||
import com.klp.mapper.WmsProcessSpecVersionMapper;
|
import com.klp.mapper.WmsProcessSpecVersionMapper;
|
||||||
import com.klp.service.IWmsProcessPlanService;
|
import com.klp.service.IWmsProcessPlanService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -32,6 +34,7 @@ public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService {
|
|||||||
|
|
||||||
private final WmsProcessPlanMapper baseMapper;
|
private final WmsProcessPlanMapper baseMapper;
|
||||||
private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper;
|
private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper;
|
||||||
|
private final WmsProcessPlanParamMapper wmsProcessPlanParamMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WmsProcessPlanVo queryById(Long planId) {
|
public WmsProcessPlanVo queryById(Long planId) {
|
||||||
@@ -102,6 +105,11 @@ public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService {
|
|||||||
if (Boolean.TRUE.equals(isValid)) {
|
if (Boolean.TRUE.equals(isValid)) {
|
||||||
// 可扩展业务校验
|
// 可扩展业务校验
|
||||||
}
|
}
|
||||||
|
for (Long planId : ids) {
|
||||||
|
LambdaQueryWrapper<WmsProcessPlanParam> pq = Wrappers.lambdaQuery();
|
||||||
|
pq.eq(WmsProcessPlanParam::getPlanId, planId);
|
||||||
|
wmsProcessPlanParamMapper.delete(pq);
|
||||||
|
}
|
||||||
return baseMapper.deleteBatchIds(ids) > 0;
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,10 +11,12 @@ import com.klp.common.exception.ServiceException;
|
|||||||
import com.klp.common.utils.StringUtils;
|
import com.klp.common.utils.StringUtils;
|
||||||
import com.klp.domain.WmsProcessSpec;
|
import com.klp.domain.WmsProcessSpec;
|
||||||
import com.klp.domain.WmsProcessPlan;
|
import com.klp.domain.WmsProcessPlan;
|
||||||
|
import com.klp.domain.WmsProcessPlanParam;
|
||||||
import com.klp.domain.WmsProcessSpecVersion;
|
import com.klp.domain.WmsProcessSpecVersion;
|
||||||
import com.klp.domain.bo.WmsProcessSpecVersionBo;
|
import com.klp.domain.bo.WmsProcessSpecVersionBo;
|
||||||
import com.klp.domain.vo.WmsProcessSpecVersionVo;
|
import com.klp.domain.vo.WmsProcessSpecVersionVo;
|
||||||
import com.klp.mapper.WmsProcessPlanMapper;
|
import com.klp.mapper.WmsProcessPlanMapper;
|
||||||
|
import com.klp.mapper.WmsProcessPlanParamMapper;
|
||||||
import com.klp.mapper.WmsProcessSpecMapper;
|
import com.klp.mapper.WmsProcessSpecMapper;
|
||||||
import com.klp.mapper.WmsProcessSpecVersionMapper;
|
import com.klp.mapper.WmsProcessSpecVersionMapper;
|
||||||
import com.klp.service.IWmsProcessSpecVersionService;
|
import com.klp.service.IWmsProcessSpecVersionService;
|
||||||
@@ -37,6 +39,7 @@ public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionS
|
|||||||
private final WmsProcessSpecVersionMapper baseMapper;
|
private final WmsProcessSpecVersionMapper baseMapper;
|
||||||
private final WmsProcessSpecMapper wmsProcessSpecMapper;
|
private final WmsProcessSpecMapper wmsProcessSpecMapper;
|
||||||
private final WmsProcessPlanMapper wmsProcessPlanMapper;
|
private final WmsProcessPlanMapper wmsProcessPlanMapper;
|
||||||
|
private final WmsProcessPlanParamMapper wmsProcessPlanParamMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WmsProcessSpecVersionVo queryById(Long versionId) {
|
public WmsProcessSpecVersionVo queryById(Long versionId) {
|
||||||
@@ -142,6 +145,12 @@ public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionS
|
|||||||
for (Long versionId : ids) {
|
for (Long versionId : ids) {
|
||||||
LambdaQueryWrapper<WmsProcessPlan> pq = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<WmsProcessPlan> pq = Wrappers.lambdaQuery();
|
||||||
pq.eq(WmsProcessPlan::getVersionId, versionId);
|
pq.eq(WmsProcessPlan::getVersionId, versionId);
|
||||||
|
List<WmsProcessPlan> plans = wmsProcessPlanMapper.selectList(pq);
|
||||||
|
for (WmsProcessPlan plan : plans) {
|
||||||
|
LambdaQueryWrapper<WmsProcessPlanParam> pr = Wrappers.lambdaQuery();
|
||||||
|
pr.eq(WmsProcessPlanParam::getPlanId, plan.getPlanId());
|
||||||
|
wmsProcessPlanParamMapper.delete(pr);
|
||||||
|
}
|
||||||
wmsProcessPlanMapper.delete(pq);
|
wmsProcessPlanMapper.delete(pq);
|
||||||
}
|
}
|
||||||
return baseMapper.deleteBatchIds(ids) > 0;
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.klp.mapper.WmsProcessPlanParamMapper">
|
||||||
|
|
||||||
|
<resultMap type="com.klp.domain.WmsProcessPlanParam" id="WmsProcessPlanParamResult">
|
||||||
|
<result property="paramId" column="param_id"/>
|
||||||
|
<result property="planId" column="plan_id"/>
|
||||||
|
<result property="paramCode" column="param_code"/>
|
||||||
|
<result property="paramName" column="param_name"/>
|
||||||
|
<result property="targetValue" column="target_value"/>
|
||||||
|
<result property="lowerLimit" column="lower_limit"/>
|
||||||
|
<result property="upperLimit" column="upper_limit"/>
|
||||||
|
<result property="unit" column="unit"/>
|
||||||
|
<result property="createBy" column="create_by"/>
|
||||||
|
<result property="createTime" column="create_time"/>
|
||||||
|
<result property="updateBy" column="update_by"/>
|
||||||
|
<result property="updateTime" column="update_time"/>
|
||||||
|
<result property="delFlag" column="del_flag"/>
|
||||||
|
<result property="remark" column="remark"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
Reference in New Issue
Block a user