Merge remote-tracking branch 'origin/develop' into develop

xqs
2 parents 3b0ad2e2 7b149a9a
Showing 33 changed files with 244 additions and 140 deletions
.idea/workspace.xml
src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
src/main/java/com/huaheng/pc/config/wave/controller/WaveController.java → src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java
src/main/java/com/huaheng/pc/config/wave/domain/Wave.java → src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java
src/main/java/com/huaheng/pc/config/wave/mapper/WaveMapper.java → src/main/java/com/huaheng/pc/shipment/wave/mapper/WaveMapper.java
src/main/java/com/huaheng/pc/config/wave/service/WaveService.java → src/main/java/com/huaheng/pc/shipment/wave/service/WaveService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/mybatis/inventory/InventoryDetailMapper.xml
src/main/resources/mybatis/config/WaveMapper.xml → src/main/resources/mybatis/shipment/WaveMapper.xml
src/main/resources/templates/check/checkDetail/checkDetail.html
src/main/resources/templates/config/waveFlowHeader/add.html
@@ -2,18 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkingRegister/checkingRegister.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -53,7 +52,7 @@
         <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
         <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
         <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
-        <item name="task_detail: table" type="285a2a93:MysqlImplModel$Table" />
+        <item name="receipt_header: table" type="285a2a93:MysqlImplModel$Table" />
       </path>
       <path>
         <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
@@ -92,8 +91,8 @@
       <list>
         <option value="Interface" />
         <option value="Class" />
-        <option value="HTML File" />
         <option value="Enum" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -101,6 +100,9 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
+  <component name="ProjectLevelVcsManager">
+    <OptionsSetting value="false" id="Update" />
+  </component>
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="RequestMappingsPanelOrder0" value="0" />
@@ -220,7 +222,9 @@
       <workItem from="1568094783772" duration="3618000" />
       <workItem from="1568102171954" duration="179000" />
       <workItem from="1568102802104" duration="132000" />
-      <workItem from="1568108585629" duration="1883000" />
+      <workItem from="1568108585629" duration="2016000" />
+      <workItem from="1568162278389" duration="3299000" />
+      <workItem from="1568170378983" duration="10947000" />
     </task>
     <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
       <created>1567664306836</created>
@@ -243,7 +247,28 @@
       <option name="project" value="LOCAL" />
       <updated>1568025230030</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="修改质检页面、添加完成质检">
+      <created>1568110494128</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1568110494128</updated>
+    </task>
+    <task id="LOCAL-00005" summary="修复入库质检请求地址冲突">
+      <created>1568162392627</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1568162392627</updated>
+    </task>
+    <task id="LOCAL-00006" summary="添加入库单打印">
+      <created>1568174134623</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1568174134623</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -265,7 +290,9 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
     <MESSAGE value="修改质检页面、添加完成质检" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改质检页面、添加完成质检" />
+    <MESSAGE value="修复入库质检请求地址冲突" />
+    <MESSAGE value="添加入库单打印" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加入库单打印" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -285,6 +312,16 @@
           <line>45</line>
           <option name="timeStamp" value="9" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
+          <line>144</line>
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java</url>
+          <line>240</line>
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -15,12 +15,13 @@ import java.util.Map;
 public class FilterConfigDetailService extends ServiceImpl<FilterConfigDetailMapper, FilterConfigDetail> {
  
     /**
-     * 查询定位自定义sql，供前端页面选择使用
+     * 查询入库定位自定义sql，供前端页面选择使用
      * @return
      */
     public List<Map<String, Object>> queryFilterConfigDetail(){
         LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.select(FilterConfigDetail::getCode, FilterConfigDetail::getDescription)
+                .eq(FilterConfigDetail::getModuleType,"入库")
                 .eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambdaQueryWrapper);
     }
