From 94aafd2a215bdf9377bdc4e2d67e4599c768eb71 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 11 九月 2024 19:07:19 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewStayTime.java | 22
zy-asrs-wms/src/main/resources/mapper/statistics/ViewInOutMapper.xml | 5
zy-asrs-admin/src/views/log/viewStayTime/index.vue | 207 +++++++
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/controller/statistics/ViewWorkInController.java | 56 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkInMapper.java | 13
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewStayTimeMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlServiceImpl.java | 10
zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountOutMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java | 45 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java | 42 +
zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue | 151 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java | 45 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkOutMapper.java | 13
zy-asrs-admin/src/views/log/viewWorkOut/index.vue | 202 +++++++
zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue | 151 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountOut.java | 25
zy-asrs-admin/src/views/log/viewInOut/index.vue | 151 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java | 47 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkIn.java | 13
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java | 9
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountOutMapper.java | 13
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlLogService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkOut.java | 13
zy-asrs-admin/src/views/log/viewWorkIn/index.vue | 202 +++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlLogServiceImpl.java | 15
zy-asrs-wms/src/main/resources/mapper/statistics/ViewStayTimeMapper.xml | 5
zy-asrs-wms/src/main/java/workCountIn.sql | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountInMapper.java | 12
zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountInMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountIn.java | 25
zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkInMapper.xml | 5
zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkOutMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewInOutMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java | 56 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewInOut.java | 25
37 files changed, 1,623 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-admin/src/views/log/viewInOut/index.vue b/zy-asrs-admin/src/views/log/viewInOut/index.vue
new file mode 100644
index 0000000..ec295c0
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewInOut/index.vue
@@ -0,0 +1,151 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-taskType';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.view_in_out.ymd', '鏃ユ湡'),
+ dataIndex: 'ymd',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ymd'),
+ },
+ {
+ title: formatMessage('db.view_in_out.inQty', '鍏ュ簱娆℃暟'),
+ dataIndex: 'inQty',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('inQty'),
+ },
+ {
+ title: formatMessage('db.view_in_out.outQty', '鍑哄簱娆℃暟'),
+ dataIndex: 'outQty',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('outQty'),
+ },
+ {
+ title: formatMessage('db.view_in_out.mat_id', '鍏ュ嚭鎬绘暟'),
+ dataIndex: 'totalQty',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('totalQty'),
+ },
+];
+
+
+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() {
+ state.loading = true;
+ post('/api/viewInOut/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewInOut/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>
+ <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="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"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/log/viewStayTime/index.vue b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
new file mode 100644
index 0000000..9c957e6
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
@@ -0,0 +1,207 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-taskType';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.man_loc_detl.stayTime', '婊炵暀澶╂暟'),
+ dataIndex: 'stayTime',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('stayTime'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.loc_id', '搴撲綅'),
+ dataIndex: 'locId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('locId$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.loc_no', '搴撲綅鍙�'),
+ dataIndex: 'locNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('locNo'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.mat_id', '鍟嗗搧'),
+ dataIndex: 'matId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matId$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: 'matnr',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
+ dataIndex: 'orderNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.batch', '鎵瑰彿'),
+ dataIndex: 'batch',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.anfme', '鏁伴噺'),
+ dataIndex: 'anfme',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
+];
+
+
+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() {
+ state.loading = true;
+ post('/api/viewStayTime/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewStayTime/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>
+ <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="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"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
new file mode 100644
index 0000000..427d6e4
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
@@ -0,0 +1,151 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-taskType';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.view_work_count_in.oneday', '鍏ュ簱鏃ユ湡'),
+ dataIndex: 'oneday',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('oneday'),
+ },
+ {
+ title: formatMessage('db.view_work_count_in.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: 'matnr',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.view_work_count_in.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.view_work_count_in.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() {
+ state.loading = true;
+ post('/api/viewWorkCountIn/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewWorkCountIn/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>
+ <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="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"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
new file mode 100644
index 0000000..6c8f45e
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
@@ -0,0 +1,151 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-taskType';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.view_work_count_out.oneday', '鍑哄簱鏃ユ湡'),
+ dataIndex: 'oneday',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('oneday'),
+ },
+ {
+ title: formatMessage('db.view_work_count_out.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: 'matnr',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.view_work_count_out.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.view_work_count_out.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() {
+ state.loading = true;
+ post('/api/viewWorkCountOut/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewWorkCountOut/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>
+ <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="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"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
new file mode 100644
index 0000000..3254c6a
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
@@ -0,0 +1,202 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-viewWorkIn';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+state.columns = [
+ {
+ title: formatMessage('db.view_work_in.create_time', '鍏ュ簱鏃ユ湡'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.view_work_in.locNo', '搴撲綅鍙�'),
+ dataIndex: ['task$', 'targetLoc'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('locNo'),
+ },
+ {
+ title: formatMessage('db.view_work_in.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: ['mat$', 'matnr'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.view_work_in.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: ['mat$', 'maktx'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.view_work_in.batch', '鎵瑰彿'),
+ dataIndex: 'batch',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.view_work_in.anfme', '鏁伴噺'),
+ dataIndex: 'anfme',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.view_work_in.barcode', '鎵樼洏鐮�'),
+ dataIndex: 'barcode',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('barcode'),
+ }
+];
+
+
+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() {
+ state.loading = true;
+ post('/api/viewWorkIn/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+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,
+ })
+ })
+ state.columns = tmp;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewWorkIn/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>
+ <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="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="state.columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/log/viewWorkOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
new file mode 100644
index 0000000..9772b92
--- /dev/null
+++ b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
@@ -0,0 +1,202 @@
+<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 { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-viewWorkIn';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+state.columns = [
+ {
+ title: formatMessage('db.view_work_in.create_time', '鍏ュ簱鏃ユ湡'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.view_work_in.locNo', '搴撲綅鍙�'),
+ dataIndex: ['task$', 'originLoc'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('locNo'),
+ },
+ {
+ title: formatMessage('db.view_work_in.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: ['mat$', 'matnr'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.view_work_in.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: ['mat$', 'maktx'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.view_work_in.batch', '鎵瑰彿'),
+ dataIndex: 'batch',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.view_work_in.anfme', '鏁伴噺'),
+ dataIndex: 'anfme',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.view_work_in.barcode', '鎵樼洏鐮�'),
+ dataIndex: 'barcode',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('barcode'),
+ }
+];
+
+
+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() {
+ state.loading = true;
+ post('/api/viewWorkOut/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;
+
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+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,
+ })
+ })
+ state.columns = tmp;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/viewWorkOut/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>
+ <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="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="state.columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading">
+ <template #bodyCell="{ column, text, record }">
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
new file mode 100644
index 0000000..dd302f3
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
@@ -0,0 +1,45 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewInOut;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewInOutMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewInOutController extends BaseController {
+
+ @Autowired
+ private ViewInOutMapper viewInOutMapper;
+
+ @PreAuthorize("hasAuthority('asrs:viewInOut:list')")
+ @PostMapping("/viewInOut/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewInOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewInOut.class);
+ QueryWrapper<ViewInOut> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<ViewInOut, BaseParam> page = viewInOutMapper.selectPage(pageParam, queryWrapper);
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewInOut:list')")
+ @PostMapping("/viewInOut/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewInOut> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewInOutMapper.selectList(wrapper), ViewInOut.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java
new file mode 100644
index 0000000..9bced7d
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewStayTime;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewStayTimeMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewStayTimeController extends BaseController {
+
+ @Autowired
+ private ViewStayTimeMapper viewStayTimeMapper;
+
+ @PreAuthorize("hasAuthority('asrs:viewStayTime:list')")
+ @PostMapping("/viewStayTime/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewStayTime, BaseParam> pageParam = new PageParam<>(baseParam, ViewStayTime.class);
+ QueryWrapper<ViewStayTime> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("stay_time"));
+ PageParam<ViewStayTime, BaseParam> page = viewStayTimeMapper.selectPage(pageParam, queryWrapper);
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewStayTime:list')")
+ @PostMapping("/viewStayTime/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewStayTime> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewStayTimeMapper.selectList(wrapper), ViewStayTime.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
new file mode 100644
index 0000000..b6386d0
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
@@ -0,0 +1,45 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkCountInMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkCountInController extends BaseController {
+
+ @Autowired
+ private ViewWorkCountInMapper viewWorkCountInMapper;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
+ @PostMapping("/viewWorkCountIn/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountIn.class);
+ QueryWrapper<ViewWorkCountIn> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ PageParam<ViewWorkCountIn, BaseParam> page = viewWorkCountInMapper.selectPage(pageParam, queryWrapper);
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
+ @PostMapping("/viewWorkCountIn/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewWorkCountIn> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewWorkCountInMapper.selectList(wrapper), ViewWorkCountIn.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java
new file mode 100644
index 0000000..cf61d11
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountOut;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkCountInMapper;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkCountOutMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkCountOutController extends BaseController {
+
+ @Autowired
+ private ViewWorkCountOutMapper viewWorkCountOutMapper;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountOut:list')")
+ @PostMapping("/viewWorkCountOut/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountOut.class);
+ QueryWrapper<ViewWorkCountOut> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ PageParam<ViewWorkCountOut, BaseParam> page = viewWorkCountOutMapper.selectPage(pageParam, queryWrapper);
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountOut:list')")
+ @PostMapping("/viewWorkCountOut/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewWorkCountOut> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewWorkCountOutMapper.selectList(wrapper), ViewWorkCountOut.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java
new file mode 100644
index 0000000..4d967a0
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.TaskDetlFieldLog;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkIn;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkInMapper;
+import com.zy.asrs.wms.asrs.service.TaskDetlFieldLogService;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkInController extends BaseController {
+
+ @Autowired
+ private ViewWorkInMapper viewWorkInMapper;
+ @Autowired
+ private TaskDetlFieldLogService taskDetlFieldLogService;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkIn:list')")
+ @PostMapping("/viewWorkIn/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkIn.class);
+ QueryWrapper<ViewWorkIn> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<ViewWorkIn, BaseParam> page = viewWorkInMapper.selectPage(pageParam, queryWrapper);
+ List<ViewWorkIn> records = page.getRecords();
+ for (ViewWorkIn record : records) {
+ List<TaskDetlFieldLog> list = taskDetlFieldLogService.list(new LambdaQueryWrapper<TaskDetlFieldLog>().eq(TaskDetlFieldLog::getDetlId, record.getId()));
+ record.syncField(list);
+ }
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkIn:list')")
+ @PostMapping("/viewWorkIn/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewWorkIn> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewWorkInMapper.selectList(wrapper), ViewWorkIn.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
new file mode 100644
index 0000000..1c3cb56
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.TaskDetlFieldLog;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkOut;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkOutMapper;
+import com.zy.asrs.wms.asrs.service.TaskDetlFieldLogService;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkOutController extends BaseController {
+
+ @Autowired
+ private ViewWorkOutMapper viewWorkOutMapper;
+ @Autowired
+ private TaskDetlFieldLogService taskDetlFieldLogService;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
+ @PostMapping("/viewWorkOut/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
+ QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<ViewWorkOut, BaseParam> page = viewWorkOutMapper.selectPage(pageParam, queryWrapper);
+ List<ViewWorkOut> records = page.getRecords();
+ for (ViewWorkOut record : records) {
+ List<TaskDetlFieldLog> list = taskDetlFieldLogService.list(new LambdaQueryWrapper<TaskDetlFieldLog>().eq(TaskDetlFieldLog::getDetlId, record.getId()));
+ record.syncField(list);
+ }
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
+ @PostMapping("/viewWorkOut/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ QueryWrapper<ViewWorkOut> wrapper = new QueryWrapper<>();
+ ExcelUtil.build(ExcelUtil.create(viewWorkOutMapper.selectList(wrapper), ViewWorkOut.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
index ed638ca..b1c0a87 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
@@ -246,6 +246,15 @@
return null;
}
+ public TaskLog getTask$(){
+ TaskLogService service = SpringUtils.getBean(TaskLogService.class);
+ TaskLog taskLog = service.getById(this.getTaskId());
+ if (!Cools.isEmpty(taskLog)){
+ return taskLog;
+ }
+ return null;
+ }
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewInOut.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewInOut.java
new file mode 100644
index 0000000..a964d70
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewInOut.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("view_in_out")
+public class ViewInOut {
+
+ @ApiModelProperty("鏃ユ湡")
+ private String ymd;
+
+ @ApiModelProperty("鍏ュ簱娆℃暟")
+ private Long inQty;
+
+ @ApiModelProperty("鍑哄簱娆℃暟")
+ private Long outQty;
+
+ @ApiModelProperty("鍏ュ嚭鎬绘暟")
+ private Long totalQty;
+
+ private Long hostId;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewStayTime.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewStayTime.java
new file mode 100644
index 0000000..e38d338
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewStayTime.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.wms.asrs.entity.LocDetl;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("view_stay_time")
+public class ViewStayTime extends LocDetl {
+
+ @ApiModelProperty(value= "褰撳墠鏃堕棿")
+ private Date today;
+
+ @ApiModelProperty(value= "婊炵暀澶╂暟")
+ private Integer stayTime;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountIn.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountIn.java
new file mode 100644
index 0000000..9115820
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountIn.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("view_work_count_in")
+public class ViewWorkCountIn {
+
+ @ApiModelProperty("鍏ュ簱鏃ユ湡")
+ private String oneday;
+
+ @ApiModelProperty("鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @ApiModelProperty("鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("鏁伴噺")
+ private Double anfme;
+
+ private Long hostId;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountOut.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountOut.java
new file mode 100644
index 0000000..8b5717f
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkCountOut.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("view_work_count_out")
+public class ViewWorkCountOut {
+
+ @ApiModelProperty("鍑哄簱鏃ユ湡")
+ private String oneday;
+
+ @ApiModelProperty("鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @ApiModelProperty("鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("鏁伴噺")
+ private Double anfme;
+
+ private Long hostId;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkIn.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkIn.java
new file mode 100644
index 0000000..27acafb
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkIn.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.wms.asrs.entity.TaskDetlLog;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("view_work_in")
+public class ViewWorkIn extends TaskDetlLog {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkOut.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkOut.java
new file mode 100644
index 0000000..ad05ea2
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/statistics/ViewWorkOut.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wms.asrs.entity.statistics;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.wms.asrs.entity.TaskDetlLog;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("view_work_out")
+public class ViewWorkOut extends TaskDetlLog {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewInOutMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewInOutMapper.java
new file mode 100644
index 0000000..864b26a
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewInOutMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewInOut;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewInOutMapper extends BaseMapper<ViewInOut> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewStayTimeMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewStayTimeMapper.java
new file mode 100644
index 0000000..6ca5f66
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewStayTimeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewStayTime;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewStayTimeMapper extends BaseMapper<ViewStayTime> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountInMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountInMapper.java
new file mode 100644
index 0000000..29974b0
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountInMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewWorkCountInMapper extends BaseMapper<ViewWorkCountIn> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountOutMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountOutMapper.java
new file mode 100644
index 0000000..f53fc02
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkCountOutMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountOut;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewWorkCountOutMapper extends BaseMapper<ViewWorkCountOut> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkInMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkInMapper.java
new file mode 100644
index 0000000..a1702cb
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkInMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewInOut;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkIn;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewWorkInMapper extends BaseMapper<ViewWorkIn> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkOutMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkOutMapper.java
new file mode 100644
index 0000000..4df9758
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/statistics/ViewWorkOutMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wms.asrs.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkIn;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkOut;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ViewWorkOutMapper extends BaseMapper<ViewWorkOut> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlLogService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlLogService.java
index 13c6d19..70c64bb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlLogService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlLogService.java
@@ -11,4 +11,6 @@
List<Long> getTaskIdsByDetlId(Long detlId);
+ List<TaskDetlLog> parseDetl(List<TaskDetlLog> list);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlService.java
index d751579..d733a8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskDetlService.java
@@ -11,4 +11,6 @@
List<Long> getTaskIdsByDetlId(Long detlId);
+ List<TaskDetl> parseDetl(List<TaskDetl> list);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlLogServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlLogServiceImpl.java
index fe47dc2..2e6c3c6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlLogServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlLogServiceImpl.java
@@ -1,13 +1,9 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wms.asrs.entity.TaskDetl;
-import com.zy.asrs.wms.asrs.entity.TaskDetlField;
-import com.zy.asrs.wms.asrs.entity.TaskDetlFieldLog;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.mapper.TaskDetlLogMapper;
-import com.zy.asrs.wms.asrs.entity.TaskDetlLog;
import com.zy.asrs.wms.asrs.service.TaskDetlFieldLogService;
-import com.zy.asrs.wms.asrs.service.TaskDetlFieldService;
import com.zy.asrs.wms.asrs.service.TaskDetlLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,4 +32,13 @@
public List<Long> getTaskIdsByDetlId(Long detlId) {
return this.baseMapper.getTaskIdsByDetlId(detlId);
}
+
+ @Override
+ public List<TaskDetlLog> parseDetl(List<TaskDetlLog> list) {
+ for (TaskDetlLog taskDetlLog : list) {
+ List<TaskDetlFieldLog> taskDetlFieldLogList = taskDetlFieldLogService.list(new LambdaQueryWrapper<TaskDetlFieldLog>().eq(TaskDetlFieldLog::getDetlId, taskDetlLog.getId()));
+ taskDetlLog.syncField(taskDetlFieldLogList);
+ }
+ return list;
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlServiceImpl.java
index fa9edd6..68ccbb7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskDetlServiceImpl.java
@@ -10,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
import java.util.List;
@Service("taskDetlService")
@@ -33,4 +32,13 @@
public List<Long> getTaskIdsByDetlId(Long detlId) {
return this.baseMapper.getTaskIdsByDetlId(detlId);
}
+
+ @Override
+ public List<TaskDetl> parseDetl(List<TaskDetl> list) {
+ for (TaskDetl taskDetl : list) {
+ List<TaskDetlField> taskDetlFieldList = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()));
+ taskDetl.syncField(taskDetlFieldList);
+ }
+ return list;
+ }
}
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 17fe63e..45dd45b 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_wave_detl";
- generator.tableName="娉㈡鏄庣粏绠＄悊";
+ generator.table="view_work_count_in";
+ generator.tableName="鏃ュ叆搴撴眹鎬绘煡璇�";
generator.rootPackagePath="com.zy.asrs.wms";
generator.packagePath="com.zy.asrs.wms.asrs";
diff --git a/zy-asrs-wms/src/main/java/workCountIn.sql b/zy-asrs-wms/src/main/java/workCountIn.sql
new file mode 100644
index 0000000..6f95250
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/workCountIn.sql
@@ -0,0 +1,6 @@
+-- save workCountIn record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '鏃ュ嚭搴撴眹鎬绘煡璇�', '1065', '/log/viewWorkCountOut', '/log/viewWorkCountOut', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ鏁版嵁', '', '1', 'asrs:viewWorkCountOut:list', '0', '1', '1');
+
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewInOutMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewInOutMapper.xml
new file mode 100644
index 0000000..3626f35
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewInOutMapper.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.statistics.ViewInOutMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewStayTimeMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewStayTimeMapper.xml
new file mode 100644
index 0000000..8deedc7
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewStayTimeMapper.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.statistics.ViewStayTimeMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountInMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountInMapper.xml
new file mode 100644
index 0000000..b1e63b5
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountInMapper.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.statistics.ViewWorkCountInMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountOutMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountOutMapper.xml
new file mode 100644
index 0000000..b1e63b5
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkCountOutMapper.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.statistics.ViewWorkCountInMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkInMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkInMapper.xml
new file mode 100644
index 0000000..3dabb25
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkInMapper.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.statistics.ViewWorkInMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkOutMapper.xml b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkOutMapper.xml
new file mode 100644
index 0000000..b6c15d3
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/statistics/ViewWorkOutMapper.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.statistics.ViewWorkOutMapper">
+
+</mapper>
--
Gitblit v1.9.1