#

mrzhssss

2022-03-18 727ca8cec69ad6305f78ad1b432f01fd2601d925

#

 src/main/java/wave.sql

New file
@@ -0,0 +1,18 @@
-- save wave record
-- mysql
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave/wave.html', 'wave管理', null , '2', null , '1');

insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave#view', '查询', '', '3', '0', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave#btn-add', '新增', '', '3', '1', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave#btn-edit', '编辑', '', '3', '2', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave#btn-delete', '删除', '', '3', '3', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wave#btn-export', '导出', '', '3', '4', '1');

-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave/wave.html', N'wave管理', null, '2', null, '1');

insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave#view', N'查询', '30552', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave#btn-add', N'新增', '30552', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave#btn-edit', N'编辑', '30552', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave#btn-delete', N'删除', '30552', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wave#btn-export', N'导出', '30552', '3', '4', '1');

 src/main/java/waveDetl.sql

New file
@@ -0,0 +1,18 @@
-- save waveDetl record
-- mysql
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl/waveDetl.html', 'waveDetl管理', null , '2', null , '1');

insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl#view', '查询', '', '3', '0', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl#btn-add', '新增', '', '3', '1', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl#btn-edit', '编辑', '', '3', '2', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl#btn-delete', '删除', '', '3', '3', '1');
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waveDetl#btn-export', '导出', '', '3', '4', '1');

-- sqlserver
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl/waveDetl.html', N'waveDetl管理', null, '2', null, '1');

insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl#view', N'查询', '30558', '3', '0', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl#btn-add', N'新增', '30558', '3', '1', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl#btn-edit', N'编辑', '30558', '3', '2', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl#btn-delete', N'删除', '30558', '3', '3', '1');
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waveDetl#btn-export', N'导出', '30558', '3', '4', '1');

 src/main/java/zy/cloud/wms/common/CodeBuilder.java

@@ -23,7 +23,7 @@
        generator.url="192.168.4.15:1433;databasename=wms_saas";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="man_receive_log";
        generator.table="man_wave_detl";
        generator.packagePath="zy.cloud.wms.manager";
        generator.sqlOsType = SqlOsType.SQL_SERVER;
//        generator.js = false;

 src/main/java/zy/cloud/wms/manager/controller/OrderController.java

@@ -19,22 +19,32 @@
import zy.cloud.wms.common.utils.QrCode;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.entity.OrderDetl;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.service.OrderDetlService;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;

import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;

@RestController
public class OrderController extends BaseController {

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private WaveDetlService waveDetlService;

    @RequestMapping(value = "/order/{id}/auth")
    @ManagerAuth
@@ -180,4 +190,73 @@
        return R.ok();
    }

    /**
     * 生成波次
     */
    @RequestMapping("/orders/wave/auth")
    @ManagerAuth
    public R createWave(@RequestBody List<Order> orders){
        /**
         * 控管
         */
        Integer seqNo = 1;
        for (Order order : orders) {
            if (order.getSettle() != 2L) {
                return R.error("仅支持'未拣货'状态生成波次");
            }
        }

        /**
         * 生成波次表头
         */

        Wave wave = new Wave();
        wave.setHostId(getHostId());
        String s = UUID.randomUUID().toString().replace("-","");
        wave.setUuid(s);
        String waveNo = "wave-" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
        wave.setWaveNo(waveNo);
        wave.setOrdersQty(orders.size());
        wave.setStatus((short) 0);
        wave.setCreateBy(getUserId());
        wave.setUpdateBy(getUserId());
        waveService.insert(wave);

        /**
         * 生成波次明细
         */
        List<OrderDetl> allOrderDetls = orderDetlService.selectBatchByOrderNo(orders);
        for (OrderDetl allOrderDetl : allOrderDetls) {
            WaveDetl checkWaveDetl = waveDetlService.selectOne(new EntityWrapper<WaveDetl>()
                    .eq("matnr", allOrderDetl.getMatnr())
                    .eq("batch", allOrderDetl.getBatch()));
            if (Cools.isEmpty(checkWaveDetl)) {
                WaveDetl waveDetl = new WaveDetl();
                waveDetl.setHostId(getHostId());
                waveDetl.setWaveId(wave.getId());
                waveDetl.setWaveNo(wave.getWaveNo());
                waveDetl.setSeqNo(seqNo);
                seqNo++;
                waveDetl.setOrderQty(1);
                waveDetl.setOrderNos(allOrderDetl.getOrderNo());
                waveDetl.setAnfme(allOrderDetl.getAnfme());
                waveDetl.setMatnr(allOrderDetl.getMatnr());
                waveDetl.setMaktx(allOrderDetl.getMaktx());
                waveDetl.setStatus(0);
                waveDetl.setBatch(allOrderDetl.getBatch());
                waveDetl.setCreateBy(getUserId());
                waveDetl.setUpdateBy(getUserId());
                waveDetlService.insert(waveDetl);
            }else {
                checkWaveDetl.setOrderQty(checkWaveDetl.getOrderQty()+1);
                checkWaveDetl.setOrderNos(checkWaveDetl.getOrderNos() + "-split-" +allOrderDetl.getOrderNo());
                checkWaveDetl.setAnfme(checkWaveDetl.getAnfme() + allOrderDetl.getAnfme());
                waveDetlService.update(checkWaveDetl,new EntityWrapper<WaveDetl>()
                        .eq("id",checkWaveDetl.getId()));
            }
        }
        System.out.println("done");
        return null;
    }

}

 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java