@@ -3,10 +3,13 @@ package com.huaheng.pc.inventory.inventoryDetail.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  
+import java.math.BigDecimal;
 import java.util.List;
  
 public interface InventoryDetailMapper extends BaseMapper<InventoryDetail> {
  
     List<InventoryDetail> selectBysql(String sql);
  
+    BigDecimal getSumQty(InventoryDetail inventoryDetail);
+
 }
 \ No newline at end of file
@@ -6,6 +6,7 @@ import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
  
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.util.List;
  
 public interface InventoryDetailService extends IService<InventoryDetail> {
@@ -18,6 +19,9 @@ public interface InventoryDetailService extends IService&lt;InventoryDetail&gt; {
  
     AjaxResult detailCheckTask (Integer[] ids) throws InvocationTargetException, IllegalAccessException;
  
+    //求一种物料的库存之和
+    BigDecimal getSumQty(InventoryDetail inventoryDetail);
+
 }
  
  
@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
  
@@ -233,6 +234,11 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
     }
  
  
+    @Override
+    public BigDecimal getSumQty(InventoryDetail inventoryDetail) {
+        return inventoryDetailMapper.getSumQty(inventoryDetail);
+    }
+
 }
  
  
@@ -184,6 +184,13 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         if (StringUtils.isEmpty(containerCode))
             throw new ServiceException("容器不能为空");
  
+        LambdaQueryWrapper<Container> lambda = Wrappers.lambdaQuery();
+        lambda.eq(Container::getCode, containerCode);
+        Container container = containerService.getOne(lambda);
+        if (container == null){
+            throw new ServiceException("该容器编号不存在");
+        }
+
         //检查该容器编码是否已存任务
         LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode)
@@ -82,7 +82,8 @@ public class ReceiptHeaderController extends BaseController {
                 .eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
                         ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
                 .eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
-                        ReceiptHeader::getLastStatus, receiptHeader.getLastStatus());
+                        ReceiptHeader::getLastStatus, receiptHeader.getLastStatus())
+                .orderByDesc(ReceiptHeader::getCreated);
  
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
             /**
@@ -249,8 +250,7 @@ public class ReceiptHeaderController extends BaseController {
     @ApiOperation(value="打印入库单报表", notes="打印入库单报表", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptHeader:check")
     @Log(title = "入库-入库单",operating = "打印入库单报表", action = BusinessType.OTHER)
-    @PostMapping("/report/{id}")
-    @ResponseBody
+    @GetMapping("/report/{id}")
     public String report(@ApiParam(name = "id", value = "入库头表id")
                                          @PathVariable("id") Integer id, ModelMap mmap){
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
@@ -80,7 +80,7 @@ public class ReceivingService {
     public Boolean position(ReceiptContainerDetail receiptContainerDetail){
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
  
-        //如果入库组盘表中有目标库位说名已经指定
+        //如果入库组盘表中有目标库位说明已经指定
         if (StringUtils.isNotEmpty(receiptContainerHeader.getToLocation())){return true;}
         String locatingRule = receiptContainerHeader.getLocatingRule(); //定位规则
         if (StringUtils.isNotEmpty(locatingRule)){
@@ -254,14 +254,14 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         }
  
         //
-        if(shipmentContainerHeader.getStatus()<=10){
+        if(shipmentContainerHeader.getStatus()>=10 && shipmentContainerHeader.getStatus()<30){
             LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper=Wrappers.lambdaQuery();
             taskHeaderLambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,shipmentContainerHeader.getWarehouseCode())
                     .eq(TaskHeader::getInternalTaskType,200)
                     .eq(TaskHeader::getAllocationHeadId,shipmentContainerHeader.getId());
             TaskHeader taskHeader=taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
             if(taskHeader==null){
-                throw new ServiceException("找不到相应的任务头");
+                throw new ServiceException("有相同的组盘头，但找不到相应的任务头");
             }
             TaskDetail taskDetail = new TaskDetail();
             taskDetail.setTaskId(taskHeader.getId());
@@ -13,6 +13,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,8 +39,11 @@ public class ShipmentDetailController extends BaseController
  
 	@Autowired
 	private ShipmentDetailService shipmentDetailService;
+	@Autowired
+	private InventoryDetailService inventoryDetailService;
+
+
  
-	
 	@RequiresPermissions("shipment:bill:view")
     @GetMapping("/{shipmentId}/{shipmentCode}")
 	public String shipmentDetail(@PathVariable("shipmentId") String shipmentId, @PathVariable("shipmentCode") String shipmentCode,@PathVariable("inventoryStatus") String inventoryStatus, ModelMap mmap)
@@ -79,6 +84,12 @@ public class ShipmentDetailController extends BaseController
 			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
 		} else {
 			List<ShipmentDetail> list = shipmentDetailService.list(lambdaQueryWrapper);
+			list.forEach(t->{
+				InventoryDetail inventory=new InventoryDetail();
+				inventory.setWarehouseCode(t.getWarehouseCode());
+				inventory.setMaterialCode(t.getMaterialCode());
+				t.setInventoryQty(inventoryDetailService.getSumQty(inventory));
+			});
 			return getDataTable(list);
 		}
 	}
@@ -41,6 +41,10 @@ public class ShipmentDetail implements Serializable {
     @ApiModelProperty(value="货主")
     private String companyCode;
  
+
+    @TableField(exist = false)
+    private BigDecimal inventoryQty;
+
     /**
      * 出库单号
      */
