#

Junjie

2024-08-01 d64a3ba24419ed4706b8f1b5108200a26356946a

#

 zy-asrs-admin/src/components/task/generateTask/index.vue

@@ -49,6 +49,12 @@
    })
}

watch(open, (newVal, oldVal) => {
    if (newVal) {
        waitPakinQueryListQuery()
    }
})

defineExpose({
    open,
})

 zy-asrs-admin/src/views/in/waitPakin/edit.vue

@@ -45,9 +45,11 @@
};

const orderQueryList = ref(null);
orderQuery();
function orderQuery() {
    postForm('/api/order/query', {}).then(resp => {
orderQuery(null);
function orderQuery(condition) {
    postForm('/api/order/query', {
        condition: condition
    }).then(resp => {
        let result = resp.data;
        orderQueryList.value = result.data;
    })
@@ -86,6 +88,10 @@
}
const zpalletBarcodeSearch = (e) => {
    zpalletBarcodeQuery(e)
}

const handleSearchChange = (e) =>{
    orderQuery(e);
}

const handleSelectChange = async (id) => {
@@ -149,7 +155,7 @@
                    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" @change="handleSelectChange">
                        optionLabelProp="label" @change="handleSelectChange" @search="handleSearchChange">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin.order_no', '订单编号')" name="orderNo"

 zy-asrs-admin/src/views/in/waitPakinLog/edit.vue

New file
@@ -0,0 +1,173 @@
<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/waitPakinLog/save' : '/api/waitPakinLog/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 orderLogQueryList = ref(null);
orderLogQuery();
function orderLogQuery() {
    postForm('/api/orderLog/query', {}).then(resp => {
        let result = resp.data;
        orderLogQueryList.value = result.data;
    })
}
const orderDetlLogQueryList = ref(null);
orderDetlLogQuery();
function orderDetlLogQuery() {
    postForm('/api/orderDetlLog/query', {}).then(resp => {
        let result = resp.data;
        orderDetlLogQueryList.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_wait_pakin_log.order_id', '订单ID')" name="orderId"
                    style="width: 250px;">
                    <a-select v-model:value="formData.orderId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="orderLogQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_log.order_no', '订单编号')" name="orderNo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.orderNo" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_log.anfme', '组托数量')" name="anfme"
                    style="width: 250px;">
                    <a-input v-model:value="formData.anfme" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_log.barcode', '托盘码')" name="barcode"
                    style="width: 250px;">
                    <a-input v-model:value="formData.barcode" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_log.detl_id', '明细ID')" name="detlId"
                    style="width: 250px;">
                    <a-select v-model:value="formData.detlId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="orderDetlLogQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_log.io_status', '组托状态')" name="ioStatus"
                    style="width: 250px;">
                    <a-select v-model:value="formData.ioStatus" :options="[
                        { label: '待入库', value: 0 },
                        { label: '入库中', value: 1 },
                    ]">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_wait_pakin_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_wait_pakin_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_wait_pakin_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_wait_pakin_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_wait_pakin_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_wait_pakin_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/in/waitPakinLog/index.vue

New file
@@ -0,0 +1,250 @@
<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-waitPakinLog';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
const editChild = ref(null)

let tableData = ref([]);
getPage();

const {
  getColumnSearchProps,
  handleResizeColumn,
} = useTableSearch();

const columns = [
  {
    title: formatMessage('db.man_wait_pakin_log.order_id', '订单ID'),
    dataIndex: 'orderId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.anfme', '组托数量'),
    dataIndex: 'anfme',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('anfme'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.barcode', '托盘码'),
    dataIndex: 'barcode',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('barcode'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.detl_id', '明细ID'),
    dataIndex: 'detlId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('detlId$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.io_status', '组托状态'),
    dataIndex: 'ioStatus$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('ioStatus$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.status', '状态'),
    dataIndex: 'status$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('status$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.create_time', '添加时间'),
    dataIndex: 'createTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createTime$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.create_by', '添加人员'),
    dataIndex: 'createBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createBy$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },

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

const state = reactive({
  selectedRowKeys: [],
  loading: false,
});
const hasSelected = computed(() => state.selectedRowKeys.length > 0);
const start = () => {
  state.loading = true;
  // ajax request after empty completing
  setTimeout(() => {
    state.loading = false;
    state.selectedRowKeys = [];
  }, 1000);
};
const onSelectChange = selectedRowKeys => {
  // console.log('selectedRowKeys changed: ', selectedRowKeys);
  state.selectedRowKeys = selectedRowKeys;
};

function getPage() {
  post('/api/waitPakinLog/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
  }).then((resp) => {
    let result = resp.data;
    if (result.code == 200) {
      let data = result.data;
      tableData.value = data;
    } else if (result.code === 401) {
      message.error(result.msg);
      logout()
    } else {
      message.error(result.msg);
    }
  })
}

const handleEdit = (item) => {
  editChild.value.open = true;
  editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
  editChild.value.isSave = item == null;
}

const handleDel = (rows) => {
  Modal.confirm({
    title: formatMessage('page.delete', '删除'),
    content: formatMessage('page.delete.confirm', '确定删除该项吗？'),
    maskClosable: true,
    onOk: async () => {
      const hide = message.loading(formatMessage('common.loading', '请求中'));
      try {
        post('/api/waitPakinLog/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/waitPakinLog/export', {}).then(result => {
    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
    window.location.href = window.URL.createObjectURL(blob);
    return true;
  })
};

const onSearch = () => {
  // console.log('search');
  getPage()
}

const onPageChange = (page, size) => {
  currentPage = page;
  pageSize = size;
  getPage();
}

function handleTableReload(value) {
  getPage()
}

</script>

<script>
export default {
  name: '组托通知历史档'
}
</script>

<template>
  <div>
    <EditView ref="editChild" @tableReload="handleTableReload" />
    <div class="table-header">
      <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '请输入')"
        style="width: 200px;" @search="onSearch" />
      <div class="table-header-right">
        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '添加') }}</a-button> -->
        <a-button @click="handleExport">{{ formatMessage('page.export', '导出') }}</a-button>
      </div>
    </div>
    <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
      :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
      :pagination="{ total: tableData.total, onChange: onPageChange }"
      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
      <template #bodyCell="{ column, text, record }">
        <template v-if="column.dataIndex === 'oper'">
          <div style="display: flex;justify-content: space-evenly;">
            <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '编辑') }}</a-button>
            <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '删除')
              }}</a-button>
          </div>
        </template>
      </template>
    </a-table>
  </div>