@@ -263,9 +263,6 @@
        receiveDetl.setUpdateBy(getUserId());
        receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
                .eq("id",receiveDetl.getId()));



        return R.ok("撤回成功");
    }


 src/main/java/zy/cloud/wms/manager/controller/WaveController.java

New file
@@ -0,0 +1,123 @@
package zy.cloud.wms.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.service.WaveService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class WaveController extends BaseController {

    @Autowired
    private WaveService waveService;

    @RequestMapping(value = "/wave/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(waveService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/wave/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Wave> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(waveService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/wave/add/auth")
    @ManagerAuth
    public R add(Wave wave) {
        waveService.insert(wave);
        return R.ok();
    }

    @RequestMapping(value = "/wave/update/auth")
    @ManagerAuth
    public R update(Wave wave){
        if (Cools.isEmpty(wave) || null==wave.getId()){
            return R.error();
        }
        waveService.updateById(wave);
        return R.ok();
    }

    @RequestMapping(value = "/wave/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            waveService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/wave/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<Wave> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("wave"));
        convert(map, wrapper);
        List<Wave> list = waveService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/waveQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Wave> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<Wave> page = waveService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Wave wave : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", wave.getId());
            map.put("value", wave.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/wave/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Wave> wrapper = new EntityWrapper<Wave>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != waveService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(Wave.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

 src/main/java/zy/cloud/wms/manager/controller/WaveDetlController.java

New file
@@ -0,0 +1,123 @@
package zy.cloud.wms.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.service.WaveDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class WaveDetlController extends BaseController {

    @Autowired
    private WaveDetlService waveDetlService;

    @RequestMapping(value = "/waveDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(waveDetlService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/waveDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<WaveDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(waveDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/waveDetl/add/auth")
    @ManagerAuth
    public R add(WaveDetl waveDetl) {
        waveDetlService.insert(waveDetl);
        return R.ok();
    }

    @RequestMapping(value = "/waveDetl/update/auth")
    @ManagerAuth
    public R update(WaveDetl waveDetl){
        if (Cools.isEmpty(waveDetl) || null==waveDetl.getId()){
            return R.error();
        }
        waveDetlService.updateById(waveDetl);
        return R.ok();
    }

    @RequestMapping(value = "/waveDetl/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            waveDetlService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/waveDetl/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<WaveDetl> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("waveDetl"));
        convert(map, wrapper);
        List<WaveDetl> list = waveDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/waveDetlQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<WaveDetl> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<WaveDetl> page = waveDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (WaveDetl waveDetl : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", waveDetl.getId());
            map.put("value", waveDetl.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/waveDetl/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<WaveDetl> wrapper = new EntityWrapper<WaveDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != waveDetlService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(WaveDetl.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

 src/main/java/zy/cloud/wms/manager/entity/Wave.java

New file
@@ -0,0 +1,251 @@
package zy.cloud.wms.manager.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;

import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("man_wave")
public class Wave implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id",type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value= "")
    @TableField("host_id")
    private Long hostId;

    /**
     * 编号
     */
    @ApiModelProperty(value= "编号")
    private String uuid;

    /**
     * 波次号
     */
    @ApiModelProperty(value= "波次号")
    @TableField("wave_no")
    private String waveNo;

    /**
     * 订单数量
     */
    @ApiModelProperty(value= "订单数量")
    @TableField("ordersQty")
    private Integer ordersQty;

    /**
     * 审核状态 0: 待处理  1: 处理中  2: 已完成  
     */
    @ApiModelProperty(value= "审核状态 0: 待处理  1: 处理中  2: 已完成  ")
    private Short status;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    @TableField("create_by")
    private Long createBy;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("update_by")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    public Wave() {}

    public Wave(Long hostId,String uuid,String waveNo,Integer ordersQty,Short status,String memo,Long createBy,Date createTime,Long updateBy,Date updateTime) {
        this.hostId = hostId;
        this.uuid = uuid;
        this.waveNo = waveNo;
        this.ordersQty = ordersQty;
        this.status = status;
        this.memo = memo;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
    }

//    Wave wave = new Wave(
//            null,    // 
//            null,    // 编号[非空]
//            null,    // 波次号
//            null,    // 订单数量
//            null,    // 审核状态
//            null,    // 备注
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 修改人员
//            null    // 修改时间
//    );

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getHostId() {
        return hostId;
    }

    public void setHostId(Long hostId) {
        this.hostId = hostId;
    }

    public String getUuid() {
        return uuid;
    }

    public void setUuid(String uuid) {
        this.uuid = uuid;
    }

    public String getWaveNo() {
        return waveNo;
    }

    public void setWaveNo(String waveNo) {
        this.waveNo = waveNo;
    }

    public Integer getOrdersQty() {
        return ordersQty;
    }

    public void setOrdersQty(Integer ordersQty) {
        this.ordersQty = ordersQty;
    }

    public Short getStatus() {
        return status;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "待处理";
            case 1:
                return "处理中";
            case 2:
                return "已完成";
            default:
                return String.valueOf(this.status);
        }
    }

    public void setStatus(Short status) {
        this.status = status;
    }

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }

    public Long getCreateBy() {
        return createBy;
    }

    public void setCreateBy(Long createBy) {
        this.createBy = createBy;
    }

    public Date getCreateTime() {
        return createTime;
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public Long getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(Long updateBy) {
        this.updateBy = updateBy;
    }

    public Date getUpdateTime() {
        return updateTime;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }


}

 src/main/java/zy/cloud/wms/manager/entity/WaveDetl.java

New file
@@ -0,0 +1,432 @@
package zy.cloud.wms.manager.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;

import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("man_wave_detl")
public class WaveDetl implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id",type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value= "")
    @TableField("host_id")
    private Long hostId;

    @ApiModelProperty(value= "")
    @TableField("wave_id")
    private Long waveId;

    /**
     * 波次号
     */
    @ApiModelProperty(value= "波次号")
    @TableField("wave_no")
    private String waveNo;

    /**
     * 行号
     */
    @ApiModelProperty(value= "行号")
    @TableField("seq_no")
    private Integer seqNo;

    /**
     * 订单数量
     */
    @ApiModelProperty(value= "订单数量")
    @TableField("order_qty")
    private Integer orderQty;

    /**
     * 订单集合
     */
    @ApiModelProperty(value= "订单集合")
    @TableField("orderNos")
    private String orderNos;

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

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

    /**
     * 商品名称
     */
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    /**
     * 规格
     */
    @ApiModelProperty(value= "规格")
    private String specs;

    /**
     * 型号
     */
    @ApiModelProperty(value= "型号")
    private String model;

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

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")
    private String unit;

    /**
     * 生产日期
     */
    @ApiModelProperty(value= "生产日期")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @TableField("prodDate")
    private Date prodDate;

    /**
     * 状态 0: 待处理  1: 处理中  2: 已完成  
     */
    @ApiModelProperty(value= "状态 0: 待处理  1: 处理中  2: 已完成  ")
    private Integer status;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    @TableField("create_by")
    private Long createBy;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("update_by")
    private Long updateBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("update_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    public WaveDetl() {}

    public WaveDetl(Long hostId,Long waveId,String waveNo,Integer seqNo,Integer orderQty,String orderNos,Double anfme,String matnr,String maktx,String specs,String model,String batch,String unit,Date prodDate,Integer status,String memo,Long createBy,Date createTime,Long updateBy,Date updateTime) {
        this.hostId = hostId;
        this.waveId = waveId;
        this.waveNo = waveNo;
        this.seqNo = seqNo;
        this.orderQty = orderQty;
        this.orderNos = orderNos;
        this.anfme = anfme;
        this.matnr = matnr;
        this.maktx = maktx;
        this.specs = specs;
        this.model = model;
        this.batch = batch;
        this.unit = unit;
        this.prodDate = prodDate;
        this.status = status;
        this.memo = memo;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
    }

//    WaveDetl waveDetl = new WaveDetl(
//            null,    // 
//            null,    // 
//            null,    // 波次号
//            null,    // 行号
//            null,    // 订单数量
//            null,    // 订单集合
//            null,    // 数量
//            null,    // 商品编码
//            null,    // 商品名称
//            null,    // 规格
//            null,    // 型号
//            null,    // 批号
//            null,    // 单位
//            null,    // 生产日期
//            null,    // 状态
//            null,    // 备注
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 修改人员
//            null    // 修改时间
//    );

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getHostId() {
        return hostId;
    }

    public void setHostId(Long hostId) {
        this.hostId = hostId;
    }

    public Long getWaveId() {
        return waveId;
    }

    public void setWaveId(Long waveId) {
        this.waveId = waveId;
    }

    public String getWaveNo() {
        return waveNo;
    }

    public void setWaveNo(String waveNo) {
        this.waveNo = waveNo;
    }

    public Integer getSeqNo() {
        return seqNo;
    }

    public void setSeqNo(Integer seqNo) {
        this.seqNo = seqNo;
    }

    public Integer getOrderQty() {
        return orderQty;
    }

    public void setOrderQty(Integer orderQty) {
        this.orderQty = orderQty;
    }

    public String getOrderNos() {
        return orderNos;
    }

    public void setOrderNos(String orderNos) {
        this.orderNos = orderNos;
    }

    public Double getAnfme() {
        return anfme;
    }

    public void setAnfme(Double anfme) {
        this.anfme = anfme;
    }

    public String getMatnr() {
        return matnr;
    }

    public void setMatnr(String matnr) {
        this.matnr = matnr;
    }

    public String getMaktx() {
        return maktx;
    }

    public void setMaktx(String maktx) {
        this.maktx = maktx;
    }

    public String getSpecs() {
        return specs;
    }

    public void setSpecs(String specs) {
        this.specs = specs;
    }

    public String getModel() {
        return model;
    }

    public void setModel(String model) {
        this.model = model;
    }

    public String getBatch() {
        return batch;
    }

    public void setBatch(String batch) {
        this.batch = batch;
    }

    public String getUnit() {
        return unit;
    }

    public void setUnit(String unit) {
        this.unit = unit;
    }

    public Date getProdDate() {
        return prodDate;
    }

    public String getProdDate$(){
        if (Cools.isEmpty(this.prodDate)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.prodDate);
    }

    public void setProdDate(Date prodDate) {
        this.prodDate = prodDate;
    }

    public Integer getStatus() {
        return status;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "待处理";
            case 1:
                return "处理中";
            case 2:
                return "已完成";
            default:
                return String.valueOf(this.status);
        }
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }

    public Long getCreateBy() {
        return createBy;
    }

    public void setCreateBy(Long createBy) {
        this.createBy = createBy;
    }

    public Date getCreateTime() {
        return createTime;
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public Long getUpdateBy() {
        return updateBy;
    }

    public void setUpdateBy(Long updateBy) {
        this.updateBy = updateBy;
    }

    public Date getUpdateTime() {
        return updateTime;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }


}

 src/main/java/zy/cloud/wms/manager/mapper/OrderDetlMapper.java

@@ -4,6 +4,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.entity.OrderDetl;

import java.util.List;
@@ -14,4 +15,5 @@

    List<OrderDetl> selectByOrderNo(@Param("orderNo") String orderNo, @Param("hostId") Long hostId);

    List<OrderDetl> selectBatchByOrderNo(List<Order> orders);
}

 src/main/java/zy/cloud/wms/manager/mapper/WaveDetlMapper.java

New file
@@ -0,0 +1,12 @@
package zy.cloud.wms.manager.mapper;

import zy.cloud.wms.manager.entity.WaveDetl;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface WaveDetlMapper extends BaseMapper<WaveDetl> {

}

 src/main/java/zy/cloud/wms/manager/mapper/WaveMapper.java

New file
@@ -0,0 +1,12 @@
package zy.cloud.wms.manager.mapper;

import zy.cloud.wms.manager.entity.Wave;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface WaveMapper extends BaseMapper<Wave> {

}

 src/main/java/zy/cloud/wms/manager/service/OrderDetlService.java

@@ -1,6 +1,7 @@
package zy.cloud.wms.manager.service;

import com.baomidou.mybatisplus.service.IService;
import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.entity.OrderDetl;

import java.util.List;
@@ -9,4 +10,5 @@

    List<OrderDetl> selectByOrderNo(String orderNo, Long hostId);

    List<OrderDetl> selectBatchByOrderNo(List<Order> orders);
}

 src/main/java/zy/cloud/wms/manager/service/WaveDetlService.java

New file
@@ -0,0 +1,8 @@
package zy.cloud.wms.manager.service;

import zy.cloud.wms.manager.entity.WaveDetl;
import com.baomidou.mybatisplus.service.IService;

public interface WaveDetlService extends IService<WaveDetl> {

}

 src/main/java/zy/cloud/wms/manager/service/WaveService.java

New file
@@ -0,0 +1,8 @@
package zy.cloud.wms.manager.service;

import zy.cloud.wms.manager.entity.Wave;
import com.baomidou.mybatisplus.service.IService;

public interface WaveService extends IService<Wave> {

}

 src/main/java/zy/cloud/wms/manager/service/impl/OrderDetlServiceImpl.java

@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.service.impl;

import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.mapper.OrderDetlMapper;
import zy.cloud.wms.manager.entity.OrderDetl;
import zy.cloud.wms.manager.service.OrderDetlService;
@@ -15,4 +16,9 @@
    public List<OrderDetl> selectByOrderNo(String orderNo, Long hostId) {
        return this.baseMapper.selectByOrderNo(orderNo, hostId);
    }

    @Override
    public List<OrderDetl> selectBatchByOrderNo(List<Order> orders) {
        return this.baseMapper.selectBatchByOrderNo(orders);
    }
}

 src/main/java/zy/cloud/wms/manager/service/impl/WaveDetlServiceImpl.java

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

import zy.cloud.wms.manager.mapper.WaveDetlMapper;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.service.WaveDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waveDetlService")
public class WaveDetlServiceImpl extends ServiceImpl<WaveDetlMapper, WaveDetl> implements WaveDetlService {

}

 src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java

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

import zy.cloud.wms.manager.mapper.WaveMapper;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.service.WaveService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("waveService")
public class WaveServiceImpl extends ServiceImpl<WaveMapper, Wave> implements WaveService {

}

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -28,8 +28,8 @@
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />

    </resultMap>


    <select id="selectByOrderNo" resultMap="BaseResultMap">
        select
@@ -40,5 +40,11 @@
        and mo.order_no = #{orderNo}
        and mo.host_id = #{hostId}
    </select>
    <select id="selectBatchByOrderNo" resultMap="BaseResultMap">
        SELECT * FROM man_order_detl WHERE 1 = 1 AND
        <foreach collection="list" index="index" item="orders" open="(" close=")" separator="or">
            order_no = #{orders.orderNo}
        </foreach>
    </select>

</mapper>

 src/main/resources/mapper/WaveDetlMapper.xml

New file
@@ -0,0 +1,31 @@
<?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="zy.cloud.wms.manager.mapper.WaveDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.WaveDetl">
        <id column="id" property="id" />
        <result column="host_id" property="hostId" />
        <result column="wave_id" property="waveId" />
        <result column="wave_no" property="waveNo" />
        <result column="seq_no" property="seqNo" />
        <result column="order_qty" property="orderQty" />
        <result column="orderNos" property="orderNos" />
        <result column="anfme" property="anfme" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="batch" property="batch" />
        <result column="unit" property="unit" />
        <result column="prodDate" property="prodDate" />
        <result column="status" property="status" />
        <result column="memo" property="memo" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />

    </resultMap>

</mapper>

 src/main/resources/mapper/WaveMapper.xml

New file
@@ -0,0 +1,21 @@
<?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="zy.cloud.wms.manager.mapper.WaveMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.Wave">
        <id column="id" property="id" />
        <result column="host_id" property="hostId" />
        <result column="uuid" property="uuid" />
        <result column="wave_no" property="waveNo" />
        <result column="ordersQty" property="ordersQty" />
        <result column="status" property="status" />
        <result column="memo" property="memo" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />

    </resultMap>

</mapper>

 src/main/webapp/static/js/order/order.js

@@ -248,6 +248,13 @@
                return d.id;
            });
            doDelOrder({ids: ids});
        }else if (obj.event === 'wave'){
            var checkRows = table.checkStatus('orderTable');
            if (checkRows.data.length === 0) {
                layer.msg('请选择要生成波次的数据', {icon: 2});
                return;
            }
            doWaveOrder(checkRows);
        }
    });