@@ -1091,4 +1095,13 @@ public class ShipmentDetail implements Serializable {
     public void setProcessStamp(String processStamp) {
         this.processStamp = processStamp;
     }
+
+
+    public BigDecimal getInventoryQty() {
+        return inventoryQty;
+    }
+
+    public void setInventoryQty(BigDecimal inventoryQty) {
+        this.inventoryQty = inventoryQty;
+    }
 }
 \ No newline at end of file
-package com.huaheng.pc.config.wave.controller;
+package com.huaheng.pc.shipment.wave.controller;
  
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,11 +15,9 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
-import com.huaheng.pc.config.wave.domain.Wave;
-import com.huaheng.pc.config.wave.service.WaveService;
+import com.huaheng.pc.shipment.wave.domain.Wave;
+import com.huaheng.pc.shipment.wave.service.WaveService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -38,15 +36,15 @@ import java.util.List;
  
 @Api(tags={"波次"})
 @Controller
-@RequestMapping("/config/wave")
+@RequestMapping("/shipment/wave")
 public class WaveController extends BaseController {
  
-    private String prefix = "config/wave";
+    private String prefix = "shipment/wave";
  
     @Autowired
     private WaveService waveService;
  
-    @RequiresPermissions("config:wave:view")
+    @RequiresPermissions("shipment:wave:view")
     @GetMapping()
     public String wave() {
         return prefix + "/wave";
@@ -55,7 +53,7 @@ public class WaveController extends BaseController {
     /**
      * 查询波次
      */
-    @RequiresPermissions("config:wave:list")
+    @RequiresPermissions("shipment:wave:list")
     @Log(title = "出库-波次", operating="查看波次", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -99,8 +97,8 @@ public class WaveController extends BaseController {
     /**
      * 新增波次
      */
-    @RequiresPermissions("config:wave:add")
-    @Log(title = "配置-波次", operating = "新增波次", action = BusinessType.INSERT)
+    @RequiresPermissions("shipment:wave:add")
+    @Log(title = "出库-波次", operating = "新增波次", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(Wave wave){
@@ -122,8 +120,8 @@ public class WaveController extends BaseController {
     /**
      * 修改波次
      */
-    @RequiresPermissions("config:wave:edit")
-    @Log(title = "通用-波次", operating = "修改波次", action = BusinessType.UPDATE)
+    @RequiresPermissions("shipment:wave:edit")
+    @Log(title = "出库-波次", operating = "修改波次", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult editSave(Wave wave) {
@@ -134,8 +132,8 @@ public class WaveController extends BaseController {
     /**
      * 删除波次
      */
-    @RequiresPermissions("config:wave:remove")
-    @Log(title = "配置-波次", operating = "删除波次", action = BusinessType.DELETE)
+    @RequiresPermissions("shipment:wave:remove")
+    @Log(title = "出库-波次", operating = "删除波次", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-package com.huaheng.pc.config.wave.domain;
+package com.huaheng.pc.shipment.wave.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-package com.huaheng.pc.config.wave.mapper;
+package com.huaheng.pc.shipment.wave.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.config.wave.domain.Wave;
+import com.huaheng.pc.shipment.wave.domain.Wave;
  
 public interface WaveMapper extends BaseMapper<Wave> {
 }
 \ No newline at end of file
-package com.huaheng.pc.config.wave.service;
+package com.huaheng.pc.shipment.wave.service;
  
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.config.wave.domain.Wave;
-import com.huaheng.pc.config.wave.mapper.WaveMapper;
+import com.huaheng.pc.shipment.wave.domain.Wave;
+import com.huaheng.pc.shipment.wave.mapper.WaveMapper;
 import org.springframework.stereotype.Service;
  
 @Service
@@ -555,18 +555,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 Location location = new Location();
                 location.setContainerCode(task.getContainerCode());
                 location.setStatus("empty");
-                LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate(location);
+                LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
-                if (!locationService.update(locationLambdaUpdateWrapper))
+                if (!locationService.update(location,locationLambdaUpdateWrapper))
                     throw new ServiceException("更新库位失败");
  
                 //修改容器状态和对应的库位
                 Container container = new Container();
                 container.setLocationCode(task.getToLocation());
                 container.setStatus("some");
-                LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate(container);
+                LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 containerLambdaUpdateWrapper.eq(Container::getCode, task.getContainerCode());
-                if (!containerService.update(containerLambdaUpdateWrapper)){
+                if (!containerService.update(container, containerLambdaUpdateWrapper)){
                     throw new ServiceException("更新容器失败");
                 }
                //修改组盘表状态为20
@@ -580,33 +580,23 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
                     throw new ServiceException("更新组盘状态失败");
  
-                if (task.getInternalTaskType()==100){
-                    //修改入库明细
-                    ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
-                    if (!receiptDetailService.updateById(receiptDetail)){
-                        throw new ServiceException("更新状态失败");
-                    }
-                    receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
-                }
-
-                //修改出库单明细
-//                if (task.getInternalTaskType()==200){
-////                    LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
-////                    taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
-////                    List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
-//
-////                for (TaskDetail taskDeatails: taskDetailList) {
-////                    LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
-////                    shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
-////
-////                    ShipmentHeader shipmentHeader =new ShipmentHeader();
-////                    shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
-////                    shipmentHeader.setFirstStatus(100);
-////                    shipmentHeader.setLastStatus(100);
-////                    shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
-////                    shipmentHeader.setLastUpdated(new Date());
-////                    shipmentHeaderService.updateById(shipmentHeader);
-////                }
+                //修改入库单状态
+                ReceiptHeader receiptHeader = new ReceiptHeader();
+                receiptHeader.setFirstStatus(300);
+                receiptHeader.setLastStatus(300);
+                receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+                receiptHeader.setLastUpdated(new Date());
+                LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId,DataUtils.getInteger(map.get("receiptId")));
+                if (! receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper))
+                    throw new ServiceException("更新入库状态失败");
+//                if (task.getInternalTaskType()==100){
+//                    //修改入库明细
+//                    ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
+//                    if (!receiptDetailService.updateById(receiptDetail)){
+//                        throw new ServiceException("更新状态失败");
+//                    }
+//                    receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
 //                }
  
  
@@ -59,4 +59,9 @@
   <select id="selectBysql"  parameterType="String" resultType="com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail">
         ${value}
     </select>
+
+
+   <select id="getSumQty" resultType="java.math.BigDecimal">
+      SELECT ifnull(sum(qty),0) qty from inventory_detail where materialCode=#{materialCode} and warehouseCode=#{warehouseCode}
+    </select>
 </mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.config.wave.mapper.WaveMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.wave.domain.Wave">
+<mapper namespace="com.huaheng.pc.shipment.wave.mapper.WaveMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.wave.domain.Wave">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
@@ -151,7 +151,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if (row.status == 10) {
+                        if (row.status == 0) {
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
                         }
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
@@ -4,7 +4,7 @@
 <head th:include="include :: header"></head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-filterConfigHeader-add">
+    <form class="form-horizontal m" id="form-waveFlowHeader-add">
         <div class="form-group">
             <label class="col-sm-3 control-label">流程名称：</label>
             <div class="col-sm-8">
@@ -21,8 +21,8 @@
 </div>
 <div th:include="include::footer"></div>
 <script type="text/javascript">
-    var prefix = ctx + "config/filterConfigHeader";
-    $("#form-filterConfigHeader-add").validate({
+    var prefix = ctx + "config/waveFlowHeader";
+    $("#form-waveFlowHeader-add").validate({
         rules: {
             code: {
                 required: true,
@@ -30,7 +30,7 @@
         },
         submitHandler: function (form) {
             // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
-            var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
+            var tableValue = $.common.getTableValue("#form-waveFlowHeader-add");
             $.operate.save(prefix + "/add", tableValue);
         }
     });
@@ -87,18 +87,18 @@
                 <input id="locatingRule" name="locatingRule" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">标价：</label>
-            <div class="col-sm-8">
-                <input id="itemListPrice" name="itemListPrice" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">净价：</label>
-            <div class="col-sm-8">
-                <input id="itemNetPrice" name="itemNetPrice" class="form-control" type="text">
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">标价：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="itemListPrice" name="itemListPrice" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">净价：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="itemNetPrice" name="itemNetPrice" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <!--<div class="form-group">-->
         <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
         <!--<div class="col-sm-8">-->
@@ -139,6 +139,10 @@
             materialCode:{
                 required:true
             },
+            totalQty:{
+                required:true,
+                number: true
+            }
         },
         submitHandler: function(form) {
             var tableValue = $("#form-receiptDetail-add").serialize();
@@ -37,7 +37,7 @@
             <a class="btn btn-outline btn-success btn-rounded" onclick="add()" shiro:hasPermission="receipt:receiptDetail:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <a class="btn btn-outline btn-success btn-rounded" onclick="add()" shiro:hasPermission="receipt:receiptDetail:add">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="batchArrival()" shiro:hasPermission="receipt:receiptDetail:arrival">
                 <i class="fa fa-plus"></i> 到货
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="receipt:receiptDetail:remove">
@@ -55,6 +55,7 @@
     var editFlag = [[${@permission.hasPermi('receipt:receiptDetail:edit')}]];
     var removeFlag = [[${@permission.hasPermi('receipt:receiptDetail:remove')}]];
     var approvalFlag = [[${@permission.hasPermi('receipt:receiptHeader:approval')}]]
+    var arrivalFlag = [[${@permission.hasPermi('receipt:receiptDetail:arrival')}]]
     var prefix = ctx + "receipt/receiptDetail";
     var datas = [[${@dict.getType('isVirtualBom')}]];
     $(function() {
@@ -231,8 +232,8 @@
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
                         }
-                        if (row.processStamp >120 && row.processStamp < 200){
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="arrival(\'' + row.id + '\')"><i class="fa fa-edit"></i>到货</a> ');
+                        if (row.processStamp >120 && row.processStamp < 180){
+                            actions.push('<a class="btn btn-success btn-xs ' + arrivalFlag + '" href="#" onclick="arrival(\'' + row.id + '\')"><i class="fa fa-edit"></i>到货</a> ');
                         }
                         return actions.join('');
                     }
@@ -263,6 +264,17 @@
         var data = { "ids": id };
         $.operate.submit(url, "post", "json", data);
     }
+
+    function batchArrival() {
+        var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        var url = prefix+"/arrival";
+        var data = { "ids": rows.join() };
+        $.operate.submit(url, "post", "json", data);
+    }
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -57,6 +57,22 @@
                            shiro:hasPermission="receipt:receiptHeader:add">
                             <i class="fa fa-plus"></i> 新增
                         </a>
+                        <a class="btn btn-outline btn-default btn-rounded" onclick="$.operate.add()"
+                           shiro:hasPermission="receipt:receiptHeader:add">
+                            <i class="fa fa-space-shuttle"></i> 提交审核
+                        </a>
+                        <a class="btn btn-outline btn-primary btn-rounded" onclick="$.operate.add()"
+                           shiro:hasPermission="receipt:receiptDetail:approval">
+                            <i class="fa fa-plus"></i> 审核通过
+                        </a>
+                        <a class="btn btn-outline btn-warning btn-rounded" onclick="$.operate.add()"
+                           shiro:hasPermission="receipt:receiptDetail:approval">
+                            <i class="fa fa-reply"></i> 驳回
+                        </a>
+                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.add()"
+                           shiro:hasPermission="receipt:receiptDetail:approval">
+                            <i class="fa fa-plus"></i> 作废
+                        </a>
                         <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
                            shiro:hasPermission="receipt:receiptHeader:remove">
                             <i class="fa fa-trash-o"></i> 删除
@@ -145,7 +161,8 @@
             },
             {
                 field : 'scheduledArriveDate',
-                title : '预计到达日期'
+                title : '预计到达日期',
+                sortable:true
             },
             {
                 field : 'actualArriveDate',
@@ -269,13 +286,13 @@
                         actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
                     }
-                    if ((row.firstStatus >= 100 && row.firstStatus < 200) | (row.lastStatus >= 100 && row.firstStatus < 200)){
+                    if ((row.firstStatus >= 100 && row.firstStatus < 180) | (row.lastStatus >= 100 && row.firstStatus < 180)){
                         actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="arrival(\'' + row.id + '\')" ><i class="fa fa-edit"></i>入库预约</a> ');
                     }
                     if (row.firstStatus == 180 || row.lastStatus == 180) {
                         actions.push('<a class="btn btn-info btn-xs ' + checkFlag + '" href="#" onclick="check(\'' + row.id + '\')" ><i class="fa fa-edit"></i>入库质检</a> ');
                     }
-                    if (row.lastStatus <= 200){
+                    if ((row.lastStatus >= 100 && row.lastStatus <200) || (row.firstStatus>=100 && row.firstStatus<200)){
                         actions.push('<a class="btn btn-primary btn-xs to-receive" ' +addFlag+ ' onclick="Toreceiving(\''+ row.code + '\')"><i class="fa fa-cart-plus"></i>收货</a> ');
                     }
                     if (row.lastStatus >= 900){
@@ -16,7 +16,6 @@
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
                 <td colspan="7">
-                    <div style="width:40%; float:left;">供应商编码：<span th:text="${receiptHeader['supplierCode']}"></span></div>
                     <div style="width:50%; float:right; text-align:right">
                         <span>明细条数：<span th:text="${receiptHeader['totalLines']}"></span></span>
                         <span style="padding-left:20px;">明细总数：<span th:text="${receiptHeader['totalQty']}"></span></span>
@@ -40,8 +39,8 @@
                 <td th:text="${row.materialName}"></td>
                 <td th:text="${row.batch}"></td>
                 <td th:text="${row.lot}"></td>
-                <td th:text="${row.project}"></td>
-                <td th:text="${row.qty}"></td>
+                <td th:text="${row.projectNo}"></td>
+                <td th:text="${row.totalQty}"></td>
                 <td><img></img></td>
             </tr>
             </tbody>
@@ -71,23 +71,11 @@
                 <label class="col-sm-3 control-label">定位规则：</label>
                 <div class="col-sm-8">
                     <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail()}">
+                        <option value="">请选择</option>
                         <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">入库方式：</label>
-                <div class="col-sm-8">
-                    <div class="radio radio-info radio-inline" style="transform: scale(1.3, 1.3);">
-                        <input type="radio" id="taskType1" name="taskType" value="100" checked="checked" class="radio_select">
-                        <label for="taskType1">整盘入库</label>
-                    </div>
-                    <div class="radio radio-danger radio-inline " style="transform: scale(1.3, 1.3);">
-                        <input type="radio" id="taskType2" name="taskType" value="200">
-                        <label for="taskType2">补充入库</label>
-                    </div>
-                </div>
-            </div>
 			<div class="form-group">
 				<div class="form-control-static col-sm-offset-9">
 					<button type="submit" class="btn btn-primary">提交</button>
@@ -107,6 +95,13 @@
                 },
                 receiptContainerCode:{
                     required:true
+                },
+                qty:{
+                    required:true,
+                    number:true
+                },
+                containerCode:{
+                    required:true
                 }
 			},
 			submitHandler: function(form) {
@@ -121,7 +116,7 @@
                         "taskType": $("input[name='taskType']:checked").val(),
                         "locationCode": $("input[name='locationCode']").val(),
                         "qty": $("input[name='qty']").val(),
-                        "locatingRule":$("input[name='locatingRule']").val()
+                        "locatingRule":$("#locatingRule option:selected").val()
                     },
                     async : false,
                     error : function(request) {
@@ -131,7 +131,7 @@
                     required:false,
                     digits:true
                 },
-                qty:{
+				shipQty:{
                     required:true,
                     min:0
                 },
@@ -22,7 +22,7 @@
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">erp订单号：</label>
+				<label class="col-sm-3 control-label">上游订单号：</label>
 				<div class="col-sm-8">
 					<input id="referCode" name="referCode" class="form-control" type="text">
 				</div>
@@ -21,7 +21,7 @@
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">erp订单号：</label>
+                <label class="col-sm-3 control-label">上游订单号：</label>
                 <div class="col-sm-8">
                     <input id="referCode" name="referCode" th:field="*{referCode}" class="form-control" type="text" readonly="readonly">
                 </div>
@@ -16,7 +16,7 @@
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
                 <td colspan="7">
-                    <div style="width:40%; float:left;">客户编码：<span th:text="${shipmentHeader['shipTo']}"></span></div>
+                    <div style="width:40%; float:left;">客户名称：<span th:text="${shipmentHeader['customerName']}"></span></div>
                     <div style="width:50%; float:right; text-align:right">
                         <span>明细条数：<span th:text="${shipmentHeader['totalLines']}"></span></span>
                         <span style="padding-left:20px;">明细总数：<span th:text="${shipmentHeader['totalQty']}"></span></span>
@@ -27,9 +27,10 @@
             <tr>
                 <th width="18%">存货编码</th>
                 <th width="22%">物料名称</th>
-                <th width="10%">批次</th>
-                <th width="9%">批号</th>
-                <th width="11%">项目号</th>
+                <th width="15%">物料规格</th>
+                <th width="5%">批次</th>
+                <th width="5%">批号</th>
+                <th width="5%">项目号</th>
                 <th width="9%">数量</th>
                 <th width="21%">条码</th>
             </tr>
@@ -38,10 +39,11 @@
             <tr th:each="row,rowStat : ${details}">
                 <td th:text="${row.materialCode}"></td>
                 <td th:text="${row.materialName}"></td>
+                <td th:text="${row.materialSpec}"></td>
                 <td th:text="${row.batch}"></td>
                 <td th:text="${row.lot}"></td>
-                <td th:text="${row.project}"></td>
-                <td th:text="${row.qty}"></td>
+                <td th:text="${row.projectNo}"></td>
+                <td th:text="${row.shipQty}"></td>
                 <td><img></img></td>
             </tr>
             </tbody>
@@ -35,10 +35,10 @@
                                     </select>
                                     </li>
                                     <li>
-                                        erp单号：<input type="text" name="referCode"/>
+                                        上游单号：<input type="text" name="referCode"/>
                                     </li>
                                     <li>
-                                        erp订单类型：<input type="text" name="referCodeType"/>
+                                        上游订单类型：<input type="text" name="referCodeType"/>
                                     </li>
                                     <li>
                                         客户编码：<input type="text" name="sourceCode"/>
@@ -87,10 +87,10 @@
                            shiro:hasPermission="shipment:bill:remove">
                             <i class="fa fa-trash-o"></i> 删除
                         </a>
-                        <a class="btn btn-outline btn-success btn-rounded" onclick="analysis()"
-                           shiro:hasPermission="shipment:bill:analysis">
-                            <i class="fa fa-plus"></i> 订单分析
-                        </a>
+                        <!--<a class="btn btn-outline btn-success btn-rounded" onclick="analysis()"-->
+                           <!--shiro:hasPermission="shipment:bill:analysis">-->
+                            <!--<i class="fa fa-plus"></i> 订单分析-->
+                        <!--</a>-->
                     </div>
                     <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
                 </div>
@@ -114,7 +114,7 @@
                                             <li>仓库编码：<input type="text" name="shipmentWarehouseCode" id="shipmentWarehouseCode"></li>
                                             <input type="hidden" name="shipmentCompanyId" id="shipmentCompanyId">
                                             <li>货主：<input type="text" name="shipmentCompanyCode" id="shipmentCompanyCode"></li>
-                                            <li>erp订单号：<input type="text" name="shipmentSourceCode" id="shipmentSourceCode"></li>
+                                            <li>上游订单号：<input type="text" name="shipmentSourceCode" id="shipmentSourceCode"></li>
                                             <li>订单平台：<input type="text" name="shipmentSourcePlatform" id="shipmentSourcePlatform"></li>
                                             <li>出库单类型：<input type="text" name="shipmentType" id = "shipmentType"></li>
                                             <li>总数量：<input type="text" name="shipmentTotalQty" id="shipmentTotalQty"></li>
@@ -247,12 +247,12 @@
                 },
                 {
                     field: 'referCode',
-                    title: 'erp订单号',
+                    title: '上游订单号',
                     sortable:true
                 },
                 {
                     field: 'referCodeType',
-                    title: 'erp订单内部号',
+                    title: '上游订单内部号',
                     sortable:true,
                     visible:false
                 },
@@ -146,7 +146,7 @@
 </div>
 <div th:include="include::footer"></div>
 <script type="text/javascript">
-    var prefix = ctx + "config/wave";
+    var prefix = ctx + "shipment/wave";
     $("#form-wave-add").validate({
         rules:{
             waveName:{
@@ -147,7 +147,7 @@
 </div>
 <div th:include="include::footer"></div>
 <script type="text/javascript">
-    var prefix = ctx + "config/wave";
+    var prefix = ctx + "shipment/wave";
     $("#form-wave-edit").validate({
         rules:{
             waveName:{
@@ -30,10 +30,10 @@
             </form>
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
-            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:wave:add">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="shipment:wave:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:wave:remove">
+            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="shipment:wave:remove">
                 <i class="fa fa-trash-o"></i> 删除
             </a>
         </div>
@@ -45,9 +45,9 @@
         </div>
         <div th:include="include :: footer"></div>
         <script th:inline="javascript">
-            var editFlag = [[${@permission.hasPermi('config:wave:edit')}]];
-            var removeFlag = [[${@permission.hasPermi('config:wave:remove')}]];
-            var prefix = ctx + "config/wave";
+            var editFlag = [[${@permission.hasPermi('shipment:wave:edit')}]];
+            var removeFlag = [[${@permission.hasPermi('shipment:wave:remove')}]];
+            var prefix = ctx + "shipment/wave";
             var datas = [[${@dict.getType('sys_normal_disable')}]];
             $(function() {
                 var options = {