</template>

<style></style>

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

@@ -142,7 +142,7 @@
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Order::getId, condition);
            wrapper.like(Order::getOrderNo, condition);
        }
        orderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getOrderNo()))

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.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.WaitPakinLog;
import com.zy.asrs.wms.asrs.service.WaitPakinLogService;
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 WaitPakinLogController extends BaseController {

    @Autowired
    private WaitPakinLogService waitPakinLogService;

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

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

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

    @PreAuthorize("hasAuthority('asrs:waitPakinLog:save')")
    @OperationLog("添加组托通知历史档")
    @PostMapping("/waitPakinLog/save")
    public R save(@RequestBody WaitPakinLog waitPakinLog) {
        if (!waitPakinLogService.save(waitPakinLog)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:waitPakinLog:update')")
    @OperationLog("修改组托通知历史档")
    @PostMapping("/waitPakinLog/update")
    public R update(@RequestBody WaitPakinLog waitPakinLog) {
        if (!waitPakinLogService.updateById(waitPakinLog)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:waitPakinLog:remove')")
    @OperationLog("删除组托通知历史档")
    @PostMapping("/waitPakinLog/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!waitPakinLogService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

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

}

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

New file
@@ -0,0 +1,267 @@
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.OrderDetlLogService;
import com.zy.asrs.wms.asrs.service.OrderLogService;
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_wait_pakin_log")
public class WaitPakinLog 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 orderId;

    /**
     * 订单编号
     */
    @ApiModelProperty(value= "订单编号")
    private String orderNo;

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

    /**
     * 托盘码
     */
    @ApiModelProperty(value= "托盘码")
    private String barcode;

    /**
     * 明细ID
     */
    @ApiModelProperty(value= "明细ID")
    private Long detlId;

    /**
     * 组托状态 0: 待入库  1: 入库中  
     */
    @ApiModelProperty(value= "组托状态 0: 待入库  1: 入库中  ")
    private Integer ioStatus;

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

    public WaitPakinLog(Long orderId,String orderNo,Double anfme,String barcode,Long detlId,Integer ioStatus,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.orderId = orderId;
        this.orderNo = orderNo;
        this.anfme = anfme;
        this.barcode = barcode;
        this.detlId = detlId;
        this.ioStatus = ioStatus;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    WaitPakinLog waitPakinLog = new WaitPakinLog(
//            null,    // 订单ID
//            null,    // 订单编号
//            null,    // 组托数量
//            null,    // 托盘码
//            null,    // 明细ID
//            null,    // 组托状态
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null    // 备注
//    );

    public String getOrderId$(){
        OrderLogService service = SpringUtils.getBean(OrderLogService.class);
        OrderLog orderLog = service.getById(this.orderId);
        if (!Cools.isEmpty(orderLog)){
            return String.valueOf(orderLog.getId());
        }
        return null;
    }

    public String getDetlId$(){
        OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
        OrderDetlLog orderDetlLog = service.getById(this.detlId);
        if (!Cools.isEmpty(orderDetlLog)){
            return String.valueOf(orderDetlLog.getId());
        }
        return null;
    }

    public String getIoStatus$(){
        if (null == this.ioStatus){ return null; }
        switch (this.ioStatus){
            case 0:
                return "待入库";
            case 1:
                return "入库中";
            default:
                return String.valueOf(this.ioStatus);
        }
    }

    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/mapper/WaitPakinLogMapper.java

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

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

@Mapper
@Repository
public interface WaitPakinLogMapper extends BaseMapper<WaitPakinLog> {

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinLogService.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.WaitPakinLog;

public interface WaitPakinLogService extends IService<WaitPakinLog> {

}

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

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

import com.zy.asrs.wms.asrs.mapper.WaitPakinLogMapper;
import com.zy.asrs.wms.asrs.entity.WaitPakinLog;
import com.zy.asrs.wms.asrs.service.WaitPakinLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waitPakinLogService")
public class WaitPakinLogServiceImpl extends ServiceImpl<WaitPakinLogMapper, WaitPakinLog> implements WaitPakinLogService {

}

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

@@ -33,6 +33,8 @@
    private LocDetlFieldService locDetlFieldService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinLogService waitPakinLogService;

    @Scheduled(cron = "0/3 * * * * ? ")
    @Transactional
@@ -101,6 +103,17 @@
                            }
                        }

                        //组托通知档转历史档
                        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
                        if (waitPakin == null) {
                            throw new CoolException("组托通知档不存在");
                        }
                        WaitPakinLog waitPakinLog = new WaitPakinLog();
                        waitPakinLog.sync(waitPakin);
                        if (!waitPakinLogService.save(waitPakinLog)) {
                            throw new CoolException("组托通知档转历史档失败");
                        }

                        //删除组托通知档
                        waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));


 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_order_detl_field_log";
        generator.tableName="订单明细扩展字段历史";
        generator.table="man_wait_pakin_log";
        generator.tableName="组托通知历史档";
        generator.rootPackagePath="com.zy.asrs.wms";
        generator.packagePath="com.zy.asrs.wms.asrs";


 zy-asrs-wms/src/main/java/waitPakinLog.sql

New file
@@ -0,0 +1,9 @@
-- save waitPakinLog record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '组托通知历史档管理', '0', '/asrs/waitPakinLog', '/asrs/waitPakinLog', '0' , '0', '1' , '1');

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


 zy-asrs-wms/src/main/resources/mapper/asrs/WaitPakinLogMapper.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.WaitPakinLogMapper">

</mapper>