From 3743cba51af30aef646e620531509d7ba350b08e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 10 九月 2024 09:13:33 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/asrs/waveDetl/index.vue | 237 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveDetlServiceImpl.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveDetlMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java | 227 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveDetlService.java | 8
zy-asrs-wms/src/main/resources/mapper/asrs/WaveMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java | 17
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveService.java | 8
zy-asrs-admin/src/views/asrs/waveDetl/edit.vue | 232 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java | 259 +++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveServiceImpl.java | 12
zy-asrs-admin/src/views/out/wave/index.vue | 330 +++++++++
zy-asrs-admin/src/views/out/wave/edit.vue | 189 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 20
zy-asrs-wms/src/main/resources/sql/menu/wave.sql | 9
zy-asrs-wms/src/main/resources/mapper/asrs/WaveDetlMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveDetlController.java | 102 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java | 114 +++
/dev/null | 24
zy-asrs-admin/src/views/out/orderOut/index.vue | 47 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 14
zy-asrs-wms/src/main/resources/sql/menu/waveDetl.sql | 9
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 89 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 1
zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue | 7
27 files changed, 1,964 insertions(+), 41 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue b/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue
index 0117588..6f777c4 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue
@@ -241,7 +241,7 @@
}
const handleGlobalOperationPortChange = () => {
- if(tableData.value.length > 0) {
+ if (tableData.value.length > 0) {
tableData.value.forEach((item) => {
item.operationPort = globalOperationPort.value;
})
@@ -267,13 +267,14 @@
:title="formatMessage('page.orderOutPreview.preview', '棰勮鍚堝苟璁㈠崟鍑哄簱')" @ok="handleOk">
<div>
<span>浣滀笟鍙ｏ細</span>
- <a-select v-model:value="globalOperationPort" :options="operationPortList" @change="handleGlobalOperationPortChange"></a-select>
+ <a-select v-model:value="globalOperationPort" :options="operationPortList"
+ @change="handleGlobalOperationPortChange"></a-select>
</div>
<a-table :data-source="tableData" :loading="loading" :defaultExpandAllRows="false" :key="TABLE_KEY"
rowKey="index" :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
<template #bodyCell="{ column, text, record, index }">
<template v-if="column.dataIndex === 'locNo'">
- <div v-if="record.locId != null">
+ <div v-if="record.locId != null && record.anfme > 0">
<a-tag color="green">{{ record.locNo }}</a-tag>
</div>
<div v-else>
diff --git a/zy-asrs-admin/src/views/asrs/waveDetl/edit.vue b/zy-asrs-admin/src/views/asrs/waveDetl/edit.vue
new file mode 100644
index 0000000..0f7c321
--- /dev/null
+++ b/zy-asrs-admin/src/views/asrs/waveDetl/edit.vue
@@ -0,0 +1,232 @@
+<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/waveDetl/save' : '/api/waveDetl/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 waveQueryList = ref(null);
+waveQuery();
+function waveQuery() {
+ postForm('/api/wave/query', {}).then(resp => {
+ let result = resp.data;
+ waveQueryList.value = result.data;
+ })
+}
+const orderQueryList = ref(null);
+orderQuery();
+function orderQuery() {
+ postForm('/api/order/query', {}).then(resp => {
+ let result = resp.data;
+ orderQueryList.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.man_wave_detl.wave_id', '娉㈡ID') "
+ name="waveId"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.waveId"
+ :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%"
+ show-search
+ :options="waveQueryList"
+ optionFilterProp="label"
+ optionLabelProp="label"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave_detl.wave_no', '娉㈡鍙�') "
+ name="waveNo"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.waveNo"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave_detl.order_id', '璁㈠崟ID') "
+ name="orderId"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.orderId"
+ :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%"
+ show-search
+ :options="orderQueryList"
+ optionFilterProp="label"
+ optionLabelProp="label"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave_detl.order_no', '璁㈠崟鍙�') "
+ name="orderNo"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.orderNo"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave_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.man_wave_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.man_wave_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.man_wave_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.man_wave_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.man_wave_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/asrs/waveDetl/index.vue b/zy-asrs-admin/src/views/asrs/waveDetl/index.vue
new file mode 100644
index 0000000..edae12d
--- /dev/null
+++ b/zy-asrs-admin/src/views/asrs/waveDetl/index.vue
@@ -0,0 +1,237 @@
+<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-waveDetl';
+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.man_wave_detl.wave_id', '娉㈡ID'),
+ dataIndex: 'waveId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveId$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.wave_no', '娉㈡鍙�'),
+ dataIndex: 'waveNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.order_id', '璁㈠崟ID'),
+ dataIndex: 'orderId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderId$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.order_no', '璁㈠崟鍙�'),
+ dataIndex: 'orderNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_wave_detl.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_wave_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/waveDetl/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/waveDetl/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/waveDetl/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-admin/src/views/out/orderOut/index.vue b/zy-asrs-admin/src/views/out/orderOut/index.vue
index 74da6d9..0da913d 100644
--- a/zy-asrs-admin/src/views/out/orderOut/index.vue
+++ b/zy-asrs-admin/src/views/out/orderOut/index.vue
@@ -11,6 +11,8 @@
const router = useRouter();
+const emit = defineEmits(['pageReload'])
+
const TABLE_KEY = 'table-order-detl';
let currentPage = 1;
let pageSize = 10;
@@ -168,13 +170,36 @@
message.error(formatMessage("page.orderOut.mergeOrderOut.error", "璇烽�夋嫨鑷冲皯涓�鏉¤鍗�"));
return;
}
-
+
orderOutMergePreviewChild.value.open = true;
orderOutMergePreviewChild.value.records = orderIdList;
}
const handleChildReload = () => {
handleTableReload()
+}
+
+const handleGenerateWave = () => {
+ let orderIdList = [];
+ checkedOrderKeys.value.forEach((idx) => {
+ let index = parseInt(idx.split("-")[1]);
+ orderIdList.push(orderData.value[index].id)
+ })
+
+ if (orderIdList.length == 0) {
+ message.error(formatMessage("page.orderOut.mergeOrderOut.error", "璇烽�夋嫨鑷冲皯涓�鏉¤鍗�"));
+ return;
+ }
+
+ post('/api/out/wave/generate', orderIdList).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ message.success(formatMessage('page.add.success', '鎴愬姛'));
+ emit('pageReload', 'reload')
+ }else{
+ message.error(result.msg);
+ }
+ })
}
</script>
@@ -188,12 +213,22 @@
<template>
<div style="display: flex;">
<a-card :title="formatMessage('common.order', '璁㈠崟')" style="flex: 4;margin-right: 30px;">
- <a-button @click="handleMergeOrderOut()">
- {{ formatMessage('common.orderOut', '鍚堝苟璁㈠崟') }}
- </a-button>
+ <div style="margin-bottom: 10px;display: flex;">
+ <div style="margin-right: 10px;">
+ <a-button @click="handleMergeOrderOut()">
+ {{ formatMessage('common.orderOut', '鍚堝苟璁㈠崟') }}
+ </a-button>
+ </div>
+ <div style="margin-right: 10px;">
+ <a-button @click="handleGenerateWave()">
+ {{ formatMessage('common.generateWave', '鐢熸垚娉㈡') }}
+ </a-button>
+ </div>
+ </div>
<a-input v-model:value="searchOrder" @change="handleSearchOrder"
:placeholder="formatMessage('page.input', '璇疯緭鍏�')" style="margin-bottom: 8px" />
- <a-tree @select="handleOrderSelected" :tree-data="orderData" v-model:checkedKeys="checkedOrderKeys" checkable blockNode>
+ <a-tree @select="handleOrderSelected" :tree-data="orderData" v-model:checkedKeys="checkedOrderKeys"
+ checkable blockNode>
<template #title="{ orderNo, createTime$ }">
<div style="display: flex;justify-content: space-between">
<div>{{ orderNo }}</div>
@@ -223,7 +258,7 @@
</template>
</a-table>
</a-card>
-
+
<OrderOutBatchPreviewView ref="orderOutBatchPreviewChild" @reload="handleChildReload" />
<OrderOutMergePreviewView ref="orderOutMergePreviewChild" @reload="handleChildReload" />
</div>
diff --git a/zy-asrs-admin/src/views/out/wave/edit.vue b/zy-asrs-admin/src/views/out/wave/edit.vue
new file mode 100644
index 0000000..1ae4ca9
--- /dev/null
+++ b/zy-asrs-admin/src/views/out/wave/edit.vue
@@ -0,0 +1,189 @@
+<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/wave/save' : '/api/wave/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 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.man_wave.wave_no', '娉㈡鍙�') "
+ name="waveNo"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.waveNo"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave.wave_type', '娉㈡绫诲瀷') "
+ name="waveType"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.waveType"
+ :options="[
+ { label: '鎵嬪姩', value: 0 },
+ { label: '鑷姩', value: 1 },
+ ]"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.man_wave.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.man_wave.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.man_wave.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.man_wave.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.man_wave.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.man_wave.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/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
new file mode 100644
index 0000000..63c3092
--- /dev/null
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -0,0 +1,330 @@
+<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';
+import OrderOutMergePreviewView from '@/components/orderOut/orderOutMergePreview/index.vue';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-wave';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+const orderOutMergePreviewChild = ref(null);
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+let tableDataColSpan = []
+const customColSpanProps = (index) => {
+ let count = tableDataColSpan[index];
+ if (count == null) {
+ count = 0;
+ }
+ return {
+ rowSpan: count,
+ };
+}
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
+
+state.columns = [
+ {
+ title: formatMessage('db.man_wave.wave_no', '娉㈡鍙�'),
+ dataIndex: 'waveNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ },
+ {
+ title: formatMessage('db.man_wave.waveType$', '绫诲瀷'),
+ dataIndex: 'waveType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveType$'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ },
+ {
+ title: formatMessage('db.man_wave.orderNo', '璁㈠崟鍙�'),
+ dataIndex: ['orderNo'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveType$'),
+ },
+ {
+ title: formatMessage('db.man_wave.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: ['mat$', 'matnr'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.man_wave.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: ['mat$', 'maktx'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.man_wave.batch', '鎵瑰彿'),
+ dataIndex: ['mat$', 'batch'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.man_wave.anfme', '鏁伴噺'),
+ dataIndex: ['anfme'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+
+];
+
+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/wave/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data.records;
+
+ let tmp = []
+ let idx = 0;
+ let colSpan = []
+ data.forEach((item) => {
+ let count = 0;
+
+ item.waveDetlList.forEach((val) => {
+ count += val.orderDetl$.length;
+ val.orderDetl$.forEach((detl) => {
+ detl.key = idx;
+ detl.waveNo = item.waveNo;
+ detl.waveId = item.id;
+ detl.waveType = item.waveType;
+ detl.waveType$ = item.waveType$;
+ tmp.push(detl)
+ })
+ })
+
+ colSpan[idx] = count;
+ idx += count;
+ })
+
+ tableDataColSpan = colSpan;
+ tableData.value = tmp;
+
+ console.log(tmp);
+
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const fieldList = [];
+getColumns();
+//鍔犺浇鎵╁睍瀛楁
+async function getColumns() {
+ let fieldResp = await post('/api/matField/list', {
+ unique: 1
+ })
+ let fieldResult = fieldResp.data;
+ let tmp = state.columns;
+ if (fieldResult.code == 200) {
+ let data = fieldResult.data;
+
+ data.forEach((item) => {
+ tmp.push({
+ title: formatMessage(item.language, item.describe),
+ name: item.name,
+ dataIndex: item.name,
+ key: item.name,
+ width: 140,
+ editable: true,
+ })
+
+ fieldList.push(item.name);
+ })
+
+ tmp.push({
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 200,
+ fixed: 'right',
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ })
+
+ state.columns = tmp;
+
+ } 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 handleGenerateOut = (item) => {
+ console.log(item);
+
+ get('/api/wave/list/' + item.waveId, {}).then(resp => {
+ let result = resp.data;
+ let data = result.data;
+ let orderIds = []
+ data.forEach((item) => {
+ orderIds.push(item.orderId)
+ })
+
+ orderOutMergePreviewChild.value.open = true;
+ orderOutMergePreviewChild.value.records = orderIds;
+ })
+}
+
+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 {
+ let waveIds = []
+ rows.forEach((item) => {
+ waveIds.push(item.waveId)
+ })
+
+ post('/api/out/wave/cancel', waveIds).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/wave/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()
+}
+
+const handleChildReload = () => {
+ handleTableReload()
+}
+
+</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 :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="index"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.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="handleGenerateOut(record)">{{ formatMessage('page.generateOut',
+ '鐢熸垚鍑哄簱浠诲姟')
+ }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
+ }}</a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+
+ <OrderOutMergePreviewView ref="orderOutMergePreviewChild" @reload="handleChildReload" />
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index 326c0ef..004fe36 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -89,6 +89,7 @@
}
wrapper.in(Order::getOrderType, types);
+ wrapper.isNull(Order::getWaveId);
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index 248a3cc..4e43601 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -71,4 +71,18 @@
outManage.orderOutMerge(param);
return R.ok();
}
+
+ @PostMapping("/out/wave/generate")
+ @Transactional
+ public R generateWave(@RequestBody List<Long> orderIds) {
+ outManage.generateWave(orderIds);
+ return R.ok();
+ }
+
+ @PostMapping("/out/wave/cancel")
+ @Transactional
+ public R cancelWave(@RequestBody List<Long> waveIds) {
+ outManage.cancelWave(waveIds);
+ return R.ok();
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java
new file mode 100644
index 0000000..d5c4fa1
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java
@@ -0,0 +1,114 @@
+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.asrs.entity.WaveDetl;
+import com.zy.asrs.wms.asrs.service.WaveDetlService;
+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.Wave;
+import com.zy.asrs.wms.asrs.service.WaveService;
+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 WaveController extends BaseController {
+
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveDetlService waveDetlService;
+
+ @PreAuthorize("hasAuthority('asrs:wave:list')")
+ @PostMapping("/wave/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Wave, BaseParam> pageParam = new PageParam<>(baseParam, Wave.class);
+ PageParam<Wave, BaseParam> page = waveService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:list')")
+ @PostMapping("/wave/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waveService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:list')")
+ @GetMapping("/wave/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waveService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:list')")
+ @GetMapping("/wave/list/{id}")
+ public R getList(@PathVariable("id") Long id) {
+ List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, id));
+ return R.ok().add(waveDetls);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:save')")
+ @OperationLog("娣诲姞娉㈡绠＄悊")
+ @PostMapping("/wave/save")
+ public R save(@RequestBody Wave wave) {
+ if (!waveService.save(wave)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:update')")
+ @OperationLog("淇敼娉㈡绠＄悊")
+ @PostMapping("/wave/update")
+ public R update(@RequestBody Wave wave) {
+ if (!waveService.updateById(wave)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:remove')")
+ @OperationLog("鍒犻櫎娉㈡绠＄悊")
+ @PostMapping("/wave/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waveService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:wave:list')")
+ @PostMapping("/wave/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Wave> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Wave::getId, condition);
+ }
+ waveService.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:wave:list')")
+ @PostMapping("/wave/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveDetlController.java
new file mode 100644
index 0000000..15043f8
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveDetlController.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.WaveDetl;
+import com.zy.asrs.wms.asrs.service.WaveDetlService;
+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 WaveDetlController extends BaseController {
+
+ @Autowired
+ private WaveDetlService waveDetlService;
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:list')")
+ @PostMapping("/waveDetl/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaveDetl, BaseParam> pageParam = new PageParam<>(baseParam, WaveDetl.class);
+ return R.ok().add(waveDetlService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:list')")
+ @PostMapping("/waveDetl/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waveDetlService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:list')")
+ @GetMapping("/waveDetl/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waveDetlService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:save')")
+ @OperationLog("娣诲姞娉㈡鏄庣粏绠＄悊")
+ @PostMapping("/waveDetl/save")
+ public R save(@RequestBody WaveDetl waveDetl) {
+ if (!waveDetlService.save(waveDetl)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:update')")
+ @OperationLog("淇敼娉㈡鏄庣粏绠＄悊")
+ @PostMapping("/waveDetl/update")
+ public R update(@RequestBody WaveDetl waveDetl) {
+ if (!waveDetlService.updateById(waveDetl)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:remove')")
+ @OperationLog("鍒犻櫎娉㈡鏄庣粏绠＄悊")
+ @PostMapping("/waveDetl/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waveDetlService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:waveDetl:list')")
+ @PostMapping("/waveDetl/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<WaveDetl> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(WaveDetl::getId, condition);
+ }
+ waveDetlService.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:waveDetl:list')")
+ @PostMapping("/waveDetl/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waveDetlService.list(), WaveDetl.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index 21cfba6..e2923fd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -12,10 +13,7 @@
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;
@@ -120,6 +118,20 @@
@ApiModelProperty(value= "浼樺厛绾�")
private Integer ioPri;
+ /**
+ * 娉㈡ID
+ */
+ @ApiModelProperty(value= "娉㈡ID")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Long waveId;
+
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value= "娉㈡鍙�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String waveNo;
+
public Order() {}
public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java
new file mode 100644
index 0000000..8b02b68
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java
@@ -0,0 +1,227 @@
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wms.asrs.service.WaveDetlService;
+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;
+import java.util.List;
+
+@Data
+@TableName("man_wave")
+public class Wave implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value= "娉㈡鍙�")
+ private String waveNo;
+
+ /**
+ * 娉㈡绫诲瀷 0: 鎵嬪姩 1: 鑷姩
+ */
+ @ApiModelProperty(value= "娉㈡绫诲瀷 0: 鎵嬪姩 1: 鑷姩 ")
+ private Integer waveType;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @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 Wave() {}
+
+ public Wave(String waveNo,Integer waveType,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.waveNo = waveNo;
+ this.waveType = waveType;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// Wave wave = new Wave(
+// null, // 娉㈡鍙�
+// null, // 娉㈡绫诲瀷
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getWaveType$(){
+ if (null == this.waveType){ return null; }
+ switch (this.waveType){
+ case 0:
+ return "鎵嬪姩";
+ case 1:
+ return "鑷姩";
+ default:
+ return String.valueOf(this.waveType);
+ }
+ }
+
+ public List<WaveDetl> getWaveDetlList(){
+ if (null == this.id){ return null; }
+ WaveDetlService service = SpringUtils.getBean(WaveDetlService.class);
+ List<WaveDetl> waveDetls = service.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, id));
+ if (waveDetls.isEmpty()) {
+ return null;
+ }
+ return waveDetls;
+ }
+
+ 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/WaveDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java
new file mode 100644
index 0000000..1c4799f
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java
@@ -0,0 +1,259 @@
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wms.asrs.service.OrderDetlService;
+import com.zy.asrs.wms.asrs.service.OrderService;
+import com.zy.asrs.wms.asrs.service.WaveService;
+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;
+import java.util.List;
+
+@Data
+@TableName("man_wave_detl")
+public class WaveDetl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 娉㈡ID
+ */
+ @ApiModelProperty(value= "娉㈡ID")
+ private Long waveId;
+
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value= "娉㈡鍙�")
+ private String waveNo;
+
+ /**
+ * 璁㈠崟ID
+ */
+ @ApiModelProperty(value= "璁㈠崟ID")
+ private Long orderId;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ private String orderNo;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @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 WaveDetl() {}
+
+ public WaveDetl(Long waveId,String waveNo,Long orderId,String orderNo,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.waveId = waveId;
+ this.waveNo = waveNo;
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// WaveDetl waveDetl = new WaveDetl(
+// null, // 娉㈡ID
+// null, // 娉㈡鍙�
+// null, // 璁㈠崟ID
+// null, // 璁㈠崟鍙�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getWaveId$(){
+ WaveService service = SpringUtils.getBean(WaveService.class);
+ Wave wave = service.getById(this.waveId);
+ if (!Cools.isEmpty(wave)){
+ return String.valueOf(wave.getId());
+ }
+ return null;
+ }
+
+ public String getOrderId$(){
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.getById(this.orderId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getId());
+ }
+ return null;
+ }
+
+ public Order getOrder$(){
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.getById(this.orderId);
+ if (!Cools.isEmpty(order)){
+ return order;
+ }
+ return null;
+ }
+
+ public List<OrderDetl> getOrderDetl$(){
+ OrderDetlService service = SpringUtils.getBean(OrderDetlService.class);
+ List<OrderDetl> orderDetls = service.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, this.orderId));
+ if (!orderDetls.isEmpty()){
+ return service.parseDetl(orderDetls);
+ }
+ return null;
+ }
+
+ 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/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index f0a908f..ba2a50e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -52,7 +52,12 @@
private OperationPortService operationPortService;
@Autowired
private OrderUtils orderUtils;
-
+ @Autowired
+ private OrderNoRuleService orderNoRuleService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveDetlService waveDetlService;
/**
* 鍑哄簱
@@ -726,4 +731,86 @@
}
+ @Transactional
+ public void generateWave(List<Long> orderIds) {
+ if (orderIds == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ if (orderIds.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ List<Order> orderList = orderService.listByIds(orderIds);
+ if (orderList.isEmpty()) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦�");
+ }
+
+ for (Order order : orderList) {
+ if (order.getWaveId() != null) {
+ throw new CoolException("褰撳墠璁㈠崟涓凡缁忕敓鎴愭尝娆�");
+ }
+ }
+
+ String waveNo = orderNoRuleService.getOrderNo(3);
+ Wave wave = new Wave();
+ wave.setWaveNo(waveNo);
+ wave.setWaveType(0);
+ if (!waveService.save(wave)) {
+ throw new CoolException("娉㈡鐢熸垚澶辫触");
+ }
+
+ for (Order order : orderList) {
+ WaveDetl waveDetl = new WaveDetl();
+ waveDetl.setWaveNo(waveNo);
+ waveDetl.setWaveId(wave.getId());
+ waveDetl.setOrderId(order.getId());
+ waveDetl.setOrderNo(order.getOrderNo());
+ if (!waveDetlService.save(waveDetl)) {
+ throw new CoolException("娉㈡鏄庣粏鐢熸垚澶辫触");
+ }
+
+ order.setWaveId(wave.getId());
+ order.setWaveNo(waveNo);
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("璁㈠崟鍙嶅啓娉㈡澶辫触");
+ }
+ }
+
+ }
+
+ @Transactional
+ public void cancelWave(List<Long> waveIds) {
+ if (waveIds == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ if (waveIds.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ List<Wave> waves = waveService.listByIds(waveIds);
+ if (waves.isEmpty()) {
+ throw new CoolException("娉㈡涓嶅瓨鍦�");
+ }
+
+ for (Wave wave : waves) {
+ List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, wave.getId()));
+ for (WaveDetl waveDetl : waveDetls) {
+ Order order = orderService.getById(waveDetl.getOrderId());
+ order.setWaveId(null);
+ order.setWaveNo(null);
+ if (!orderService.updateById(order)) {
+ throw new CoolException("璁㈠崟鍙嶅啓澶辫触");
+ }
+
+ waveDetlService.removeById(waveDetl.getId());
+ }
+
+ waveService.removeById(wave.getId());
+ }
+
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/TaskManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/TaskManage.java
deleted file mode 100644
index 478767d..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/TaskManage.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zy.asrs.wms.asrs.manage;
-
-import com.zy.asrs.wms.asrs.mapper.ViewLocDetlMapper;
-import com.zy.asrs.wms.asrs.service.TaskDetlService;
-import com.zy.asrs.wms.asrs.service.TaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-public class TaskManage {
-
- @Autowired
- private TaskService taskService;
-
-
- @Autowired
- private TaskDetlService taskDetlService;
-
- @Autowired
- private ViewLocDetlMapper viewLocDetlMapper;
-
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveDetlMapper.java
new file mode 100644
index 0000000..1384f72
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveDetlMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.WaveDetl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaveDetlMapper extends BaseMapper<WaveDetl> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveMapper.java
new file mode 100644
index 0000000..e26bb9d
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.Wave;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaveMapper extends BaseMapper<Wave> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveDetlService.java
new file mode 100644
index 0000000..b426d6a
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveDetlService.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.WaveDetl;
+
+public interface WaveDetlService extends IService<WaveDetl> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveService.java
new file mode 100644
index 0000000..2ce0191
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveService.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.Wave;
+
+public interface WaveService extends IService<Wave> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
index 4e036d8..22c4a1e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -4,12 +4,14 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.OrderType;
+import com.zy.asrs.wms.asrs.entity.Wave;
import com.zy.asrs.wms.asrs.mapper.OrderNoRuleMapper;
import com.zy.asrs.wms.asrs.entity.OrderNoRule;
import com.zy.asrs.wms.asrs.service.OrderNoRuleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.asrs.service.WaveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +30,8 @@
private OrderService orderService;
@Autowired
private OrderTypeService orderTypeService;
+ @Autowired
+ private WaveService waveService;
@Override
public String getOrderNo(Integer orderType) {
@@ -71,7 +75,18 @@
buffer.append(sizeBuilder);
}else {
//鏌ュ綋澶╂尝娆¤鍗曟暟閲�
- //todo..
+ LocalDateTime startOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+ List<Wave> waves = waveService.list(new LambdaQueryWrapper<Wave>().between(Wave::getCreateTime, startOfDay, endOfDay));
+ int size = waves.size();
+ String sizeStr = String.valueOf(size);
+ StringBuilder sizeBuilder = new StringBuilder(sizeStr);
+ if (sizeStr.length() < orderNoRule.getIncreaseNum()) {
+ for (int i = 0; i < orderNoRule.getIncreaseNum() - sizeStr.length(); i++) {
+ sizeBuilder.insert(0, "0");
+ }
+ }
+ buffer.append(sizeBuilder);
}
return buffer.toString();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveDetlServiceImpl.java
new file mode 100644
index 0000000..75fd440
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveDetlServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.zy.asrs.wms.asrs.mapper.WaveDetlMapper;
+import com.zy.asrs.wms.asrs.entity.WaveDetl;
+import com.zy.asrs.wms.asrs.service.WaveDetlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waveDetlService")
+public class WaveDetlServiceImpl extends ServiceImpl<WaveDetlMapper, WaveDetl> implements WaveDetlService {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveServiceImpl.java
new file mode 100644
index 0000000..a5946e8
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.zy.asrs.wms.asrs.mapper.WaveMapper;
+import com.zy.asrs.wms.asrs.entity.Wave;
+import com.zy.asrs.wms.asrs.service.WaveService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waveService")
+public class WaveServiceImpl extends ServiceImpl<WaveMapper, Wave> implements WaveService {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index 0853feb..17fe63e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_operation_port";
- generator.tableName="浣滀笟鍙ｇ鐞�";
+ generator.table="man_wave_detl";
+ generator.tableName="娉㈡鏄庣粏绠＄悊";
generator.rootPackagePath="com.zy.asrs.wms";
generator.packagePath="com.zy.asrs.wms.asrs";
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveDetlMapper.xml
new file mode 100644
index 0000000..72014b3
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveDetlMapper.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.WaveDetlMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveMapper.xml
new file mode 100644
index 0000000..2c2b2ec
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveMapper.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.WaveMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/sql/menu/wave.sql b/zy-asrs-wms/src/main/resources/sql/menu/wave.sql
new file mode 100644
index 0000000..b2c5225
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/sql/menu/wave.sql
@@ -0,0 +1,9 @@
+-- save wave record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '娉㈡绠＄悊绠＄悊', '0', '/asrs/wave', '/asrs/wave', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ娉㈡绠＄悊', '', '1', 'asrs:wave:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞娉㈡绠＄悊', '', '1', 'asrs:wave:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼娉㈡绠＄悊', '', '1', 'asrs:wave:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎娉㈡绠＄悊', '', '1', 'asrs:wave:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wms/src/main/resources/sql/menu/waveDetl.sql b/zy-asrs-wms/src/main/resources/sql/menu/waveDetl.sql
new file mode 100644
index 0000000..ca402d0
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/sql/menu/waveDetl.sql
@@ -0,0 +1,9 @@
+-- save waveDetl record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '娉㈡鏄庣粏绠＄悊绠＄悊', '0', '/asrs/waveDetl', '/asrs/waveDetl', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ娉㈡鏄庣粏绠＄悊', '', '1', 'asrs:waveDetl:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞娉㈡鏄庣粏绠＄悊', '', '1', 'asrs:waveDetl:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼娉㈡鏄庣粏绠＄悊', '', '1', 'asrs:waveDetl:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎娉㈡鏄庣粏绠＄悊', '', '1', 'asrs:waveDetl:remove', '3', '1', '1');
+
--
Gitblit v1.9.1