自动化立体仓库 - WMS系统
zhou zhou
2025-12-18 7f04f17507063dbd922055bf5dcd1190da686071
#客户+部门
15个文件已修改
254 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OrderPakinController.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderPakoutController.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/Order.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderLog.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderPakin.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderPakinLog.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderPakout.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/OrderPakoutLog.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/system/timer/LoadingConfigTimer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/orderPakin/order.js 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/orderPakout/order.js 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/orderPakin/order.html 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/orderPakout/order.html 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -42,6 +42,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private ClientService clientService;
    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -112,19 +114,23 @@
        if (order != null) {
            return R.error("单据编号已存在");
        }
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
            return R.error("客户不存在");
        }
        Date now = new Date();
        order = new OrderPakin(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                param.getOrderTime(),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                client.getCode(),    // 客户编号
                client.getName(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -194,14 +200,23 @@
        }
        Date now = new Date();
        Long userId = getUserId();
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
            return R.error("客户不存在");
        }
        order.setCstmr(client.getCode());
        order.setCstmrName(client.getName());
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
        if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
            order.setDocType(param.getDocType());
            order.setOrderTime(param.getOrderTime());
        }
            order.setUpdateBy(userId);
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
            }
        }
        // 修改明细档
//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
@@ -310,7 +325,7 @@
                .add("list", wrkTraceVos)
                .add("orderNo", order.getOrderNo())
                .add("totalQty", totalQty)
                .add("wrkQty", wrkQty + endQty)
                .add("wrkQty", wrkQty)
                .add("lackQty", lackQty)
                .add("endQty", endQty)
        );
src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -42,6 +42,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private ClientService clientService;
    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -112,19 +114,23 @@
        if (order != null) {
            return R.error("单据编号已存在");
        }
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
            return R.error("客户不存在");
        }
        Date now = new Date();
        order = new OrderPakout(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                param.getOrderTime(),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                client.getCode(),    // 客户编号
                client.getName(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -192,9 +198,16 @@
        }
        Date now = new Date();
        Long userId = getUserId();
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
            return R.error("客户不存在");
        }
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
        if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
            order.setCstmr(client.getCode());
            order.setCstmrName(client.getName());
            order.setDocType(param.getDocType());
            order.setOrderTime(param.getOrderTime());
            order.setUpdateBy(userId);
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
@@ -307,7 +320,7 @@
                .add("list", wrkTraceVos)
                .add("orderNo", order.getOrderNo())
                .add("totalQty", totalQty)
                .add("wrkQty", wrkQty + endQty)
                .add("wrkQty", wrkQty)
                .add("lackQty", lackQty)
                .add("endQty", endQty)
        );
src/main/java/com/zy/asrs/entity/Order.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -279,7 +279,7 @@
    public Order() {
    }
    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -279,7 +279,7 @@
    public OrderLog() {
    }
    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
@@ -316,7 +316,7 @@
        this.memo = memo;
    }
    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/OrderPakin.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -277,7 +277,7 @@
    private Integer pakinPakoutStatus;
    public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -279,7 +279,7 @@
    public OrderPakinLog() {
    }
    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -279,7 +279,7 @@
    public OrderPakout() {
    }
    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
@@ -94,7 +94,7 @@
     * 客户编号
     */
    @ApiModelProperty(value = "客户编号")
    private Long cstmr;
    private String cstmr;
    /**
     * 客户
@@ -279,7 +279,7 @@
    public OrderPakoutLog() {
    }
    public OrderPakoutLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderPakoutLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -19,6 +20,10 @@
    private String orderNo;
    private String orderTime;
    private String cstmrName;
    private List<OrderDetl> orderDetlList;
    private List<OrderDetlPakin> orderDetlPakinList;
    private List<OrderDetlPakout> orderDetlPakoutList;
src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -18,7 +18,7 @@
    /**
     * token有效期时间
     */
    private Integer tokenExpire = 1000 * 30 * 60;
    private Integer tokenExpire = 100000 * 30 * 60;
    /**
     * token数量限制
     */
src/main/webapp/static/js/order/order.js
@@ -43,6 +43,7 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'orderTime', align: 'center', title: '业务时间' },
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
src/main/webapp/static/js/orderPakin/order.js
@@ -44,6 +44,8 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            { field: 'orderTime', align: 'center', title: '业务时间', },
            { field: 'cstmrName', align: 'center', title: '客户', },
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
@@ -179,8 +181,63 @@
                if (expTpe) {
                    $('#orderNo').attr("disabled", "disabled");
                }
                // 初始化业务时间日期选择器
                layDate.render({
                    elem: '#orderTime',
                    type: 'datetime',
                    format: 'yyyy-MM-dd HH:mm:ss'
                });
                // 初始化客户选择器
                var cstmrData = [];
                $.ajax({
                    url: baseUrl + "/client/list/auth",
                    headers: { 'token': localStorage.getItem('token') },
                    data: { limit: 9999 },
                    method: 'POST',
                    async: false,
                    success: function (res) {
                        if (res.code === 200) {
                            // 转换为 xmSelect 需要的格式
                            res.data.records.forEach(function (item) {
                                cstmrData.push({
                                    name: item.name,
                                    value: item.code
                                });
                            });
                        } else {
                            layer.msg(res.msg, { icon: 2 });
                        }
                    }
                });
                var cstmrXmSelect = xmSelect.render({
                    el: '#cstmrSelect',
                    radio: true,
                    clickClose: true,
                    filterable: true,
                    create: function (val, arr) {
                        if (arr.length === 0) {
                            return {
                                name: val,
                                value: val
                            }
                        }
                    },
                    model: {
                        icon: 'hidden',
                        label: {
                            type: 'text',
                        }
                    },
                    data: cstmrData,
                    initValue: expTpe && expTpe.cstmr ? [expTpe.cstmr] : []
                });
                // 表单提交事件
                form.on('submit(orderEditSubmit)', function (data) {
                    // 验证客户必选
                    if (!cstmrXmSelect.getValue()[0]) {
                        layer.msg('请选择客户', { icon: 2 });
                        return false;
                    }
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -205,6 +262,8 @@
                            orderId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            orderNo: data.field.orderNo,
                            cstmrName: cstmrXmSelect.getValue()[0] ? cstmrXmSelect.getValue()[0].name : null,
                            orderTime: data.field.orderTime,
                            orderDetlPakinList: nList
                        }),
                        contentType:'application/json;charset=UTF-8',
