From 727ca8cec69ad6305f78ad1b432f01fd2601d925 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 18 三月 2022 12:53:41 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/service/impl/WaveDetlServiceImpl.java  |   12 
 src/main/java/zy/cloud/wms/manager/entity/WaveDetl.java                   |  432 ++++++++++++
 src/main/webapp/static/js/wave/wave.js                                    |  257 +++++++
 src/main/resources/mapper/WaveMapper.xml                                  |   21 
 src/main/java/zy/cloud/wms/common/CodeBuilder.java                        |    2 
 src/main/java/zy/cloud/wms/manager/mapper/WaveMapper.java                 |   12 
 src/main/java/zy/cloud/wms/manager/service/impl/OrderDetlServiceImpl.java |    6 
 src/main/webapp/views/order/order.html                                    |    1 
 src/main/java/zy/cloud/wms/manager/service/OrderDetlService.java          |    2 
 src/main/java/zy/cloud/wms/manager/controller/WaveController.java         |  123 +++
 src/main/java/zy/cloud/wms/manager/mapper/WaveDetlMapper.java             |   12 
 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java  |    3 
 src/main/resources/mapper/WaveDetlMapper.xml                              |   31 
 src/main/java/waveDetl.sql                                                |   18 
 src/main/java/zy/cloud/wms/manager/service/WaveService.java               |    8 
 src/main/java/zy/cloud/wms/manager/controller/OrderController.java        |   87 ++
 src/main/webapp/static/js/waveDetl/waveDetl.js                            |  271 +++++++
 src/main/java/zy/cloud/wms/manager/entity/Wave.java                       |  251 +++++++
 src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java      |   12 
 src/main/java/zy/cloud/wms/manager/service/WaveDetlService.java           |    8 
 src/main/java/zy/cloud/wms/manager/mapper/OrderDetlMapper.java            |    2 
 src/main/resources/mapper/OrderDetlMapper.xml                             |    8 
 src/main/java/zy/cloud/wms/manager/controller/WaveDetlController.java     |  123 +++
 src/main/webapp/views/waveDetl/waveDetl.html                              |  195 +++++
 src/main/webapp/static/js/order/order.js                                  |   37 +
 src/main/webapp/views/wave/wave.html                                      |  135 +++
 src/main/java/wave.sql                                                    |   18 
 27 files changed, 2,078 insertions(+), 9 deletions(-)

diff --git a/src/main/java/wave.sql b/src/main/java/wave.sql
new file mode 100644
index 0000000..dc13198
--- /dev/null
+++ b/src/main/java/wave.sql
@@ -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');
diff --git a/src/main/java/waveDetl.sql b/src/main/java/waveDetl.sql
new file mode 100644
index 0000000..08e5578
--- /dev/null
+++ b/src/main/java/waveDetl.sql
@@ -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');
diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
index 019a954..0544f03 100644
--- a/src/main/java/zy/cloud/wms/common/CodeBuilder.java
+++ b/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;
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
index 51f26e5..65907ce 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/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;
+    }
+
 }
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index 89685a7..f3000b3 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/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("鎾ゅ洖鎴愬姛");
     }
 
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
new file mode 100644
index 0000000..f3eba6a
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -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();
+    }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WaveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/WaveDetlController.java
new file mode 100644
index 0000000..13e9e7e
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveDetlController.java
@@ -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();
+    }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Wave.java b/src/main/java/zy/cloud/wms/manager/entity/Wave.java
new file mode 100644
index 0000000..ca40b15
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/Wave.java
@@ -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;
+    }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/WaveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/WaveDetl.java
new file mode 100644
index 0000000..6e44e3b
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/WaveDetl.java
@@ -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;
+    }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/OrderDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/OrderDetlMapper.java
index b5889cb..fca279e 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/OrderDetlMapper.java
+++ b/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);
 }
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/WaveDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/WaveDetlMapper.java
new file mode 100644
index 0000000..e58134a
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/WaveDetlMapper.java
@@ -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> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/WaveMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/WaveMapper.java
new file mode 100644
index 0000000..1fe2c58
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/WaveMapper.java
@@ -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> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/OrderDetlService.java b/src/main/java/zy/cloud/wms/manager/service/OrderDetlService.java
index 9a963d0..9bfd20d 100644
--- a/src/main/java/zy/cloud/wms/manager/service/OrderDetlService.java
+++ b/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);
 }
diff --git a/src/main/java/zy/cloud/wms/manager/service/WaveDetlService.java b/src/main/java/zy/cloud/wms/manager/service/WaveDetlService.java
new file mode 100644
index 0000000..4fe978e
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/WaveDetlService.java
@@ -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> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WaveService.java b/src/main/java/zy/cloud/wms/manager/service/WaveService.java
new file mode 100644
index 0000000..952f012
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/WaveService.java
@@ -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> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/OrderDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/OrderDetlServiceImpl.java
index bc4647c..0cc0c47 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/OrderDetlServiceImpl.java
+++ b/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);
+    }
 }
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WaveDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WaveDetlServiceImpl.java
new file mode 100644
index 0000000..4a50b83
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WaveDetlServiceImpl.java
@@ -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 {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java
new file mode 100644
index 0000000..724cbb7
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java
@@ -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 {
+
+}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index bc27af6..088fc8a 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/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>
diff --git a/src/main/resources/mapper/WaveDetlMapper.xml b/src/main/resources/mapper/WaveDetlMapper.xml
new file mode 100644
index 0000000..e046272
--- /dev/null
+++ b/src/main/resources/mapper/WaveDetlMapper.xml
@@ -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>
diff --git a/src/main/resources/mapper/WaveMapper.xml b/src/main/resources/mapper/WaveMapper.xml
new file mode 100644
index 0000000..ae7f588
--- /dev/null
+++ b/src/main/resources/mapper/WaveMapper.xml
@@ -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>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index cb499c9..67732d5 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/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) {
diff --git a/src/main/webapp/static/js/wave/wave.js b/src/main/webapp/static/js/wave/wave.js
new file mode 100644
index 0000000..0f4d265
--- /dev/null
+++ b/src/main/webapp/static/js/wave/wave.js
@@ -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}
+     });
+}
diff --git a/src/main/webapp/static/js/waveDetl/waveDetl.js b/src/main/webapp/static/js/waveDetl/waveDetl.js
new file mode 100644
index 0000000..ce92fcc
--- /dev/null
+++ b/src/main/webapp/static/js/waveDetl/waveDetl.js
@@ -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}
+     });
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index b2c17b1..3996f2d 100644
--- a/src/main/webapp/views/order/order.html
+++ b/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>
 
diff --git a/src/main/webapp/views/wave/wave.html b/src/main/webapp/views/wave/wave.html
new file mode 100644
index 0000000..4e8877f
--- /dev/null
+++ b/src/main/webapp/views/wave/wave.html
@@ -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>
+
diff --git a/src/main/webapp/views/waveDetl/waveDetl.html b/src/main/webapp/views/waveDetl/waveDetl.html
new file mode 100644
index 0000000..0ac0c9c
--- /dev/null
+++ b/src/main/webapp/views/waveDetl/waveDetl.html
@@ -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>
+

--
Gitblit v1.9.1