#

Junjie

2024-09-24 8f82164ccc074676e995f762a56036face7186fc

#

 zy-asrs-admin/src/views/asrs/platformDetlLog/edit.vue

New file
@@ -0,0 +1,316 @@
<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/platformDetlLog/save' : '/api/platformDetlLog/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 platformQueryList = ref(null); 
platformQuery();
function platformQuery() { 
    postForm('/api/platform/query', {}).then(resp => { 
        let result = resp.data;
        platformQueryList.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 orderDetlQueryList = ref(null); 
orderDetlQuery();
function orderDetlQuery() { 
    postForm('/api/orderDetl/query', {}).then(resp => { 
        let result = resp.data;
        orderDetlQueryList.value = result.data;
    })
}
const taskDetlQueryList = ref(null); 
taskDetlQuery();
function taskDetlQuery() { 
    postForm('/api/taskDetl/query', {}).then(resp => { 
        let result = resp.data;
        taskDetlQueryList.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_platform_detl_log.platform_id', '集货ID') " 
                      name="platformId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.platformId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="platformQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.platform_no', '集货编号') " 
                      name="platformNo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.platformNo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.order_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_platform_detl_log.order_detl_id', '订单明细') " 
                      name="orderDetlId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.orderDetlId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="orderDetlQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.task_detl_id', '任务明细') " 
                      name="taskDetlId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.taskDetlId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="taskDetlQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.matnr', '商品编号') " 
                      name="matnr" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.matnr" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.batch', '批号') " 
                      name="batch" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.batch" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.field_params', '索引字段') " 
                      name="fieldParams" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.fieldParams" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.anfme', '需求数量') " 
                      name="anfme" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.anfme" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.qty', '实际数量') " 
                      name="qty" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.qty" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_platform_detl_log.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_platform_detl_log.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_platform_detl_log.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_platform_detl_log.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_platform_detl_log.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_platform_detl_log.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>

 zy-asrs-admin/src/views/asrs/platformDetlLog/index.vue

New file
@@ -0,0 +1,283 @@
<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-platformDetlLog';
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_platform_detl_log.platform_id', '集货ID'),
            dataIndex: 'platformId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('platformId$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.platform_no', '集货编号'),
            dataIndex: 'platformNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('platformNo'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.order_id', '订单'),
            dataIndex: 'orderId',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderId'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.order_detl_id', '订单明细'),
            dataIndex: 'orderDetlId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderDetlId$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.task_detl_id', '任务明细'),
            dataIndex: 'taskDetlId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('taskDetlId$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.matnr', '商品编号'),
            dataIndex: 'matnr',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('matnr'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.batch', '批号'),
            dataIndex: 'batch',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('batch'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.field_params', '索引字段'),
            dataIndex: 'fieldParams',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('fieldParams'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.anfme', '需求数量'),
            dataIndex: 'anfme',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('anfme'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.qty', '实际数量'),
            dataIndex: 'qty',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('qty'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_platform_detl_log.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },

  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
    fixed: 'right',
  },
];

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/platformDetlLog/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 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/platformDetlLog/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/platformDetlLog/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" :loading="state.loading">
      <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>

 zy-asrs-admin/src/views/asrs/waveDetlLog/edit.vue

New file
@@ -0,0 +1,277 @@
<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/waveDetlLog/save' : '/api/waveDetlLog/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 waveLogQueryList = ref(null); 
waveLogQuery();
function waveLogQuery() { 
    postForm('/api/waveLog/query', {}).then(resp => { 
        let result = resp.data;
        waveLogQueryList.value = result.data;
    })
}
const matQueryList = ref(null); 
matQuery();
function matQuery() { 
    postForm('/api/mat/query', {}).then(resp => { 
        let result = resp.data;
        matQueryList.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_log.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="waveLogQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.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_log.mat_id', '商品ID') " 
                      name="matId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.matId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="matQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.matnr', '商品编号') " 
                      name="matnr" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.matnr" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.batch', '批号') " 
                      name="batch" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.batch" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.stock_index', '商品库存索引') " 
                      name="stockIndex" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.stockIndex" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.anfme', '数量') " 
                      name="anfme" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.anfme" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.work_qty', '工作数量') " 
                      name="workQty" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.workQty" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.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_log.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_log.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_log.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_log.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_log.memo', '备注') " 
                      name="memo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.memo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_detl_log.field_params', '索引字段') " 
                      name="fieldParams" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.fieldParams" 
                     /> 
                        </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>

 zy-asrs-admin/src/views/asrs/waveDetlLog/index.vue

New file
@@ -0,0 +1,276 @@
<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-waveDetlLog';
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_wave_detl_log.wave_id', '波次ID'),
            dataIndex: 'waveId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('waveId$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.wave_no', '波次号'),
            dataIndex: 'waveNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('waveNo'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.mat_id', '商品ID'),
            dataIndex: 'matId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('matId$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.matnr', '商品编号'),
            dataIndex: 'matnr',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('matnr'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.batch', '批号'),
            dataIndex: 'batch',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('batch'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.stock_index', '商品库存索引'),
            dataIndex: 'stockIndex',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('stockIndex'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.anfme', '数量'),
            dataIndex: 'anfme',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('anfme'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.work_qty', '工作数量'),
            dataIndex: 'workQty',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('workQty'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },
        {
            title: formatMessage('db.man_wave_detl_log.field_params', '索引字段'),
            dataIndex: 'fieldParams',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('fieldParams'),
        },

  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
    fixed: 'right',
  },
];

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/waveDetlLog/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 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/waveDetlLog/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/waveDetlLog/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" :loading="state.loading">
      <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>

 zy-asrs-admin/src/views/asrs/waveLog/edit.vue

New file
@@ -0,0 +1,205 @@
<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/waveLog/save' : '/api/waveLog/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_log.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_log.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_log.wave_status', '波次状态') " 
                      name="waveStatus" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.waveStatus" 
                        :options="[
                                { label: '初始化', value: 0 },
                                { label: '生成任务', value: 1 },
                                { label: '任务播种', value: 2 },
                                { label: '完成', value: 3 },
                            ]"
                        >
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_log.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_log.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_log.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_log.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_log.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_log.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>

 zy-asrs-admin/src/views/asrs/waveLog/index.vue

copy from zy-asrs-admin/src/views/base/cacheSite/index.vue
copy to zy-asrs-admin/src/views/asrs/waveLog/index.vue
File was copied from zy-asrs-admin/src/views/base/cacheSite/index.vue
@@ -11,7 +11,7 @@

const router = useRouter();

const TABLE_KEY = 'table-cacheSite';
const TABLE_KEY = 'table-waveLog';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -31,83 +31,69 @@
} = useTableSearch();

const columns = [
  {
    title: formatMessage('db.man_cache_site.channel', '通道'),
    dataIndex: 'channel',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('channel'),
  },
  {
    title: formatMessage('db.man_cache_site.site_no', '站点编号'),
    dataIndex: 'siteNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteNo'),
  },
  {
    title: formatMessage('db.man_cache_site.site_status', '站点状态'),
    dataIndex: 'siteStatus$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteStatus$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_id', '订单ID'),
    dataIndex: 'orderId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  // {
  //   title: formatMessage('db.man_cache_site.status', '状态'),
  //   dataIndex: 'status$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('status$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_time', '添加时间'),
  //   dataIndex: 'createTime$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createTime$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_by', '添加人员'),
  //   dataIndex: 'createBy$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createBy$'),
  // },
  {
    title: formatMessage('db.man_cache_site.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },
        {
            title: formatMessage('db.man_wave_log.wave_no', '波次号'),
            dataIndex: 'waveNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('waveNo'),
        },
        {
            title: formatMessage('db.man_wave_log.wave_type', '波次类型'),
            dataIndex: 'waveType$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('waveType$'),
        },
        {
            title: formatMessage('db.man_wave_log.wave_status', '波次状态'),
            dataIndex: 'waveStatus$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('waveStatus$'),
        },
        {
            title: formatMessage('db.man_wave_log.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_wave_log.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_wave_log.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_wave_log.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_wave_log.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_wave_log.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },

  {
    title: formatMessage('common.operation', '操作'),
@@ -135,7 +121,7 @@

function getPage() {
  state.loading = true;
  post('/api/cacheSite/page', {
  post('/api/waveLog/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
@@ -169,7 +155,7 @@
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/cacheSite/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
        post('/api/waveLog/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
          let result = resp.data;
          if (result.code === 200) {
            message.success(result.msg);
@@ -187,7 +173,7 @@
}

const handleExport = async (intl) => {
  postBlob('/api/cacheSite/export', {}).then(result => {
  postBlob('/api/waveLog/export', {}).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;
@@ -213,7 +199,7 @@

<script>
export default {
  name: '播种站点'
  name: '波次历史'
}
</script>

@@ -231,8 +217,7 @@
    <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">
      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
      <template #bodyCell="{ column, text, record }">
        <template v-if="column.dataIndex === 'oper'">
          <div style="display: flex;justify-content: space-evenly;">

 zy-asrs-admin/src/views/asrs/waveSeedLog/edit.vue

New file
@@ -0,0 +1,316 @@
<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/waveSeedLog/save' : '/api/waveSeedLog/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 cacheSiteQueryList = ref(null); 
cacheSiteQuery();
function cacheSiteQuery() { 
    postForm('/api/cacheSite/query', {}).then(resp => { 
        let result = resp.data;
        cacheSiteQueryList.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 orderDetlQueryList = ref(null); 
orderDetlQuery();
function orderDetlQuery() { 
    postForm('/api/orderDetl/query', {}).then(resp => { 
        let result = resp.data;
        orderDetlQueryList.value = result.data;
    })
}
const taskDetlQueryList = ref(null); 
taskDetlQuery();
function taskDetlQuery() { 
    postForm('/api/taskDetl/query', {}).then(resp => { 
        let result = resp.data;
        taskDetlQueryList.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_seed_log.site_id', '站点ID') " 
                      name="siteId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.siteId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="cacheSiteQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.site_no', '站点编号') " 
                      name="siteNo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.siteNo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.order_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_seed_log.order_detl_id', '订单明细') " 
                      name="orderDetlId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.orderDetlId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="orderDetlQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.task_detl_id', '任务明细') " 
                      name="taskDetlId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.taskDetlId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="taskDetlQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.anfme', '数量') " 
                      name="anfme" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.anfme" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.work_qty', '复核数量') " 
                      name="workQty" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.workQty" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.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_seed_log.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_seed_log.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_seed_log.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_seed_log.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_seed_log.memo', '备注') " 
                      name="memo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.memo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.matnr', '商品编号') " 
                      name="matnr" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.matnr" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.batch', '批号') " 
                      name="batch" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.batch" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_wave_seed_log.field_params', '索引字段') " 
                      name="fieldParams" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.fieldParams" 
                     /> 
                        </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>

 zy-asrs-admin/src/views/asrs/waveSeedLog/index.vue

New file
@@ -0,0 +1,283 @@
<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-waveSeedLog';
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_wave_seed_log.site_id', '站点ID'),
            dataIndex: 'siteId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('siteId$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.site_no', '站点编号'),
            dataIndex: 'siteNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('siteNo'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.order_id', '订单'),
            dataIndex: 'orderId',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderId'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.order_detl_id', '订单明细'),
            dataIndex: 'orderDetlId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderDetlId$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.task_detl_id', '任务明细'),
            dataIndex: 'taskDetlId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('taskDetlId$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.anfme', '数量'),
            dataIndex: 'anfme',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('anfme'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.work_qty', '复核数量'),
            dataIndex: 'workQty',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('workQty'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.matnr', '商品编号'),
            dataIndex: 'matnr',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('matnr'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.batch', '批号'),
            dataIndex: 'batch',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('batch'),
        },
        {
            title: formatMessage('db.man_wave_seed_log.field_params', '索引字段'),
            dataIndex: 'fieldParams',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('fieldParams'),
        },

  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
    fixed: 'right',
  },
];

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/waveSeedLog/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 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/waveSeedLog/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/waveSeedLog/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" :loading="state.loading">
      <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>

 zy-asrs-admin/src/views/out/cacheSite/edit.vue

 zy-asrs-admin/src/views/out/cacheSite/index.vue

New file
@@ -0,0 +1,430 @@
<script setup>
import { getCurrentInstance, ref, computed, reactive } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postForm, 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-cacheSite';
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_cache_site.channel', '通道'),
    dataIndex: 'channel',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('channel'),
  },
  {
    title: formatMessage('db.man_cache_site.site_no', '站点编号'),
    dataIndex: 'siteNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteNo'),
  },
  {
    title: formatMessage('db.man_cache_site.site_status', '站点状态'),
    dataIndex: 'siteStatus$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteStatus$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_id', '订单ID'),
    dataIndex: 'orderId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  {
    title: formatMessage('db.man_cache_site.platform_no', '集货编号'),
    dataIndex: 'platformNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('platformNo'),
  },
  // {
  //   title: formatMessage('db.man_cache_site.status', '状态'),
  //   dataIndex: 'status$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('status$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_time', '添加时间'),
  //   dataIndex: 'createTime$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createTime$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_by', '添加人员'),
  //   dataIndex: 'createBy$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createBy$'),
  // },
  {
    title: formatMessage('db.man_cache_site.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },

  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 340,
    fixed: 'right',
  },
];

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/cacheSite/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 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/cacheSite/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/cacheSite/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 openBindPlatform = ref(false);
const currentCacheSite = ref(null)
const platform = ref(null)
const platformQueryList = ref(null);
platformQuery();
function platformQuery() {
  postForm('/api/platform/query', {}).then(resp => {
    let result = resp.data;
    platformQueryList.value = result.data;

    if (platformQueryList.value.length > 0) {
      platform.value = platformQueryList.value[0];
    }
  })
}

const handleBindPlatform = (item) => {
  openBindPlatform.value = true;
  currentCacheSite.value = item;
}

const handleBindPlatformOk = (item) => {
  const hide = message.loading(formatMessage('common.loading', '请求中'));
  try {
    post('/api/cacheSite/bindPlatform', {
      siteNo: currentCacheSite.value.siteNo,
      platformId: platform.value.value,
    }).then(resp => {
      let result = resp.data;
      console.log(result);

      if (result.code === 200) {
        message.success(result.msg);
      } else {
        message.error(result.msg);
      }
      getPage()
      hide()
      openBindPlatform.value = false;
    })
  } catch (error) {
    message.error(formatMessage('common.fail', '请求失败'));
  }
}

function seedComplete(item) {
  const hide = message.loading(formatMessage('common.loading', '请求中'));
  try {
    post('/api/cacheSite/seedComplete', {
      siteNo: item.siteNo,
    }).then(resp => {
      let result = resp.data;
      console.log(result);

      if (result.code === 200) {
        message.success(result.msg);
      } else {
        message.error(result.msg);
      }
      getPage()
      hide()
    })
  } catch (error) {
    message.error(formatMessage('common.fail', '请求失败'));
  }
}

const handleSeedComplete = (item) => {
  if (item.platformId == null) {
    message.error(formatMessage('page.cacheSite.bindPlatform.fail', '请先绑定集货区域编号'));
    return;
  }

  Modal.confirm({
    title: formatMessage('page.cacheSite.seedComplete', '播种完成'),
    content: formatMessage('page.cacheSite.seedComplete.confirm', '确定播种完成吗？'),
    maskClosable: true,
    onOk: async () => {
      let resp = await post('/api/cacheSite/seedCompletePreview', {
        siteNo: item.siteNo,
      })
      let check = resp.data.data;

      if (check) {
        seedComplete(item)
      } else {
        Modal.confirm({
          title: formatMessage('page.notice', '通知'),
          content: formatMessage('page.cacheSite.seedComplete.confirm', '订单未完成，是否继续？'),
          maskClosable: true,
          onOk: async () => {
            seedComplete(item)
          },
        });
      }

    },
  });
}

const handlePlatformIn = (item) => {
  if (item.platformId == null) {
    message.error(formatMessage('page.cacheSite.bindPlatform.fail', '请先绑定集货区域编号'));
    return;
  }

  Modal.confirm({
    title: formatMessage('page.cacheSite.platformIn', '集货入库'),
    content: formatMessage('page.cacheSite.platformIn.confirm', '确定集货入库吗？'),
    maskClosable: true,
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/cacheSite/platformIn', {
          siteNo: item.siteNo,
          platformNo: 'A1'
        }).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 handleEmptyIn = (item) => {
  Modal.confirm({
    title: formatMessage('page.cacheSite.emptyIn', '空托盘入站'),
    content: formatMessage('page.cacheSite.emptyIn.confirm', '确定空托盘入站吗？'),
    maskClosable: true,
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/cacheSite/emptyIn', {
          siteNo: item.siteNo,
        }).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', '请求失败'));
      }
    },
  });
}

</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"
      :loading="state.loading">
      <template #bodyCell="{ column, text, record }">
        <template v-if="column.dataIndex === 'oper'">
          <div style="display: flex;justify-content: space-evenly;">
            <a-button v-if="record.platformId == null" type="link" primary @click="handleBindPlatform(record)">{{
              formatMessage('page.cacheSite.platform', '集货区域') }}</a-button>
            <a-button type="link" primary @click="handleSeedComplete(record)">{{
              formatMessage('page.cacheSite.seedComplete', '播种完成') }}</a-button>
            <a-button type="link" primary @click="handlePlatformIn(record)">{{
              formatMessage('page.cacheSite.platformIn', '集货入库') }}</a-button>
            <a-button type="link" primary @click="handleEmptyIn(record)">{{ formatMessage('page.cacheSite.emptyIn',
              '空托盘入站') }}</a-button>
            <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>

    <a-modal v-model:open="openBindPlatform" @ok="handleBindPlatformOk">
      <div style="display: flex;justify-content: center;align-items: center;">
        绑定集货区域：<a-select v-model:value="platform" :options="platformQueryList" style="width: 100px;"></a-select>
      </div>
    </a-modal>
  </div>
</template>

<style></style>

 zy-asrs-admin/src/views/out/platform/edit.vue

New file
@@ -0,0 +1,126 @@
<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/platform/save' : '/api/platform/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_platform.platform_no', '集货编号')" name="platformNo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.platformNo" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform.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_platform.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_platform.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_platform.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_platform.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_platform.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>

 zy-asrs-admin/src/views/out/platform/index.vue

File was renamed from zy-asrs-admin/src/views/base/cacheSite/index.vue
@@ -11,7 +11,7 @@

const router = useRouter();

const TABLE_KEY = 'table-cacheSite';
const TABLE_KEY = 'table-platform';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -32,77 +32,49 @@

const columns = [
  {
    title: formatMessage('db.man_cache_site.channel', '通道'),
    dataIndex: 'channel',
    title: formatMessage('db.man_platform.platform_no', '集货编号'),
    dataIndex: 'platformNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('channel'),
    ...getColumnSearchProps('platformNo'),
  },
  {
    title: formatMessage('db.man_cache_site.site_no', '站点编号'),
    dataIndex: 'siteNo',
    title: formatMessage('db.man_platform.status', '状态'),
    dataIndex: 'status$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteNo'),
    ...getColumnSearchProps('status$'),
  },
  {
    title: formatMessage('db.man_cache_site.site_status', '站点状态'),
    dataIndex: 'siteStatus$',
    title: formatMessage('db.man_platform.create_time', '添加时间'),
    dataIndex: 'createTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteStatus$'),
    ...getColumnSearchProps('createTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_id', '订单ID'),
    dataIndex: 'orderId$',
    title: formatMessage('db.man_platform.create_by', '添加人员'),
    dataIndex: 'createBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
    ...getColumnSearchProps('createBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  // {
  //   title: formatMessage('db.man_cache_site.status', '状态'),
  //   dataIndex: 'status$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('status$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_time', '添加时间'),
  //   dataIndex: 'createTime$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createTime$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_by', '添加人员'),
  //   dataIndex: 'createBy$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createBy$'),
  // },
  {
    title: formatMessage('db.man_cache_site.update_time', '修改时间'),
    title: formatMessage('db.man_platform.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.update_by', '修改人员'),
    title: formatMessage('db.man_platform.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.memo', '备注'),
    title: formatMessage('db.man_platform.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
@@ -114,7 +86,7 @@
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
    width: 200,
    fixed: 'right',
  },
];
@@ -135,7 +107,7 @@

function getPage() {
  state.loading = true;
  post('/api/cacheSite/page', {
  post('/api/platform/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
@@ -169,7 +141,7 @@
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/cacheSite/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
        post('/api/platform/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
          let result = resp.data;
          if (result.code === 200) {
            message.success(result.msg);
@@ -187,7 +159,7 @@
}

const handleExport = async (intl) => {
  postBlob('/api/cacheSite/export', {}).then(result => {
  postBlob('/api/platform/export', {}).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;
@@ -209,11 +181,38 @@
  getPage()
}

const handleShipped = (item) => {
  Modal.confirm({
    title: formatMessage('page.shipped', '发货'),
    content: formatMessage('page.shipped.confirm', '确定发货吗？'),
    maskClosable: true,
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/platform/shipped', {
          platformId: item.id,
        }).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', '请求失败'));
      }
    },
  });
}

</script>

<script>
export default {
  name: '播种站点'
  name: '集货管理'
}
</script>

@@ -236,6 +235,8 @@
      <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="handleShipped(record)">{{ formatMessage('page.platform.shipped', '发货')
              }}</a-button>
            <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>

 zy-asrs-admin/src/views/out/platformDetl/edit.vue

New file
@@ -0,0 +1,203 @@
<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/platformDetl/save' : '/api/platformDetl/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 platformQueryList = ref(null);
platformQuery();
function platformQuery() {
    postForm('/api/platform/query', {}).then(resp => {
        let result = resp.data;
        platformQueryList.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 orderDetlQueryList = ref(null);
orderDetlQuery();
function orderDetlQuery() {
    postForm('/api/orderDetl/query', {}).then(resp => {
        let result = resp.data;
        orderDetlQueryList.value = result.data;
    })
}
const taskDetlQueryList = ref(null);
taskDetlQuery();
function taskDetlQuery() {
    postForm('/api/taskDetl/query', {}).then(resp => {
        let result = resp.data;
        taskDetlQueryList.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_platform_detl.platform_id', '集货ID')" name="platformId"
                    style="width: 250px;">
                    <a-select v-model:value="formData.platformId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="platformQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.platform_no', '集货编号')" name="platformNo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.platformNo" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.order_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_platform_detl.order_detl_id', '订单明细')" name="orderDetlId"
                    style="width: 250px;">
                    <a-select v-model:value="formData.orderDetlId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="orderDetlQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.task_detl_id', '任务明细')" name="taskDetlId"
                    style="width: 250px;">
                    <a-select v-model:value="formData.taskDetlId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="taskDetlQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.matnr', '商品编号')" name="matnr"
                    style="width: 250px;">
                    <a-input v-model:value="formData.matnr" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.batch', '批号')" name="batch"
                    style="width: 250px;">
                    <a-input v-model:value="formData.batch" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.field_params', '索引字段')" name="fieldParams"
                    style="width: 250px;">
                    <a-input v-model:value="formData.fieldParams" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_detl.anfme', '数量')" name="anfme"
                    style="width: 250px;">
                    <a-input v-model:value="formData.anfme" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_platform_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_platform_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_platform_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_platform_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_platform_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_platform_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>

 zy-asrs-admin/src/views/out/platformDetl/index.vue

copy from zy-asrs-admin/src/views/base/cacheSite/index.vue
copy to zy-asrs-admin/src/views/out/platformDetl/index.vue
File was copied from zy-asrs-admin/src/views/base/cacheSite/index.vue
@@ -11,7 +11,7 @@

const router = useRouter();

const TABLE_KEY = 'table-cacheSite';
const TABLE_KEY = 'table-platformDetl';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -32,91 +32,126 @@

const columns = [
  {
    title: formatMessage('db.man_cache_site.channel', '通道'),
    dataIndex: 'channel',
    title: formatMessage('db.man_platform_detl.platform_id', '集货ID'),
    dataIndex: 'platformId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('channel'),
    ...getColumnSearchProps('platformId$'),
  },
  {
    title: formatMessage('db.man_cache_site.site_no', '站点编号'),
    dataIndex: 'siteNo',
    title: formatMessage('db.man_platform_detl.platform_no', '集货编号'),
    dataIndex: 'platformNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteNo'),
    ...getColumnSearchProps('platformNo'),
  },
  {
    title: formatMessage('db.man_cache_site.site_status', '站点状态'),
    dataIndex: 'siteStatus$',
    title: formatMessage('db.man_platform_detl.order_id', '订单'),
    dataIndex: 'orderId',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteStatus$'),
    ...getColumnSearchProps('orderId'),
  },
  {
    title: formatMessage('db.man_cache_site.order_id', '订单ID'),
    dataIndex: 'orderId$',
    title: formatMessage('db.man_platform_detl.order_detl_id', '订单明细'),
    dataIndex: 'orderDetlId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
    ...getColumnSearchProps('orderDetlId$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_no', '订单编号'),
    dataIndex: 'orderNo',
    title: formatMessage('db.man_platform_detl.task_detl_id', '任务明细'),
    dataIndex: 'taskDetlId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
    ...getColumnSearchProps('taskDetlId$'),
  },
  // {
  //   title: formatMessage('db.man_cache_site.status', '状态'),
  //   dataIndex: 'status$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('status$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_time', '添加时间'),
  //   dataIndex: 'createTime$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createTime$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_by', '添加人员'),
  //   dataIndex: 'createBy$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createBy$'),
  // },
  {
    title: formatMessage('db.man_cache_site.update_time', '修改时间'),
    title: formatMessage('db.man_platform_detl.matnr', '商品编号'),
    dataIndex: 'matnr',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('matnr'),
  },
  {
    title: formatMessage('db.man_platform_detl.batch', '批号'),
    dataIndex: 'batch',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('batch'),
  },
  {
    title: formatMessage('db.man_platform_detl.field_params', '索引字段'),
    dataIndex: 'fieldParams',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('fieldParams'),
  },
  {
    title: formatMessage('db.man_platform_detl.anfme', '需求数量'),
    dataIndex: 'anfme',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('anfme'),
  },
  {
    title: formatMessage('db.man_platform_detl.qty', '实际数量'),
    dataIndex: 'qty',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('qty'),
  },
  {
    title: formatMessage('db.man_platform_detl.status', '状态'),
    dataIndex: 'status$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('status$'),
  },
  {
    title: formatMessage('db.man_platform_detl.create_time', '添加时间'),
    dataIndex: 'createTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createTime$'),
  },
  {
    title: formatMessage('db.man_platform_detl.create_by', '添加人员'),
    dataIndex: 'createBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createBy$'),
  },
  {
    title: formatMessage('db.man_platform_detl.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.update_by', '修改人员'),
    title: formatMessage('db.man_platform_detl.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.memo', '备注'),
    title: formatMessage('db.man_platform_detl.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },

  {
    title: formatMessage('common.operation', '操作'),
    name: 'oper',
    dataIndex: 'oper',
    key: 'oper',
    width: 140,
    fixed: 'right',
  },
  // {
  //   title: formatMessage('common.operation', '操作'),
  //   name: 'oper',
  //   dataIndex: 'oper',
  //   key: 'oper',
  //   width: 140,
  //   fixed: 'right',
  // },
];

const hasSelected = computed(() => state.selectedRowKeys.length > 0);
@@ -135,7 +170,7 @@

function getPage() {
  state.loading = true;
  post('/api/cacheSite/page', {
  post('/api/platformDetl/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
@@ -169,7 +204,7 @@
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/cacheSite/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
        post('/api/platformDetl/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
          let result = resp.data;
          if (result.code === 200) {
            message.success(result.msg);
@@ -187,7 +222,7 @@
}

const handleExport = async (intl) => {
  postBlob('/api/cacheSite/export', {}).then(result => {
  postBlob('/api/platformDetl/export', {}).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;
@@ -213,7 +248,7 @@

<script>
export default {
  name: '播种站点'
  name: '集货库存'
}
</script>

@@ -224,7 +259,7 @@
      <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="handleEdit(null)" type="primary">{{ formatMessage('page.add', '添加') }}</a-button> -->
        <a-button @click="handleExport">{{ formatMessage('page.export', '导出') }}</a-button>
      </div>
    </div>

 zy-asrs-admin/src/views/out/wave/index.vue

@@ -313,7 +313,7 @@
      <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.waveId)">{{
            <a-button type="link" primary :disabled="record.waveStatus != 0" @click="handleGenerateOut(record.waveId)">{{
              formatMessage('page.generateOut',
                '生成出库任务')
            }}</a-button>

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java

@@ -4,6 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.Platform;
import com.zy.asrs.wms.asrs.entity.param.BindPlatformParam;
import com.zy.asrs.wms.asrs.entity.param.CacheSiteEmptyInParam;
import com.zy.asrs.wms.asrs.entity.param.PlatformInParam;
import com.zy.asrs.wms.asrs.entity.param.SeedCompleteParam;
import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +24,7 @@
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;
import java.util.*;

@RestController
@RequestMapping("/api")
@@ -28,6 +32,8 @@

    @Autowired
    private CacheSiteService cacheSiteService;
    @Autowired
    private PlatformService platformService;

    @PreAuthorize("hasAuthority('asrs:cacheSite:list')")
    @PostMapping("/cacheSite/page")
@@ -105,4 +111,57 @@
        return R.ok().add(cacheSiteService.getChannelList());
    }

    @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
    @OperationLog("播种完成预检测")
    @PostMapping("/cacheSite/seedCompletePreview")
    public R seedCompletePreview(@RequestBody SeedCompleteParam param) {
        boolean check = cacheSiteService.seedCompletePreview(param);
        return R.ok().add(check);
    }

    @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
    @OperationLog("播种完成")
    @PostMapping("/cacheSite/seedComplete")
    public R seedComplete(@RequestBody SeedCompleteParam param) {
        cacheSiteService.seedComplete(param);
        return R.ok();
    }

    @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
    @OperationLog("集货入库")
    @PostMapping("/cacheSite/platformIn")
    public R platformIn(@RequestBody PlatformInParam param) {
        return R.ok();
    }

    @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
    @OperationLog("空托盘入站")
    @PostMapping("/cacheSite/emptyIn")
    public R cacheSiteEmptyIn(@RequestBody CacheSiteEmptyInParam param) {
        return R.ok();
    }

    @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
    @OperationLog("绑定集货区域编号")
    @PostMapping("/cacheSite/bindPlatform")
    public R bindPlatform(@RequestBody BindPlatformParam param) {
        CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, param.getSiteNo()));
        if(cacheSite == null) {
            throw new CoolException("缓存站点不存在");
        }

        Platform platform = platformService.getById(param.getPlatformId());
        if (platform == null) {
            throw new CoolException("集货区域不存在");
        }

        cacheSite.setPlatformId(platform.getId());
        cacheSite.setPlatformNo(platform.getPlatformNo());
        cacheSite.setUpdateTime(new Date());
        if (!cacheSiteService.updateById(cacheSite)) {
            throw new CoolException("绑定集货区域编号失败");
        }
        return R.ok();
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PlatformController.java

New file
@@ -0,0 +1,111 @@
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.param.PlatformShippedParam;
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.Platform;
import com.zy.asrs.wms.asrs.service.PlatformService;
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 PlatformController extends BaseController {

    @Autowired
    private PlatformService platformService;

    @PreAuthorize("hasAuthority('asrs:platform:list')")
    @PostMapping("/platform/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Platform, BaseParam> pageParam = new PageParam<>(baseParam, Platform.class);
        return R.ok().add(platformService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:platform:list')")
    @PostMapping("/platform/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(platformService.list());
    }

    @PreAuthorize("hasAuthority('asrs:platform:list')")
    @GetMapping("/platform/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(platformService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:platform:save')")
    @OperationLog("添加集货管理")
    @PostMapping("/platform/save")
    public R save(@RequestBody Platform platform) {
        if (!platformService.save(platform)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:platform:update')")
    @OperationLog("修改集货管理")
    @PostMapping("/platform/update")
    public R update(@RequestBody Platform platform) {
        if (!platformService.updateById(platform)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:platform:remove')")
    @OperationLog("删除集货管理")
    @PostMapping("/platform/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!platformService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:platform:list')")
    @PostMapping("/platform/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Platform> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Platform::getId, condition);
        }
        platformService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getPlatformNo()))
        );
        return R.ok().add(vos);
    }

    @PreAuthorize("hasAuthority('asrs:platform:list')")
    @PostMapping("/platform/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(platformService.list(), Platform.class), response);
    }

    @PreAuthorize("hasAuthority('asrs:platform:update')")
    @OperationLog("集货区域发货")
    @PostMapping("/platform/shipped")
    public R shipped(@RequestBody PlatformShippedParam param) {
        platformService.shipped(param);
        return R.ok();
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PlatformDetlController.java

New file
@@ -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.PlatformDetl;
import com.zy.asrs.wms.asrs.service.PlatformDetlService;
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 PlatformDetlController extends BaseController {

    @Autowired
    private PlatformDetlService platformDetlService;

    @PreAuthorize("hasAuthority('asrs:platformDetl:list')")
    @PostMapping("/platformDetl/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<PlatformDetl, BaseParam> pageParam = new PageParam<>(baseParam, PlatformDetl.class);
        return R.ok().add(platformDetlService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:list')")
    @PostMapping("/platformDetl/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(platformDetlService.list());
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:list')")
    @GetMapping("/platformDetl/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(platformDetlService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:save')")
    @OperationLog("添加集货库存")
    @PostMapping("/platformDetl/save")
    public R save(@RequestBody PlatformDetl platformDetl) {
        if (!platformDetlService.save(platformDetl)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:update')")
    @OperationLog("修改集货库存")
    @PostMapping("/platformDetl/update")
    public R update(@RequestBody PlatformDetl platformDetl) {
        if (!platformDetlService.updateById(platformDetl)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:remove')")
    @OperationLog("删除集货库存")
    @PostMapping("/platformDetl/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!platformDetlService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetl:list')")
    @PostMapping("/platformDetl/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<PlatformDetl> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(PlatformDetl::getId, condition);
        }
        platformDetlService.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:platformDetl:list')")
    @PostMapping("/platformDetl/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(platformDetlService.list(), PlatformDetl.class), response);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PlatformDetlLogController.java

New file
@@ -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.PlatformDetlLog;
import com.zy.asrs.wms.asrs.service.PlatformDetlLogService;
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 PlatformDetlLogController extends BaseController {

    @Autowired
    private PlatformDetlLogService platformDetlLogService;

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:list')")
    @PostMapping("/platformDetlLog/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<PlatformDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, PlatformDetlLog.class);
        return R.ok().add(platformDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:list')")
    @PostMapping("/platformDetlLog/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(platformDetlLogService.list());
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:list')")
    @GetMapping("/platformDetlLog/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(platformDetlLogService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:save')")
    @OperationLog("添加集货区域库存历史")
    @PostMapping("/platformDetlLog/save")
    public R save(@RequestBody PlatformDetlLog platformDetlLog) {
        if (!platformDetlLogService.save(platformDetlLog)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:update')")
    @OperationLog("修改集货区域库存历史")
    @PostMapping("/platformDetlLog/update")
    public R update(@RequestBody PlatformDetlLog platformDetlLog) {
        if (!platformDetlLogService.updateById(platformDetlLog)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:remove')")
    @OperationLog("删除集货区域库存历史")
    @PostMapping("/platformDetlLog/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!platformDetlLogService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:platformDetlLog:list')")
    @PostMapping("/platformDetlLog/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<PlatformDetlLog> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(PlatformDetlLog::getId, condition);
        }
        platformDetlLogService.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:platformDetlLog:list')")
    @PostMapping("/platformDetlLog/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(platformDetlLogService.list(), PlatformDetlLog.class), response);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveDetlLogController.java

New file
@@ -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.WaveDetlLog;
import com.zy.asrs.wms.asrs.service.WaveDetlLogService;
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 WaveDetlLogController extends BaseController {

    @Autowired
    private WaveDetlLogService waveDetlLogService;

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:list')")
    @PostMapping("/waveDetlLog/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WaveDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, WaveDetlLog.class);
        return R.ok().add(waveDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:list')")
    @PostMapping("/waveDetlLog/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(waveDetlLogService.list());
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:list')")
    @GetMapping("/waveDetlLog/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(waveDetlLogService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:save')")
    @OperationLog("添加波次明细历史")
    @PostMapping("/waveDetlLog/save")
    public R save(@RequestBody WaveDetlLog waveDetlLog) {
        if (!waveDetlLogService.save(waveDetlLog)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:update')")
    @OperationLog("修改波次明细历史")
    @PostMapping("/waveDetlLog/update")
    public R update(@RequestBody WaveDetlLog waveDetlLog) {
        if (!waveDetlLogService.updateById(waveDetlLog)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:remove')")
    @OperationLog("删除波次明细历史")
    @PostMapping("/waveDetlLog/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!waveDetlLogService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveDetlLog:list')")
    @PostMapping("/waveDetlLog/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<WaveDetlLog> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WaveDetlLog::getId, condition);
        }
        waveDetlLogService.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:waveDetlLog:list')")
    @PostMapping("/waveDetlLog/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(waveDetlLogService.list(), WaveDetlLog.class), response);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveLogController.java

New file
@@ -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.WaveLog;
import com.zy.asrs.wms.asrs.service.WaveLogService;
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 WaveLogController extends BaseController {

    @Autowired
    private WaveLogService waveLogService;

    @PreAuthorize("hasAuthority('asrs:waveLog:list')")
    @PostMapping("/waveLog/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WaveLog, BaseParam> pageParam = new PageParam<>(baseParam, WaveLog.class);
        return R.ok().add(waveLogService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:list')")
    @PostMapping("/waveLog/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(waveLogService.list());
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:list')")
    @GetMapping("/waveLog/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(waveLogService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:save')")
    @OperationLog("添加波次历史")
    @PostMapping("/waveLog/save")
    public R save(@RequestBody WaveLog waveLog) {
        if (!waveLogService.save(waveLog)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:update')")
    @OperationLog("修改波次历史")
    @PostMapping("/waveLog/update")
    public R update(@RequestBody WaveLog waveLog) {
        if (!waveLogService.updateById(waveLog)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:remove')")
    @OperationLog("删除波次历史")
    @PostMapping("/waveLog/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!waveLogService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveLog:list')")
    @PostMapping("/waveLog/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<WaveLog> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WaveLog::getId, condition);
        }
        waveLogService.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:waveLog:list')")
    @PostMapping("/waveLog/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(waveLogService.list(), WaveLog.class), response);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveSeedLogController.java

New file
@@ -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.WaveSeedLog;
import com.zy.asrs.wms.asrs.service.WaveSeedLogService;
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 WaveSeedLogController extends BaseController {

    @Autowired
    private WaveSeedLogService waveSeedLogService;

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:list')")
    @PostMapping("/waveSeedLog/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WaveSeedLog, BaseParam> pageParam = new PageParam<>(baseParam, WaveSeedLog.class);
        return R.ok().add(waveSeedLogService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:list')")
    @PostMapping("/waveSeedLog/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(waveSeedLogService.list());
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:list')")
    @GetMapping("/waveSeedLog/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(waveSeedLogService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:save')")
    @OperationLog("添加波次播种历史")
    @PostMapping("/waveSeedLog/save")
    public R save(@RequestBody WaveSeedLog waveSeedLog) {
        if (!waveSeedLogService.save(waveSeedLog)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:update')")
    @OperationLog("修改波次播种历史")
    @PostMapping("/waveSeedLog/update")
    public R update(@RequestBody WaveSeedLog waveSeedLog) {
        if (!waveSeedLogService.updateById(waveSeedLog)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:remove')")
    @OperationLog("删除波次播种历史")
    @PostMapping("/waveSeedLog/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!waveSeedLogService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:waveSeedLog:list')")
    @PostMapping("/waveSeedLog/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<WaveSeedLog> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WaveSeedLog::getId, condition);
        }
        waveSeedLogService.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:waveSeedLog:list')")
    @PostMapping("/waveSeedLog/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(waveSeedLogService.list(), WaveSeedLog.class), response);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java

@@ -121,6 +121,20 @@
    @ApiModelProperty(value= "通道")
    private String channel;

    /**
     * 集货ID
     */
    @ApiModelProperty(value= "集货ID")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Long platformId;

    /**
     * 集货编号
     */
    @ApiModelProperty(value= "集货编号")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String platformNo;

    public CacheSite() {}

    public CacheSite(String siteNo,Integer siteStatus,Long orderId,String orderNo,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java

@@ -133,6 +133,12 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 商品库存索引
     */
    @ApiModelProperty(value= "商品库存索引")
    private String stockIndex;

    public OrderDetlLog() {}

    public OrderDetlLog(Long orderId,String orderNo,Double anfme,Double qty,Double workQty,Long matId,String batch,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.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;

@@ -13,10 +14,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;
@@ -122,6 +120,26 @@
    @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;

    /**
     * 是否生成波次 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否生成波次 1: 是  0: 否  ")
    private Integer hasWave;

    public OrderLog() {}

    public OrderLog(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Platform.java

New file
@@ -0,0 +1,195 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_platform")
public class Platform 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 platformNo;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    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 Platform() {}

    public Platform(String platformNo,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.platformNo = platformNo;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    Platform platform = new Platform(
//            null,    // 集货编号
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PlatformDetl.java

New file
@@ -0,0 +1,294 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_platform_detl")
public class PlatformDetl 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 platformId;

    /**
     * 集货编号
     */
    @ApiModelProperty(value= "集货编号")
    private String platformNo;

    /**
     * 订单
     */
    @ApiModelProperty(value= "订单")
    private Long orderId;

    /**
     * 订单明细
     */
    @ApiModelProperty(value= "订单明细")
    private Long orderDetlId;

    /**
     * 任务明细
     */
    @ApiModelProperty(value= "任务明细")
    private Long taskDetlId;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 索引字段
     */
    @ApiModelProperty(value= "索引字段")
    private String fieldParams;

    /**
     * 需求数量
     */
    @ApiModelProperty(value= "需求数量")
    private Double anfme;

    /**
     * 实际数量
     */
    @ApiModelProperty(value= "实际数量")
    private Double qty;

    /**
     * 所属机构
     */
    @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 PlatformDetl() {}

    public PlatformDetl(Long platformId,String platformNo,Long orderId,Long orderDetlId,Long taskDetlId,String matnr,String batch,String fieldParams,Double anfme,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.platformId = platformId;
        this.platformNo = platformNo;
        this.orderId = orderId;
        this.orderDetlId = orderDetlId;
        this.taskDetlId = taskDetlId;
        this.matnr = matnr;
        this.batch = batch;
        this.fieldParams = fieldParams;
        this.anfme = anfme;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    PlatformDetl platformDetl = new PlatformDetl(
//            null,    // 集货ID
//            null,    // 集货编号
//            null,    // 订单
//            null,    // 订单明细
//            null,    // 任务明细
//            null,    // 商品编号
//            null,    // 批号
//            null,    // 索引字段
//            null,    // 数量
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null    // 备注
//    );

    public String getPlatformId$(){
        PlatformService service = SpringUtils.getBean(PlatformService.class);
        Platform platform = service.getById(this.platformId);
        if (!Cools.isEmpty(platform)){
            return String.valueOf(platform.getId());
        }
        return null;
    }

    public String getOrderDetlId$(){
        OrderDetlService service = SpringUtils.getBean(OrderDetlService.class);
        OrderDetl orderDetl = service.getById(this.orderDetlId);
        if (!Cools.isEmpty(orderDetl)){
            return String.valueOf(orderDetl.getId());
        }
        return null;
    }

    public String getTaskDetlId$(){
        TaskDetlService service = SpringUtils.getBean(TaskDetlService.class);
        TaskDetl taskDetl = service.getById(this.taskDetlId);
        if (!Cools.isEmpty(taskDetl)){
            return String.valueOf(taskDetl.getId());
        }
        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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PlatformDetlLog.java

New file
@@ -0,0 +1,297 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_platform_detl_log")
public class PlatformDetlLog 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 platformId;

    /**
     * 集货编号
     */
    @ApiModelProperty(value= "集货编号")
    private String platformNo;

    /**
     * 订单
     */
    @ApiModelProperty(value= "订单")
    private Long orderId;

    /**
     * 订单明细
     */
    @ApiModelProperty(value= "订单明细")
    private Long orderDetlId;

    /**
     * 任务明细
     */
    @ApiModelProperty(value= "任务明细")
    private Long taskDetlId;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 索引字段
     */
    @ApiModelProperty(value= "索引字段")
    private String fieldParams;

    /**
     * 需求数量
     */
    @ApiModelProperty(value= "需求数量")
    private Double anfme;

    /**
     * 实际数量
     */
    @ApiModelProperty(value= "实际数量")
    private Double qty;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    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 PlatformDetlLog() {}

    public PlatformDetlLog(Long platformId,String platformNo,Long orderId,Long orderDetlId,Long taskDetlId,String matnr,String batch,String fieldParams,Double anfme,Double qty,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.platformId = platformId;
        this.platformNo = platformNo;
        this.orderId = orderId;
        this.orderDetlId = orderDetlId;
        this.taskDetlId = taskDetlId;
        this.matnr = matnr;
        this.batch = batch;
        this.fieldParams = fieldParams;
        this.anfme = anfme;
        this.qty = qty;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    PlatformDetlLog platformDetlLog = new PlatformDetlLog(
//            null,    // 集货ID
//            null,    // 集货编号
//            null,    // 订单
//            null,    // 订单明细
//            null,    // 任务明细
//            null,    // 商品编号
//            null,    // 批号
//            null,    // 索引字段
//            null,    // 需求数量
//            null,    // 实际数量
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null    // 备注
//    );

    public String getPlatformId$(){
        PlatformService service = SpringUtils.getBean(PlatformService.class);
        Platform platform = service.getById(this.platformId);
        if (!Cools.isEmpty(platform)){
            return String.valueOf(platform.getId());
        }
        return null;
    }

    public String getOrderDetlId$(){
        OrderDetlService service = SpringUtils.getBean(OrderDetlService.class);
        OrderDetl orderDetl = service.getById(this.orderDetlId);
        if (!Cools.isEmpty(orderDetl)){
            return String.valueOf(orderDetl.getId());
        }
        return null;
    }

    public String getTaskDetlId$(){
        TaskDetlService service = SpringUtils.getBean(TaskDetlService.class);
        TaskDetl taskDetl = service.getById(this.taskDetlId);
        if (!Cools.isEmpty(taskDetl)){
            return String.valueOf(taskDetl.getId());
        }
        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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetlLog.java

New file
@@ -0,0 +1,279 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.asrs.service.WaveLogService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_wave_detl_log")
public class WaveDetlLog 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 matId;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 商品库存索引
     */
    @ApiModelProperty(value= "商品库存索引")
    private String stockIndex;

    /**
     * 数量
     */
    @ApiModelProperty(value= "数量")
    private Double anfme;

    /**
     * 工作数量
     */
    @ApiModelProperty(value= "工作数量")
    private Double workQty;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    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;

    /**
     * 索引字段
     */
    @ApiModelProperty(value= "索引字段")
    private String fieldParams;

    public WaveDetlLog() {}

    public WaveDetlLog(Long waveId,String waveNo,Long matId,String matnr,String batch,String stockIndex,Double anfme,Double workQty,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String fieldParams) {
        this.waveId = waveId;
        this.waveNo = waveNo;
        this.matId = matId;
        this.matnr = matnr;
        this.batch = batch;
        this.stockIndex = stockIndex;
        this.anfme = anfme;
        this.workQty = workQty;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
        this.fieldParams = fieldParams;
    }

//    WaveDetlLog waveDetlLog = new WaveDetlLog(
//            null,    // 波次ID
//            null,    // 波次号
//            null,    // 商品ID
//            null,    // 商品编号
//            null,    // 批号
//            null,    // 商品库存索引
//            null,    // 数量
//            null,    // 工作数量
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null,    // 备注
//            null    // 索引字段
//    );

    public String getWaveId$(){
        WaveLogService service = SpringUtils.getBean(WaveLogService.class);
        WaveLog waveLog = service.getById(this.waveId);
        if (!Cools.isEmpty(waveLog)){
            return String.valueOf(waveLog.getId());
        }
        return null;
    }

    public String getMatId$(){
        MatService service = SpringUtils.getBean(MatService.class);
        Mat mat = service.getById(this.matId);
        if (!Cools.isEmpty(mat)){
            return String.valueOf(mat.getId());
        }
        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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveLog.java

New file
@@ -0,0 +1,239 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_wave_log")
public class WaveLog 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;

    /**
     * 波次状态 0: 初始化  1: 生成任务  2: 任务播种  3: 完成  
     */
    @ApiModelProperty(value= "波次状态 0: 初始化  1: 生成任务  2: 任务播种  3: 完成  ")
    private Integer waveStatus;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    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 WaveLog() {}

    public WaveLog(String waveNo,Integer waveType,Integer waveStatus,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.waveNo = waveNo;
        this.waveType = waveType;
        this.waveStatus = waveStatus;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    WaveLog waveLog = new WaveLog(
//            null,    // 波次号
//            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 String getWaveStatus$(){
        if (null == this.waveStatus){ return null; }
        switch (this.waveStatus){
            case 0:
                return "初始化";
            case 1:
                return "生成任务";
            case 2:
                return "任务播种";
            case 3:
                return "完成";
            default:
                return String.valueOf(this.waveStatus);
        }
    }

    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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java

@@ -85,6 +85,24 @@
    private Double workQty;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 索引字段
     */
    @ApiModelProperty(value= "索引字段")
    private String fieldParams;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
@@ -100,7 +118,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeedLog.java

New file
@@ -0,0 +1,297 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.asrs.service.CacheSiteService;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.common.utils.Synchro;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_wave_seed_log")
public class WaveSeedLog 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 siteId;

    /**
     * 站点编号
     */
    @ApiModelProperty(value= "站点编号")
    private String siteNo;

    /**
     * 订单
     */
    @ApiModelProperty(value= "订单")
    private Long orderId;

    /**
     * 订单明细
     */
    @ApiModelProperty(value= "订单明细")
    private Long orderDetlId;

    /**
     * 任务明细
     */
    @ApiModelProperty(value= "任务明细")
    private Long taskDetlId;

    /**
     * 数量
     */
    @ApiModelProperty(value= "数量")
    private Double anfme;

    /**
     * 复核数量
     */
    @ApiModelProperty(value= "复核数量")
    private Double workQty;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    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;

    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    private String matnr;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 索引字段
     */
    @ApiModelProperty(value= "索引字段")
    private String fieldParams;

    public WaveSeedLog() {}

    public WaveSeedLog(Long siteId,String siteNo,Long orderId,Long orderDetlId,Long taskDetlId,Double anfme,Double workQty,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,String fieldParams) {
        this.siteId = siteId;
        this.siteNo = siteNo;
        this.orderId = orderId;
        this.orderDetlId = orderDetlId;
        this.taskDetlId = taskDetlId;
        this.anfme = anfme;
        this.workQty = workQty;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
        this.matnr = matnr;
        this.batch = batch;
        this.fieldParams = fieldParams;
    }

//    WaveSeedLog waveSeedLog = new WaveSeedLog(
//            null,    // 站点ID
//            null,    // 站点编号
//            null,    // 订单
//            null,    // 订单明细
//            null,    // 任务明细
//            null,    // 数量
//            null,    // 复核数量
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null,    // 备注
//            null,    // 商品编号
//            null,    // 批号
//            null    // 索引字段
//    );

    public String getSiteId$(){
        CacheSiteService service = SpringUtils.getBean(CacheSiteService.class);
        CacheSite cacheSite = service.getById(this.siteId);
        if (!Cools.isEmpty(cacheSite)){
            return String.valueOf(cacheSite.getId());
        }
        return null;
    }

    public String getOrderDetlId$(){
        OrderDetlService service = SpringUtils.getBean(OrderDetlService.class);
        OrderDetl orderDetl = service.getById(this.orderDetlId);
        if (!Cools.isEmpty(orderDetl)){
            return String.valueOf(orderDetl.getId());
        }
        return null;
    }

    public String getTaskDetlId$(){
        TaskDetlService service = SpringUtils.getBean(TaskDetlService.class);
        TaskDetl taskDetl = service.getById(this.taskDetlId);
        if (!Cools.isEmpty(taskDetl)){
            return String.valueOf(taskDetl.getId());
        }
        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);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java

New file
@@ -0,0 +1,25 @@
package com.zy.asrs.wms.asrs.entity.enums;

public enum TaskStsType {

    GENERATE_IN(1L, "生成入库任务"),
    WCS_EXECUTE_IN(2L, "WCS执行中"),
    COMPLETE_IN(99L, "入库完成"),
    UPDATED_IN(100L, "库存更新完成"),

    GENERATE_OUT(101L, "生成出库任务"),
    WCS_EXECUTE_OUT(102L, "WCS执行中"),
    WAVE_SEED(198L, "播种中"),
    COMPLETE_OUT(199L, "出库完成"),
    UPDATED_OUT(200L, "库存更新完成"),
    ;

    public Long id;
    public String desc;

    TaskStsType(Long id, String desc) {
        this.id = id;
        this.desc = desc;
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BindPlatformParam.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.entity.param;

import lombok.Data;

@Data
public class BindPlatformParam {

    private Long platformId;

    private String siteNo;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CacheSiteEmptyInParam.java

New file
@@ -0,0 +1,11 @@
package com.zy.asrs.wms.asrs.entity.param;

import lombok.Data;

@Data
public class CacheSiteEmptyInParam {

    //播种站点编号
    private String siteNo;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PlatformInParam.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.wms.asrs.entity.param;

import lombok.Data;

@Data
public class PlatformInParam {

    //播种站点编号
    private String siteNo;

    //集货编号
    private String platformNo;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/PlatformShippedParam.java

New file
@@ -0,0 +1,10 @@
package com.zy.asrs.wms.asrs.entity.param;

import lombok.Data;

@Data
public class PlatformShippedParam {

    private Long platformId;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/SeedCompleteParam.java

New file
@@ -0,0 +1,11 @@
package com.zy.asrs.wms.asrs.entity.param;

import lombok.Data;

@Data
public class SeedCompleteParam {

    //播种站点编号
    private String siteNo;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/LocManage.java

@@ -8,6 +8,7 @@
import com.zy.asrs.wms.asrs.entity.Task;
import com.zy.asrs.wms.asrs.entity.TaskDetl;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +65,7 @@
        Task task = new Task();
        task.setTaskNo(workService.generateTaskNo(1L));
        // 任务状态
        task.setTaskSts(11L);
        task.setTaskSts(TaskStsType.GENERATE_OUT.id);
        // 任务类型
        task.setTaskType(11L);
        // 优先级

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java

@@ -5,10 +5,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.dto.*;
import com.zy.asrs.wms.asrs.entity.dto.OrderOutMergeDto;
import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.enums.WaveStatusType;
import com.zy.asrs.wms.asrs.entity.enums.*;
import com.zy.asrs.wms.asrs.entity.param.*;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.service.*;
@@ -94,7 +91,7 @@

            Task task = new Task();
            task.setTaskNo(workService.generateTaskNo(1L));
            task.setTaskSts(101L);
            task.setTaskSts(TaskStsType.GENERATE_OUT.id);
            task.setTaskType(taskType);
            task.setIoPri(workService.generateIoPri(taskType));
            task.setOriginLoc(loc.getLocNo());
@@ -365,7 +362,7 @@

            Task task = new Task();
            task.setTaskNo(workService.generateTaskNo(taskType));
            task.setTaskSts(101L);
            task.setTaskSts(TaskStsType.GENERATE_OUT.id);
            task.setTaskType(taskType);
            task.setIoPri(workService.generateIoPri(taskType));
            task.setOriginLoc(loc.getLocNo());
@@ -718,7 +715,7 @@

            Task task = new Task();
            task.setTaskNo(workService.generateTaskNo(taskType));
            task.setTaskSts(101L);
            task.setTaskSts(TaskStsType.GENERATE_OUT.id);
            task.setTaskType(taskType);
            task.setIoPri(workService.generateIoPri(taskType));
            task.setOriginLoc(loc.getLocNo());
@@ -885,7 +882,7 @@

            Task task = new Task();
            task.setTaskNo(workService.generateTaskNo(taskType));
            task.setTaskSts(101L);
            task.setTaskSts(TaskStsType.GENERATE_OUT.id);
            task.setTaskType(taskType);
            task.setIoPri(workService.generateIoPri(taskType));
            task.setOriginLoc(loc.getLocNo());

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/PlatformDetlLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.PlatformDetlLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PlatformDetlLogMapper extends BaseMapper<PlatformDetlLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/PlatformDetlMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.PlatformDetl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PlatformDetlMapper extends BaseMapper<PlatformDetl> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/PlatformMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.Platform;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface PlatformMapper extends BaseMapper<Platform> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java

@@ -5,8 +5,12 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

import java.util.List;

@Mapper
@Repository
public interface TaskMapper extends BaseMapper<Task> {

    List<Task> selectWaitWaveOut(List<Long> waveIds);//获取等待波次出库的任务List

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveDetlLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.WaveDetlLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface WaveDetlLogMapper extends BaseMapper<WaveDetlLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.WaveLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface WaveLogMapper extends BaseMapper<WaveLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;

import com.zy.asrs.wms.asrs.entity.WaveSeedLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface WaveSeedLogMapper extends BaseMapper<WaveSeedLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/CacheSiteService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.entity.param.SeedCompleteParam;

import java.util.List;

@@ -9,4 +10,8 @@

    List<String> getChannelList();

    boolean seedCompletePreview(SeedCompleteParam param);

    void seedComplete(SeedCompleteParam param);

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PlatformDetlLogService.java

New file
@@ -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.PlatformDetlLog;

public interface PlatformDetlLogService extends IService<PlatformDetlLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PlatformDetlService.java

New file
@@ -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.PlatformDetl;

public interface PlatformDetlService extends IService<PlatformDetl> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PlatformService.java

New file
@@ -0,0 +1,11 @@
package com.zy.asrs.wms.asrs.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.asrs.entity.Platform;
import com.zy.asrs.wms.asrs.entity.param.PlatformShippedParam;

public interface PlatformService extends IService<Platform> {

    void shipped(PlatformShippedParam param);

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java

@@ -8,4 +8,7 @@
public interface TaskService extends IService<Task> {

    List<Task> getByOrderDetlId(Long orderDetlId);

    List<Task> selectWaitWaveOut(List<Long> waveIds);//获取等待波次出库的任务List

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveDetlLogService.java

New file
@@ -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.WaveDetlLog;

public interface WaveDetlLogService extends IService<WaveDetlLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveLogService.java

New file
@@ -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.WaveLog;

public interface WaveLogService extends IService<WaveLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedLogService.java

New file
@@ -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.WaveSeedLog;

public interface WaveSeedLogService extends IService<WaveSeedLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java

@@ -1,18 +1,194 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.SeedCompleteParam;
import com.zy.asrs.wms.asrs.mapper.CacheSiteMapper;
import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.service.CacheSiteService;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.*;

@Service("cacheSiteService")
public class CacheSiteServiceImpl extends ServiceImpl<CacheSiteMapper, CacheSite> implements CacheSiteService {

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private WaveSeedService waveSeedService;
    @Autowired
    private WaveSeedLogService waveSeedLogService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskDetlService taskDetlService;
    @Autowired
    private PlatformService platformService;
    @Autowired
    private PlatformDetlService platformDetlService;


    @Override
    public List<String> getChannelList() {
        return this.baseMapper.getChannelList();
    }

    @Override
    public boolean seedCompletePreview(SeedCompleteParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }

        String siteNo = param.getSiteNo();
        if (siteNo == null) {
            throw new CoolException("播种站点编号不能为空");
        }

        CacheSite cacheSite = this.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, siteNo));
        if(cacheSite == null){
            throw new CoolException("播种站点不存在");
        }

        if (cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
            throw new CoolException("站点状态异常");
        }

        Long orderId = cacheSite.getOrderId();
        Order order = orderService.getById(orderId);
        if (order == null) {
            throw new CoolException("订单不存在");
        }

        HashMap<Long, Double> stockMap = new HashMap<>();
        List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderId, orderId));
        for (WaveSeed waveSeed : waveSeeds) {
            Double anfme = stockMap.get(waveSeed.getOrderDetlId());
            if (anfme == null) {
                anfme = 0.0D;
            }
            anfme += waveSeed.getWorkQty();
            stockMap.put(waveSeed.getOrderDetlId(), anfme);
        }

        List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId);
        boolean check = true;
        for (OrderDetl orderDetl : orderDetls) {
            Double anfme = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()).orElse(0.0D);
            Double workQty = stockMap.get(orderDetl.getId());
            if (!anfme.equals(workQty)) {
                check = false;
                break;
            }
        }

        return check;
    }

    @Override
    public void seedComplete(SeedCompleteParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }

        String siteNo = param.getSiteNo();
        if (siteNo == null) {
            throw new CoolException("播种站点编号不能为空");
        }

        CacheSite cacheSite = this.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, siteNo));
        if(cacheSite == null){
            throw new CoolException("播种站点不存在");
        }

        if (cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
            throw new CoolException("站点状态异常");
        }

        if (cacheSite.getPlatformId() == null) {
            throw new CoolException("集货区域未绑定");
        }

        Long orderId = cacheSite.getOrderId();
        Order order = orderService.getById(orderId);
        if (order == null) {
            throw new CoolException("订单不存在");
        }
        Long waveId = order.getWaveId();

        boolean check = this.seedCompletePreview(param);
        if (!check) {//订单未处理完成
            List<Long> taskIds = new ArrayList<>();
            List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getWaveId, waveId));
            for (TaskDetl taskDetl : taskDetls) {
                if(!taskIds.contains(taskDetl.getTaskId())){
                    taskIds.add(taskDetl.getTaskId());
                }
            }

            if (!taskIds.isEmpty()) {
                List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds).notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id));
                if (!tasks.isEmpty()) {
                    throw new CoolException("存在未完成任务");
                }
            }
        }

        Platform platform = platformService.getById(cacheSite.getPlatformId());
        if(platform == null){
            throw new CoolException("集货区域不存在");
        }

        List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderId, orderId));
        if (waveSeeds.isEmpty()) {
            throw new CoolException("播种数据不存在");
        }

        for (WaveSeed waveSeed : waveSeeds) {
            PlatformDetl platformDetl = new PlatformDetl();
            platformDetl.setPlatformId(platform.getId());
            platformDetl.setPlatformNo(platform.getPlatformNo());
            platformDetl.setOrderId(orderId);
            platformDetl.setOrderDetlId(waveSeed.getOrderDetlId());
            platformDetl.setTaskDetlId(waveSeed.getTaskDetlId());
            platformDetl.setMatnr(waveSeed.getMatnr());
            platformDetl.setBatch(waveSeed.getBatch());
            platformDetl.setFieldParams(waveSeed.getFieldParams());
            platformDetl.setAnfme(waveSeed.getAnfme());
            platformDetl.setQty(waveSeed.getWorkQty());

            if (!platformDetlService.save(platformDetl)) {
                throw new CoolException("集货区域库存插入失败");
            }


            WaveSeedLog waveSeedLog = new WaveSeedLog();
            waveSeedLog.sync(waveSeed);
            waveSeedLog.setId(null);
            if (!waveSeedLogService.save(waveSeedLog)) {
                throw new CoolException("播种数据转历史失败");
            }

            if (!waveSeedService.removeById(waveSeed.getId())) {
                throw new CoolException("播种数据删除失败");
            }
        }

        cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
        cacheSite.setOrderId(null);
        cacheSite.setOrderNo(null);
        cacheSite.setPlatformId(null);
        cacheSite.setPlatformNo(null);
        cacheSite.setUpdateTime(new Date());
        if (!this.updateById(cacheSite)) {
            throw new CoolException("更新播种站点数据失败");
        }

    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformDetlLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.zy.asrs.wms.asrs.mapper.PlatformDetlLogMapper;
import com.zy.asrs.wms.asrs.entity.PlatformDetlLog;
import com.zy.asrs.wms.asrs.service.PlatformDetlLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("platformDetlLogService")
public class PlatformDetlLogServiceImpl extends ServiceImpl<PlatformDetlLogMapper, PlatformDetlLog> implements PlatformDetlLogService {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformDetlServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.zy.asrs.wms.asrs.mapper.PlatformDetlMapper;
import com.zy.asrs.wms.asrs.entity.PlatformDetl;
import com.zy.asrs.wms.asrs.service.PlatformDetlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("platformDetlService")
public class PlatformDetlServiceImpl extends ServiceImpl<PlatformDetlMapper, PlatformDetl> implements PlatformDetlService {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PlatformServiceImpl.java

New file
@@ -0,0 +1,166 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.param.PlatformShippedParam;
import com.zy.asrs.wms.asrs.mapper.PlatformMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Service("platformService")
public class PlatformServiceImpl extends ServiceImpl<PlatformMapper, Platform> implements PlatformService {

    @Autowired
    private PlatformDetlService platformDetlService;
    @Autowired
    private PlatformDetlLogService platformDetlLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private CacheSiteService cacheSiteService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private WaveDetlService waveDetlService;
    @Autowired
    private WaveLogService waveLogService;
    @Autowired
    private WaveDetlLogService waveDetlLogService;

    @Override
    public void shipped(PlatformShippedParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }

        if (param.getPlatformId() == null) {
            throw new CoolException("集货区域参数不能为空");
        }

        Platform platform = this.getById(param.getPlatformId());
        if(platform == null) {
            throw new CoolException("集货区域数据不存在");
        }

        List<PlatformDetl> detls = platformDetlService.list(new LambdaQueryWrapper<PlatformDetl>().eq(PlatformDetl::getPlatformId, platform.getId()));
        if (detls.isEmpty()) {
            throw new CoolException("集货区域库存为空");
        }

        ArrayList<Long> orderIds = new ArrayList<>();
        for (PlatformDetl detl : detls) {
            if (!orderIds.contains(detl.getOrderId())) {
                orderIds.add(detl.getOrderId());
            }
        }

        List<Order> orderList = orderService.listByIds(orderIds);
        if(orderList.isEmpty()) {
            throw new CoolException("订单数据不存在");
        }

        ArrayList<Long> waveIds = new ArrayList<>();
        for (Order order : orderList) {
            waveIds.add(order.getWaveId());
        }

        if (waveIds.isEmpty()) {
            throw new CoolException("波次不存在");
        }

        List<Task> waitTasks = taskService.selectWaitWaveOut(waveIds);
        if (!waitTasks.isEmpty()) {
            throw new CoolException("波次存在未完成任务");
        }

        for (PlatformDetl detl : detls) {
            OrderDetl orderDetl = orderDetlService.getById(detl.getOrderDetlId());
            orderDetl.setQty(orderDetl.getQty() + detl.getQty());
            orderDetl.setWorkQty(orderDetl.getWorkQty() - detl.getAnfme());
            orderDetl.setUpdateTime(new Date());
            if (!orderDetlService.updateById(orderDetl)) {
                throw new CoolException("订单明细更新失败");
            }
        }

        List<Wave> waves = waveService.listByIds(waveIds);
        for (Wave wave : waves) {
            WaveLog waveLog = new WaveLog();
            waveLog.sync(wave);
            waveLog.setId(null);
            if (!waveLogService.save(waveLog)) {
                throw new CoolException("波次转历史失败");
            }

            List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, wave.getId()));
            for (WaveDetl waveDetl : waveDetls) {
                WaveDetlLog waveDetlLog = new WaveDetlLog();
                waveDetlLog.sync(waveDetl);
                waveDetlLog.setId(null);
                waveDetlLog.setWaveId(waveLog.getId());
                if (!waveDetlLogService.save(waveDetlLog)) {
                    throw new CoolException("波次明细转历史失败");
                }

                if (!waveDetlService.removeById(waveDetl.getId())) {
                    throw new CoolException("波次明细删除失败");
                }
            }

            if (!waveService.removeById(wave.getId())) {
                throw new CoolException("波次删除失败");
            }
        }

        List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
        for (Order order : orders) {
            order.setOrderSettle(OrderSettleType.COMPLETE.val());
            order.setUpdateTime(new Date());
            if (!orderService.updateById(order)) {
                throw new CoolException("订单更新失败");
            }
        }

        List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getPlatformId, platform.getId()));
        for (CacheSite cacheSite : cacheSites) {
            if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
                cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
                cacheSite.setOrderId(null);
                cacheSite.setOrderNo(null);
                cacheSite.setPlatformId(null);
                cacheSite.setPlatformNo(null);
                cacheSite.setUpdateTime(new Date());
                if (!cacheSiteService.updateById(cacheSite)) {
                    throw new CoolException("播种站点更新失败");
                }
            }
        }

        for (PlatformDetl detl : detls) {
            PlatformDetlLog platformDetlLog = new PlatformDetlLog();
            platformDetlLog.sync(detl);
            platformDetlLog.setId(null);
            if (!platformDetlLogService.save(platformDetlLog)) {
                throw new CoolException("集货区域库存转历史失败");
            }

            if (!platformDetlService.removeById(detl.getId())) {
                throw new CoolException("集货区域删除失败");
            }
        }

    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java

@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@Service("taskService")
@@ -28,4 +29,8 @@
        return tasks;
    }

    @Override
    public List<Task> selectWaitWaveOut(List<Long> waveIds) {
        return this.baseMapper.selectWaitWaveOut(waveIds);
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveDetlLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.zy.asrs.wms.asrs.mapper.WaveDetlLogMapper;
import com.zy.asrs.wms.asrs.entity.WaveDetlLog;
import com.zy.asrs.wms.asrs.service.WaveDetlLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waveDetlLogService")
public class WaveDetlLogServiceImpl extends ServiceImpl<WaveDetlLogMapper, WaveDetlLog> implements WaveDetlLogService {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.zy.asrs.wms.asrs.mapper.WaveLogMapper;
import com.zy.asrs.wms.asrs.entity.WaveLog;
import com.zy.asrs.wms.asrs.service.WaveLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waveLogService")
public class WaveLogServiceImpl extends ServiceImpl<WaveLogMapper, WaveLog> implements WaveLogService {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.asrs.service.impl;

import com.zy.asrs.wms.asrs.mapper.WaveSeedLogMapper;
import com.zy.asrs.wms.asrs.entity.WaveSeedLog;
import com.zy.asrs.wms.asrs.service.WaveSeedLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waveSeedLogService")
public class WaveSeedLogServiceImpl extends ServiceImpl<WaveSeedLogMapper, WaveSeedLog> implements WaveSeedLogService {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java

@@ -269,7 +269,7 @@

        Task task = new Task();
        task.setTaskNo(this.generateTaskNo(taskType.getId()));//任务号
        task.setTaskSts(1L);//1.生成入库任务
        task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.生成入库任务
        task.setTaskType(taskType.getId());//任务类型
        task.setIoPri(this.generateIoPri(taskType.getId()));//优先级
        task.setOriginLoc(null);
@@ -378,7 +378,7 @@

        Task task = new Task();
        task.setTaskNo(this.generateTaskNo(taskType.getId()));//任务号
        task.setTaskSts(1L);//1.生成入库任务
        task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.生成入库任务
        task.setTaskType(taskType.getId());//任务类型
        task.setIoPri(this.generateIoPri(taskType.getId()));//优先级
        task.setOriginLoc(null);
@@ -416,14 +416,14 @@

        if (task.getTaskType() < 100) {
            //入库
            task.setTaskSts(99L);//99.入库完成
            task.setTaskSts(TaskStsType.COMPLETE_IN.id);//99.入库完成
        }else {
            //出库
            TaskDetl taskDetl = taskDetls.get(0);
            if (taskDetl.getWaveId() == null) {
                task.setTaskSts(199L);//199.出库完成
                task.setTaskSts(TaskStsType.COMPLETE_OUT.id);//199.出库完成
            }else {
                task.setTaskSts(198L);//198.播种中
                task.setTaskSts(TaskStsType.WAVE_SEED.id);//198.播种中
            }
        }

@@ -632,7 +632,7 @@
            throw new CoolException("没有空库位");
        }

        task.setTaskSts(1L);//1.生成入库任务
        task.setTaskSts(TaskStsType.GENERATE_IN.id);//1.生成入库任务
        task.setTaskType(taskType);
        task.setTargetLoc(loc.getLocNo());
        task.setUpdateTime(new Date());

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java

@@ -7,6 +7,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Dict;
import com.zy.asrs.wms.system.service.DictService;
@@ -40,6 +41,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private DictService dictService;
    @Autowired
    private WaveService waveService;

    @Scheduled(cron = "0/3 * * * * ? ")
    @Transactional
@@ -47,7 +50,7 @@
        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
        try {
            //获取入库完成任务
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 100));
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.UPDATED_IN.id));
            if (list.isEmpty()) {
                return;
            }
@@ -161,7 +164,7 @@
        try {
            //获取出库完成任务
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
                    .eq(Task::getTaskSts, 200)
                    .eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id)
                    .in(Task::getTaskType, 101, 53, 57));
            if (list.isEmpty()) {
                return;
@@ -180,6 +183,30 @@

                Long hostId = task.getHostId();

                //保存任务明细历史档
                List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
                if (taskDetls.isEmpty()) {
                    throw new CoolException("任务明细不存在");
                }

                boolean flag = false;
                for (TaskDetl taskDetl : taskDetls) {
                    if (taskDetl.getWaveId() == null) {
                        continue;
                    }

                    Wave wave = waveService.getById(taskDetl.getWaveId());
                    if (wave != null) {
                        flag = true;//波次未完成
                        break;
                    }
                }

                if (flag) {
                    continue;
                }


                //保存任务历史档
                TaskLog taskLog = new TaskLog();
                taskLog.sync(task);
@@ -193,11 +220,6 @@
                    throw new CoolException("删除任务档失败");
                }

                //保存任务明细历史档
                List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
                if (taskDetls.isEmpty()) {
                    throw new CoolException("任务明细不存在");
                }
                for (TaskDetl taskDetl : taskDetls) {
                    TaskDetlLog taskDetlLog = new TaskDetlLog();
                    taskDetlLog.sync(taskDetl);

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java

@@ -6,6 +6,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -62,7 +63,7 @@
        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
        try {
            //获取入库完成任务
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 99));
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_IN.id));
            if (list.isEmpty()) {
                return;
            }
@@ -80,7 +81,7 @@
                        throw new CoolException("未知任务类型");
                }

                task.setTaskSts(100L);//100.库存更新完成
                task.setTaskSts(TaskStsType.UPDATED_IN.id);//100.库存更新完成
                task.setUpdateTime(new Date());
                if (!taskService.updateById(task)) {
                    throw new CoolException("库存更新失败");
@@ -100,7 +101,7 @@
        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
        try {
            //获取出库完成任务
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 199));
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
            if (list.isEmpty()) {
                return;
            }
@@ -117,7 +118,7 @@
                        throw new CoolException("未知任务类型");
                }

                task.setTaskSts(200L);//200.库存更新完成
                task.setTaskSts(TaskStsType.UPDATED_OUT.id);//200.库存更新完成
                if (!taskService.updateById(task)) {
                    throw new CoolException("库存更新失败");
                }

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java

@@ -1,11 +1,14 @@
package com.zy.asrs.wms.asrs.timer;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Dict;
import com.zy.asrs.wms.system.service.DictService;
@@ -56,7 +59,7 @@
                return;
            }

            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 198));
            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
            for (Task task : taskList) {
                Long hostId = task.getHostId();

@@ -114,6 +117,9 @@
                        waveSeed.setTaskDetlId(taskDetl.getId());
                        waveSeed.setAnfme(taskDetl.getAnfme());
                        waveSeed.setWorkQty(0D);
                        waveSeed.setMatnr(taskDetl.getMatnr());
                        waveSeed.setBatch(taskDetl.getBatch());
                        waveSeed.setFieldParams(JSON.toJSONString(taskDetl.getUniqueField()));
                        waveSeed.setHostId(hostId);
                        if (!waveSeedService.save(waveSeed)) {
                            throw new CoolException("波次播种创建失败");
@@ -131,7 +137,7 @@

                }

                task.setTaskSts(199L);
                task.setTaskSts(TaskStsType.COMPLETE_OUT.id);
                task.setUpdateTime(new Date());
                if (!taskService.updateById(task)) {
                    throw new CoolException("任务更新失败");

 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_seed";
        generator.tableName="波次播种";
        generator.table="man_platform_detl_log";
        generator.tableName="集货区域库存历史";
        generator.rootPackagePath="com.zy.asrs.wms";
        generator.packagePath="com.zy.asrs.wms.asrs";


 zy-asrs-wms/src/main/resources/mapper/asrs/PlatformDetlLogMapper.xml

New file
@@ -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.PlatformDetlLogMapper">

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/PlatformDetlMapper.xml

New file
@@ -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.PlatformDetlMapper">

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/PlatformMapper.xml

New file
@@ -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.PlatformMapper">

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml

@@ -2,4 +2,15 @@
<!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.TaskMapper">

    <select id="selectWaitWaveOut" resultType="com.zy.asrs.wms.asrs.entity.Task">
        select * from man_task mt
        left join man_task_detl mtd
        on mt.id = mtd.task_id
        where task_sts not in (199,200)
        and wave_id in
        <foreach item="item" collection="waveIds" index="index"  separator="," open="(" close=")">
            #{item}
        </foreach>
    </select>

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/WaveDetlLogMapper.xml

New file
@@ -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.WaveDetlLogMapper">

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/WaveLogMapper.xml

New file
@@ -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.WaveLogMapper">

</mapper>

 zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedLogMapper.xml

New file
@@ -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.WaveSeedLogMapper">

</mapper>

 zy-asrs-wms/src/main/resources/sql/menu/platform.sql

New file
@@ -0,0 +1,9 @@
-- save platform record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '集货管理', '0', '/out/platform', '/out/platform', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询集货管理', '1088', '1', 'asrs:platform:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加集货管理', '1088', '1', 'asrs:platform:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改集货管理', '1088', '1', 'asrs:platform:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除集货管理', '1088', '1', 'asrs:platform:remove', '3', '1', '1');


 zy-asrs-wms/src/main/resources/sql/menu/platformDetl.sql

New file
@@ -0,0 +1,9 @@
-- save platformDetl record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '集货库存', '0', '/out/platformDetl', '/out/platformDetl', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询集货库存', '', '1', 'asrs:platformDetl:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加集货库存', '', '1', 'asrs:platformDetl:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改集货库存', '', '1', 'asrs:platformDetl:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除集货库存', '', '1', 'asrs:platformDetl:remove', '3', '1', '1');


 zy-asrs-wms/src/main/resources/sql/menu/platformDetlLog.sql

New file
@@ -0,0 +1,9 @@
-- save platformDetlLog record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '集货区域库存历史管理', '0', '/asrs/platformDetlLog', '/asrs/platformDetlLog', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询集货区域库存历史', '', '1', 'asrs:platformDetlLog:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加集货区域库存历史', '', '1', 'asrs:platformDetlLog:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改集货区域库存历史', '', '1', 'asrs:platformDetlLog:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除集货区域库存历史', '', '1', 'asrs:platformDetlLog:remove', '3', '1', '1');


 zy-asrs-wms/src/main/resources/sql/menu/waveDetlLog.sql

New file
@@ -0,0 +1,9 @@
-- save waveDetlLog record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '波次明细历史管理', '0', '/asrs/waveDetlLog', '/asrs/waveDetlLog', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询波次明细历史', '', '1', 'asrs:waveDetlLog:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加波次明细历史', '', '1', 'asrs:waveDetlLog:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改波次明细历史', '', '1', 'asrs:waveDetlLog:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除波次明细历史', '', '1', 'asrs:waveDetlLog:remove', '3', '1', '1');


 zy-asrs-wms/src/main/resources/sql/menu/waveLog.sql

New file
@@ -0,0 +1,9 @@
-- save waveLog record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '波次历史管理', '0', '/asrs/waveLog', '/asrs/waveLog', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询波次历史', '', '1', 'asrs:waveLog:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加波次历史', '', '1', 'asrs:waveLog:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改波次历史', '', '1', 'asrs:waveLog:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除波次历史', '', '1', 'asrs:waveLog:remove', '3', '1', '1');


 zy-asrs-wms/src/main/resources/sql/menu/waveSeedLog.sql

New file
@@ -0,0 +1,9 @@
-- save waveSeedLog record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '波次播种历史管理', '0', '/asrs/waveSeedLog', '/asrs/waveSeedLog', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询波次播种历史', '', '1', 'asrs:waveSeedLog:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加波次播种历史', '', '1', 'asrs:waveSeedLog:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改波次播种历史', '', '1', 'asrs:waveSeedLog:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除波次播种历史', '', '1', 'asrs:waveSeedLog:remove', '3', '1', '1');