src/main/webapp/static/js/orderPakout/order.js
@@ -44,6 +44,8 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            { field: 'orderTime', align: 'center', title: '业务时间' },
            { field: 'cstmrName', align: 'center', title: '客户' },
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
@@ -179,8 +181,63 @@
                if (expTpe) {
                    $('#orderNo').attr("disabled", "disabled");
                }
                // 初始化业务时间日期选择器
                layDate.render({
                    elem: '#orderTime',
                    type: 'datetime',
                    format: 'yyyy-MM-dd HH:mm:ss'
                });
                // 初始化客户选择器
                var cstmrData = [];
                $.ajax({
                    url: baseUrl + "/client/list/auth",
                    headers: { 'token': localStorage.getItem('token') },
                    data: { limit: 9999 },
                    method: 'POST',
                    async: false,
                    success: function (res) {
                        if (res.code === 200) {
                            // 转换为 xmSelect 需要的格式
                            res.data.records.forEach(function (item) {
                                cstmrData.push({
                                    name: item.name,
                                    value: item.code
                                });
                            });
                        } else {
                            layer.msg(res.msg, { icon: 2 });
                        }
                    }
                });
                var cstmrXmSelect = xmSelect.render({
                    el: '#cstmrSelect',
                    radio: true,
                    clickClose: true,
                    filterable: true,
                    create: function (val, arr) {
                        if (arr.length === 0) {
                            return {
                                name: val,
                                value: val
                            }
                        }
                    },
                    model: {
                        icon: 'hidden',
                        label: {
                            type: 'text',
                        }
                    },
                    data: cstmrData,
                    initValue: expTpe && expTpe.cstmr ? [expTpe.cstmr] : []
                });
                // 表单提交事件
                form.on('submit(orderEditSubmit)', function (data) {
                    // 验证客户必选
                    if (!cstmrXmSelect.getValue()[0]) {
                        layer.msg('请选择客户', { icon: 2 });
                        return false;
                    }
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -205,6 +262,8 @@
                            orderId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            orderNo: data.field.orderNo,
                            cstmrName: cstmrXmSelect.getValue()[0] ? cstmrXmSelect.getValue()[0].name : null,
                            orderTime: data.field.orderTime,
                            orderDetlPakoutList: nList
                        }),
                        contentType:'application/json;charset=UTF-8',
src/main/webapp/views/orderPakin/order.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
@@ -25,20 +26,25 @@
        .layui-timeline:first-child .layui-timeline-item {
            margin-top: 30px;
        }
        .btn-add {
            display: none;
        }
        .btn-edit {
            display: none;
        }
        .btn-complete {
            display: none;
        }
        .btn-delete {
            display: none;
        }
    </style>
</head>
<body>
<!-- 正文开始 -->
@@ -55,7 +61,8 @@
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                                <input class="layui-input layui-laydate-range" name="create_time" type="text"
                                    placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -79,7 +86,8 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                            <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i
                                    class="layui-icon">&#xe654;</i>添加
                        </button>
                    </div>
                </div>
@@ -161,6 +169,19 @@
            <div class="layui-input-block">
                <input id="orderNo" name="orderNo" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
<!--                lay-verify="required"-->
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">客户:</label>
            <div class="layui-input-block">
                <input id="cstmr" name="cstmr" type="hidden" />
                <div id="cstmrSelect" ></div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">业务时间:</label>
            <div class="layui-input-block">
                <input id="orderTime" name="orderTime" placeholder="选择业务时间" type="text" class="layui-input" autocomplete="off" lay-verType="tips" />
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">
@@ -318,4 +339,3 @@
</body>
</html>
src/main/webapp/views/orderPakout/order.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
@@ -25,20 +26,25 @@
        .layui-timeline:first-child .layui-timeline-item {
            margin-top: 30px;
        }
        .btn-add {
            display: none;
        }
        .btn-edit {
            display: none;
        }
        .btn-complete {
            display: none;
        }
        .btn-delete {
            display: none;
        }
    </style>
</head>
<body>
<!-- 正文开始 -->
@@ -55,7 +61,8 @@
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                                <input class="layui-input layui-laydate-range" name="create_time" type="text"
                                    placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -79,7 +86,8 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                            <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i
                                    class="layui-icon">&#xe654;</i>添加
                        </button>
                    </div>
                </div>
@@ -161,6 +169,19 @@
            <div class="layui-input-block">
                <input id="orderNo" name="orderNo" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
<!--                lay-verify="required"-->
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">客户:</label>
            <div class="layui-input-block">
                <input id="cstmr" name="cstmr" type="hidden" />
                <div id="cstmrSelect" ></div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">业务时间:</label>
            <div class="layui-input-block">
                <input id="orderTime" name="orderTime" placeholder="选择业务时间" type="text" class="layui-input" autocomplete="off" lay-verType="tips" />
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">
@@ -318,4 +339,3 @@
</body>
</html>