@@ -424,6 +431,36 @@

        });
    }
    /* 生成波次 */
    function doWaveOrder(obj) {
        console.log(obj.data);
        layer.confirm('确定要生成波次?', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/orders/wave/auth",
                headers: {'token': localStorage.getItem('token')},
                data: JSON.stringify(obj.data),
                contentType: 'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        $(".layui-laypage-btn")[0].click();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })

        });
    }

    // 生成拣货单
    function stockOut(orderNo) {

 src/main/webapp/static/js/wave/wave.js

New file
@@ -0,0 +1,257 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#wave',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/wave/list/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'hostId', align: 'center',title: ''}
            ,{field: 'uuid', align: 'center',title: '编号'}
            ,{field: 'waveNo', align: 'center',title: '波次号'}
            ,{field: 'ordersQty', align: 'center',title: '订单数量'}
            ,{field: 'status$', align: 'center',title: '审核状态'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'createBy', align: 'center',title: '添加人员'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateBy', align: 'center',title: '修改人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(wave)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(wave)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.id;
               });
               del(ids);
               break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'wave': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/wave/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(wave)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                var ids = [data.id];
                del(ids);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender();
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/wave/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/wave/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#createTime\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#updateTime\\$',
        type: 'datetime'
    });

    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/static/js/waveDetl/waveDetl.js

