From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ShelvesRuleDetlMapper.java | 12
zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue | 223 +++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java | 36 ++
zy-asrs-admin/src/views/strategy/shelvesRule/index.vue | 119 +++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleDetlController.java | 102 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/ShelvesRuleType.java | 18 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java | 14
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ShelvesRuleDetlService.java | 8
zy-asrs-wms/src/main/resources/sql/menu/shelvesRuleDetl.sql | 9
zy-asrs-wms/src/main/resources/mapper/asrs/ShelvesRuleDetlMapper.xml | 5
zy-asrs-admin/src/views/strategy/shelvesRuleDetl/edit.vue | 147 ++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRuleDetl.java | 226 +++++++++++++
zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue | 79 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ShelvesRuleDetlServiceImpl.java | 12
14 files changed, 948 insertions(+), 62 deletions(-)
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
index c9a44f1..83aaf80 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
@@ -1,8 +1,12 @@
<script setup>
-import { ref, nextTick } from 'vue';
+import { ref, nextTick, reactive, watch } from 'vue';
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
+import {
+ MinusCircleOutlined,
+ PlusOutlined,
+} from "@ant-design/icons-vue";
const formTable = ref(null);
const submitButton = ref(null);
@@ -10,6 +14,10 @@
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
+
+const dynamicValidateForm = reactive({
+ detls: [],
+});
const emit = defineEmits(['tableReload'])
@@ -24,6 +32,12 @@
const onFinish = values => {
// console.log('Success:', values);
open.value = false;
+
+ let detls = []
+ dynamicValidateForm.detls.forEach((item) => {
+ detls.push(item.value)
+ })
+ formData.value.detls = detls;
post(isSave.value ? '/api/shelvesRule/save' : '/api/shelvesRule/update', formData.value).then((resp) => {
let result = resp.data;
if (result.code === 200) {
@@ -59,6 +73,36 @@
})
}
+const removeDomain = item => {
+ const index = dynamicValidateForm.detls.indexOf(item);
+ if (index !== -1) {
+ dynamicValidateForm.detls.splice(index, 1);
+ }
+};
+
+const addDomain = () => {
+ dynamicValidateForm.detls.push({
+ value: '',
+ });
+};
+
+watch(open, (newVal, oldVal) => {
+ if (open.value) {
+ if (!isSave.value) {
+ let ruleDetls = formData.value.ruleDetl$
+ let detls = []
+ ruleDetls.forEach((item) => {
+ detls.push({
+ value: item.detlType
+ })
+ })
+
+ dynamicValidateForm.detls = detls;
+ }
+ }else {
+ dynamicValidateForm.detls = []
+ }
+})
defineExpose({
open,
@@ -83,6 +127,10 @@
<a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }"
:wrapper-col="{ span: 16 }" style="display: flex;justify-content: space-between;flex-wrap: wrap;"
autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule.name', '瑙勫垯鍚嶇О')" name="name"
+ style="width: 250px;">
+ <a-input v-model:value="formData.name" />
+ </a-form-item>
<a-form-item :label="formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷')" name="ruleType"
style="width: 250px;">
<a-select v-model:value="formData.ruleType" :options="[
@@ -106,7 +154,7 @@
]">
</a-select>
</a-form-item>
- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ <!-- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
style="width: 250px;">
<a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" />
@@ -129,7 +177,7 @@
style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
optionLabelProp="label">
</a-select>
- </a-form-item>
+ </a-form-item> -->
<a-form-item :label="formatMessage('db.strategy_shelves_rule.memo', '澶囨敞')" name="memo"
style="width: 250px;">
<a-input v-model:value="formData.memo" />
@@ -140,6 +188,31 @@
style="visibility: hidden;">Submit</a-button>
</a-form-item>
</a-form>
+
+ <a-form>
+ <a-form-item v-for="(domain, index) in dynamicValidateForm.detls" :key="domain.key"
+ :label="formatMessage('db.strategy_shelves_rule.memo', '瑙勫垯鏄庣粏')" :name="['domains', index, 'value']"
+ :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 400px;">
+ <a-select v-model:value="domain.value" :options="[
+ { label: '搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅', value: 1 },
+ { label: '鎺ㄨ崘鍖哄煙', value: 2 },
+ { label: '瀹屾暣宸烽亾', value: 3 },
+ ]" style="width: 300px;margin-right: 20px;">
+ </a-select>
+ <MinusCircleOutlined v-if="dynamicValidateForm.detls.length > 1"
+ @click="removeDomain(domain)" />
+ </div>
+ </a-form-item>
+ <a-form-item :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 200px;">
+ <a-button type="dashed" style="width: 200px;" @click="addDomain">
+ <PlusOutlined />
+ {{ formatMessage('db.strategy_shelves_rule.addDetl', '娣诲姞鏄庣粏') }}
+ </a-button>
+ </div>
+ </a-form-item>
+ </a-form>
</a-modal>
</div>
</template>
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
index 2d71c77..e9da135 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
@@ -26,62 +26,69 @@
} = useTableSearch();
const columns = [
- {
- title: formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷'),
- dataIndex: 'ruleType$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('ruleType$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.lane$', '宸烽亾'),
- dataIndex: 'lane$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('lane$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
+ {
+ title: formatMessage('db.strategy_shelves_rule.name', '瑙勫垯鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷'),
+ dataIndex: 'ruleType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ruleType$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.lane$', '宸烽亾'),
+ dataIndex: 'lane$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('lane$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/edit.vue b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/edit.vue
new file mode 100644
index 0000000..a4dac61
--- /dev/null
+++ b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/edit.vue
@@ -0,0 +1,147 @@
+<script setup>
+import { ref, nextTick } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+
+const formTable = ref(null);
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+
+const emit = defineEmits(['tableReload'])
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+ post(isSave.value ? '/api/shelvesRuleDetl/save' : '/api/shelvesRuleDetl/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const shelvesRuleQueryList = ref(null);
+shelvesRuleQuery();
+function shelvesRuleQuery() {
+ postForm('/api/shelvesRule/query', {}).then(resp => {
+ let result = resp.data;
+ shelvesRuleQueryList.value = result.data;
+ })
+}
+const userQueryList = ref(null);
+userQuery();
+function userQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ userQueryList.value = result.data;
+ })
+}
+
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ isSave,
+})
+
+</script>
+
+<script>
+export default {
+ name: '涓婃灦瑙勫垯鏄庣粏-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 600px;">
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }"
+ :wrapper-col="{ span: 16 }" style="display: flex;justify-content: space-between;flex-wrap: wrap;"
+ autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.rule_id', '鎵�灞炶鍒�')" name="ruleId"
+ style="width: 250px;">
+ <a-select v-model:value="formData.ruleId" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="shelvesRuleQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.detl_type', '绫诲瀷')" name="detlType"
+ style="width: 250px;">
+ <a-select v-model:value="formData.detlType" :options="[
+ { label: '搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅', value: 1 },
+ { label: '鎺ㄨ崘鍖哄煙', value: 2 },
+ { label: '瀹屾暣宸烽亾', value: 3 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.status', '鐘舵��')" name="status"
+ style="width: 250px;">
+ <a-select v-model:value="formData.status" :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.create_time', '娣诲姞鏃堕棿')"
+ name="createTime" style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.create_by', '娣诲姞浜哄憳')" name="createBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.update_time', '淇敼鏃堕棿')"
+ name="updateTime" style="width: 250px;">
+ <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.update_by', '淇敼浜哄憳')" name="updateBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule_detl.memo', '澶囨敞')" name="memo"
+ style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue
new file mode 100644
index 0000000..1281274
--- /dev/null
+++ b/zy-asrs-admin/src/views/strategy/shelvesRuleDetl/index.vue
@@ -0,0 +1,223 @@
+<script setup>
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-shelvesRuleDetl';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.rule_id', '鎵�灞炶鍒�'),
+ dataIndex: 'ruleId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ruleId$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.detl_type', '绫诲瀷'),
+ dataIndex: 'detlType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('detlType$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule_detl.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
+
+ {
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 140,
+ fixed: 'right',
+ },
+];
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ post('/api/shelvesRuleDetl/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleEdit = (item) => {
+ editChild.value.open = true;
+ editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+ editChild.value.isSave = item == null;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/shelvesRuleDetl/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/shelvesRuleDetl/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+</script>
+
+<script>
+export default {
+ name: '涓婃灦瑙勫垯鏄庣粏'
+}
+</script>
+
+<template>
+ <div>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
+ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'oper'">
+ <div style="display: flex;justify-content: space-evenly;">
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
+ }}</a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
index f53228e..dabce8c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -15,6 +18,7 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -26,6 +30,8 @@
@Autowired
private ShelvesRuleService shelvesRuleService;
+ @Autowired
+ private ShelvesRuleDetlService shelvesRuleDetlService;
@PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
@PostMapping("/shelvesRule/page")
@@ -55,10 +61,21 @@
return R.error("缂哄皯鍙傛暟");
}
ShelvesRule shelvesRule = new ShelvesRule();
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
if (!shelvesRuleService.save(shelvesRule)) {
- return R.error("娣诲姞澶辫触");
+ throw new CoolException("娣诲姞澶辫触");
+ }
+
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
}
return R.ok("娣诲姞鎴愬姛");
}
@@ -66,6 +83,7 @@
@PreAuthorize("hasAuthority('asrs:shelvesRule:update')")
@OperationLog("淇敼涓婃灦瑙勫垯")
@PostMapping("/shelvesRule/update")
+ @Transactional
public R update(@RequestBody HashMap<String, Object> param) {
if(!param.containsKey("ruleType") || !param.containsKey("laneList") || !param.containsKey("id")) {
return R.error("缂哄皯鍙傛暟");
@@ -76,11 +94,25 @@
return R.error("涓婃灦瑙勫垯涓嶅瓨鍦�");
}
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
+ shelvesRule.setStatus(Integer.parseInt(param.get("status").toString()));
if (!shelvesRuleService.updateById(shelvesRule)) {
- return R.error("淇敼澶辫触");
+ throw new CoolException("淇敼澶辫触");
}
+
+ shelvesRuleDetlService.remove(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, shelvesRule.getId()));
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
+ }
+
return R.ok("淇敼鎴愬姛");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleDetlController.java
new file mode 100644
index 0000000..93a706a
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleDetlController.java
@@ -0,0 +1,102 @@
+package com.zy.asrs.wms.asrs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ShelvesRuleDetlController extends BaseController {
+
+ @Autowired
+ private ShelvesRuleDetlService shelvesRuleDetlService;
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:list')")
+ @PostMapping("/shelvesRuleDetl/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ShelvesRuleDetl, BaseParam> pageParam = new PageParam<>(baseParam, ShelvesRuleDetl.class);
+ return R.ok().add(shelvesRuleDetlService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:list')")
+ @PostMapping("/shelvesRuleDetl/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(shelvesRuleDetlService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:list')")
+ @GetMapping("/shelvesRuleDetl/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(shelvesRuleDetlService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:save')")
+ @OperationLog("娣诲姞涓婃灦瑙勫垯鏄庣粏")
+ @PostMapping("/shelvesRuleDetl/save")
+ public R save(@RequestBody ShelvesRuleDetl shelvesRuleDetl) {
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:update')")
+ @OperationLog("淇敼涓婃灦瑙勫垯鏄庣粏")
+ @PostMapping("/shelvesRuleDetl/update")
+ public R update(@RequestBody ShelvesRuleDetl shelvesRuleDetl) {
+ if (!shelvesRuleDetlService.updateById(shelvesRuleDetl)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:remove')")
+ @OperationLog("鍒犻櫎涓婃灦瑙勫垯鏄庣粏")
+ @PostMapping("/shelvesRuleDetl/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!shelvesRuleDetlService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:list')")
+ @PostMapping("/shelvesRuleDetl/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<ShelvesRuleDetl> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(ShelvesRuleDetl::getId, condition);
+ }
+ shelvesRuleDetlService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRuleDetl:list')")
+ @PostMapping("/shelvesRuleDetl/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(shelvesRuleDetlService.list(), ShelvesRuleDetl.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
index 952206e..6916686 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
@@ -5,7 +5,9 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wms.asrs.service.LanewayRuleService;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -42,6 +44,12 @@
private Long id;
/**
+ * 瑙勫垯鍚嶇О
+ */
+ @ApiModelProperty(value= "瑙勫垯鍚嶇О")
+ private String name;
+
+ /**
* 瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋
*/
@ApiModelProperty(value= "瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋 ")
@@ -69,7 +77,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -156,6 +163,11 @@
return list;
}
+ public List<ShelvesRuleDetl> getRuleDetl$() {
+ ShelvesRuleDetlService service = SpringUtils.getBean(ShelvesRuleDetlService.class);
+ return service.list(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, id));
+ }
+
public String getRuleType$(){
if (null == this.ruleType){ return null; }
switch (this.ruleType){
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRuleDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRuleDetl.java
new file mode 100644
index 0000000..1aecf53
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRuleDetl.java
@@ -0,0 +1,226 @@
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wms.asrs.service.ShelvesRuleService;
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+import com.zy.asrs.common.utils.Synchro;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("strategy_shelves_rule_detl")
+public class ShelvesRuleDetl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鎵�灞炶鍒�
+ */
+ @ApiModelProperty(value= "鎵�灞炶鍒�")
+ private Long ruleId;
+
+ /**
+ * 绫诲瀷 1: 搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅 2: 鎺ㄨ崘鍖哄煙 3: 瀹屾暣宸烽亾
+ */
+ @ApiModelProperty(value= "绫诲瀷 1: 搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅 2: 鎺ㄨ崘鍖哄煙 3: 瀹屾暣宸烽亾 ")
+ private Integer detlType;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public ShelvesRuleDetl() {}
+
+ public ShelvesRuleDetl(Long ruleId,Integer detlType,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.ruleId = ruleId;
+ this.detlType = detlType;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl(
+// null, // 鎵�灞炶鍒�
+// null, // 绫诲瀷
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getRuleId$(){
+ ShelvesRuleService service = SpringUtils.getBean(ShelvesRuleService.class);
+ ShelvesRule shelvesRule = service.getById(this.ruleId);
+ if (!Cools.isEmpty(shelvesRule)){
+ return String.valueOf(shelvesRule.getId());
+ }
+ return null;
+ }
+
+ public String getDetlType$(){
+ if (null == this.detlType){ return null; }
+ switch (this.detlType){
+ case 1:
+ return "搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅";
+ case 2:
+ return "鎺ㄨ崘鍖哄煙";
+ case 3:
+ return "瀹屾暣宸烽亾";
+ default:
+ return String.valueOf(this.detlType);
+ }
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/ShelvesRuleType.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/ShelvesRuleType.java
new file mode 100644
index 0000000..fd1aa0b
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/ShelvesRuleType.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.wms.asrs.entity.enums;
+
+public enum ShelvesRuleType {
+
+ LEVEL(0, "浼樺厛骞冲眰"),
+ HIGH(1, "浼樺厛绔嬩綋"),
+ ;
+
+
+ public Integer id;
+ public String desc;
+
+ ShelvesRuleType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ShelvesRuleDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ShelvesRuleDetlMapper.java
new file mode 100644
index 0000000..66328de
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ShelvesRuleDetlMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ShelvesRuleDetlMapper extends BaseMapper<ShelvesRuleDetl> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ShelvesRuleDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ShelvesRuleDetlService.java
new file mode 100644
index 0000000..8744d56
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ShelvesRuleDetlService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wms.asrs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+
+public interface ShelvesRuleDetlService extends IService<ShelvesRuleDetl> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ShelvesRuleDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ShelvesRuleDetlServiceImpl.java
new file mode 100644
index 0000000..df597aa
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ShelvesRuleDetlServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.zy.asrs.wms.asrs.mapper.ShelvesRuleDetlMapper;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("shelvesRuleDetlService")
+public class ShelvesRuleDetlServiceImpl extends ServiceImpl<ShelvesRuleDetlMapper, ShelvesRuleDetl> implements ShelvesRuleDetlService {
+
+}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ShelvesRuleDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ShelvesRuleDetlMapper.xml
new file mode 100644
index 0000000..495276f
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/ShelvesRuleDetlMapper.xml
@@ -0,0 +1,5 @@
+<?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.zy.asrs.wms.asrs.mapper.ShelvesRuleDetlMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/sql/menu/shelvesRuleDetl.sql b/zy-asrs-wms/src/main/resources/sql/menu/shelvesRuleDetl.sql
new file mode 100644
index 0000000..6c2cf55
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/sql/menu/shelvesRuleDetl.sql
@@ -0,0 +1,9 @@
+-- save shelvesRuleDetl record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '涓婃灦瑙勫垯鏄庣粏绠＄悊', '0', '/asrs/shelvesRuleDetl', '/asrs/shelvesRuleDetl', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ涓婃灦瑙勫垯鏄庣粏', '', '1', 'asrs:shelvesRuleDetl:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞涓婃灦瑙勫垯鏄庣粏', '', '1', 'asrs:shelvesRuleDetl:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼涓婃灦瑙勫垯鏄庣粏', '', '1', 'asrs:shelvesRuleDetl:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎涓婃灦瑙勫垯鏄庣粏', '', '1', 'asrs:shelvesRuleDetl:remove', '3', '1', '1');
+
--
Gitblit v1.9.1