New file
@@ -0,0 +1,271 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#waveDetl',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/waveDetl/list/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'hostId', align: 'center',title: ''}
            ,{field: 'waveId', align: 'center',title: ''}
            ,{field: 'waveNo', align: 'center',title: '波次号'}
            ,{field: 'seqNo', align: 'center',title: '行号'}
            ,{field: 'orderQty', align: 'center',title: '订单数量'}
            ,{field: 'orderNos', align: 'center',title: '订单集合'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'model', align: 'center',title: '型号'}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'prodDate$', align: 'center',title: '生产日期'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'createBy', align: 'center',title: '添加人员'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateBy', align: 'center',title: '修改人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(waveDetl)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(waveDetl)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.id;
               });
               del(ids);
               break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'waveDetl': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/waveDetl/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(waveDetl)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                var ids = [data.id];
                del(ids);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender();
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/waveDetl/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/waveDetl/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#prodDate\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#createTime\\$',
        type: 'datetime'
    });
        layDate.render({
        elem: '#updateTime\\$',
        type: 'datetime'
    });

    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/views/order/order.html

@@ -204,6 +204,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon">&#xe654;</i>新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
        <button class="layui-btn layui-btn-sm layui-btn" id="btn-wave" lay-event="wave"><i class="layui-icon">&#xe60a;</i>生成波次计划</button>
    </div>
</script>


 src/main/webapp/views/wave/wave.html

New file
@@ -0,0 +1,135 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
</div>

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="wave" lay-filter="wave"></table>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wave/wave.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="hostId" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入编号" 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 class="layui-input" name="waveNo" placeholder="请输入波次号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">订单数量: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ordersQty" placeholder="请输入订单数量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">审核状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择审核状态</option>
                            <option value="0">待处理</option>
                            <option value="1">处理中</option>
                            <option value="2">已完成</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加人员: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createBy" placeholder="请输入添加人员">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateBy" placeholder="请输入修改人员">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>


 src/main/webapp/views/waveDetl/waveDetl.html

New file
@@ -0,0 +1,195 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
</head>
<body>

<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
</div>

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="waveDetl" lay-filter="waveDetl"></table>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/waveDetl/waveDetl.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="hostId" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="waveId" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">波次号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="waveNo" placeholder="请输入波次号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">行号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="seqNo" placeholder="请输入行号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">订单数量: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="orderQty" placeholder="请输入订单数量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">订单集合: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="orderNos" placeholder="请输入订单集合">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">数量: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="anfme" placeholder="请输入数量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品编码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编码">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品名称: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="maktx" placeholder="请输入商品名称">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">规格: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="specs" placeholder="请输入规格">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">型号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="model" placeholder="请输入型号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">批号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="batch" placeholder="请输入批号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">单位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="unit" placeholder="请输入单位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">生产日期: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="prodDate" id="prodDate$" placeholder="请输入生产日期">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="0">待处理</option>
                            <option value="1">处理中</option>
                            <option value="2">已完成</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加人员: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createBy" placeholder="请输入添加人员">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateBy" placeholder="请输入修改人员">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>