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

# Conflicts: # src/main/resources/application-druid.properties

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/main/resources/application-druid.properties
mahuandong
2 parents ecf53982 6b236cee
Showing 117 changed files with 1624 additions and 547 deletions
README.md
src/main/java/com/huaheng/HuaHengServletInitializer.java
src/main/java/com/huaheng/api/acs/controller/StateInfoUp.java
src/main/java/com/huaheng/api/acs/controller/TaskConfirm.java
src/main/java/com/huaheng/api/general/controller/AdjustApi.java
src/main/java/com/huaheng/api/general/controller/BasicDataApi.java
src/main/java/com/huaheng/api/general/controller/CycleCountApi.java
src/main/java/com/huaheng/api/general/controller/LoginApi.java
src/main/java/com/huaheng/api/general/controller/ReceiptApi.java
src/main/java/com/huaheng/api/general/controller/ReceiptController.java
src/main/java/com/huaheng/api/general/controller/ShipmentApi.java
src/main/java/com/huaheng/api/general/service/AdjustService.java
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
src/main/java/com/huaheng/common/constant/QuantityConstant.java
src/main/java/com/huaheng/common/jasper/DocTypeUtil.java
src/main/java/com/huaheng/common/jasper/JasperreportUtils.java
src/main/java/com/huaheng/common/utils/DataUtils.java
src/main/java/com/huaheng/common/utils/YamlUtil.java
src/main/java/com/huaheng/common/utils/http/HttpUtils.java
src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java
     版本说明
    WMS_v2  
-   1. 入库
-        单据新建-0  
-   
+ 
+     /***
+      * 1.差异单页面
+      * 盘点有差异之后生成差异单，差异单不做操作，展示，和生成调整单
+      *
+      * 2.实盘登记页面，
+      * 做到盘点任务明细后面，
+      * 当员工确定容器，扫码物料，弹出选中已经生成的任务进行盘点登记，
+      * 可以扫码容器选中任务
+      * 新增盘有按钮，可以新增一条盘点明细
+      *
+      *
+      * 3.配置
+      * 根据  容器多选，库位多选，巷道，物料多选，库存时间段，呆滞时间
+      * 根据配置条件自动生成盘点单
+      * 在盘点单下发任务时，重新查询库存，同步变更库存物料数量
+      * 给一个自动生成盘点单按钮，定时扫描是否开启
+      *
+      *
+      * 4.下发任务至WCS时做校验，是否同库位同容器已经有任务在执行
+      *
+      * */
  
 \ No newline at end of file
@@ -34,7 +34,7 @@ public class HuaHengServletInitializer extends SpringBootServletInitializer
  
     public static void main(String[] args)
     {
-        SpringApplication.run(HuaHengApplication.class, args);
+        //SpringApplication.run(HuaHengServletInitializer.class, args);
         System.out.println("***************  华恒WMS启动成功WAR  ***************\n" +
                 " >>>     WMS_Servlet启动成功!     <<<  \n"+
                 "　　   へ　　　　 ／|▓\n"+
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/ACS/v1")
-@Api(tags = {"ACS"}, description = "登陆接口")
+@Api(tags = {"ACS信息上传接口"}, value = "ACS信息上传接口")
 public class StateInfoUp extends BaseController {
     @Resource
     private AcsService acsService;
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/ACS/v1")
-@Api(tags = {"ACS"}, description = "登陆接口")
+@Api(tags = {"ACS任务回传接口"}, value = "ACS任务回传接口")
 public class TaskConfirm extends BaseController {
     @Resource
     private AcsService acsService;
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/adjustApi")
-@Api(tags = {"adjust"}, description = "调整单接口")
+@Api(tags = {"调整单接口"}, value = "调整单接口adjust")
 public class AdjustApi {
  
     @Resource
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  
 @RestController
 @RequestMapping("/api/basicData")
-@Api(tags = {"basicData"}, description = "基础数据接口")
+@Api(tags = {"基础数据接口"}, value = "基础数据接口basicData")
 public class BasicDataApi extends BaseController {
  
     @Autowired
@@ -18,7 +18,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/cycleCountApi")
-@Api(tags = {"cycleCount"}, description = "盘点单接口")
+@Api(tags = {"盘点单接口"}, value = "盘点单接口cycleCount")
 public class CycleCountApi {
  
     @Resource
@@ -19,7 +19,7 @@ import java.util.Map;
  
 @RestController
 @RequestMapping("/api")
-@Api(tags = {"Login"}, description = "登陆接口")
+@Api(tags = {"登陆接口"}, value = "登陆接口Login")
 public class LoginApi extends BaseController {
  
     @Autowired
@@ -29,12 +29,15 @@ public class LoginApi extends BaseController {
     @ApiOperation("登陆接口")
     public AjaxResult login(@RequestBody @ApiParam(value="登陆的Map集合") Map<String, String> param)
     {
-        if  (param.get("username") == null)
+        if  (param.get("username") == null) {
             throw new JSONException("username(用户名)不能为空");
-        if  (param.get("password") == null)
+        }
+        if  (param.get("password") == null) {
             throw new JSONException("password(密码)不能为空");
-        if  (param.get("warehouseCode") == null)
+        }
+        if  (param.get("warehouseCode") == null) {
             throw new JSONException("warehouseCode(仓库编码)不能为空");
+        }
         String username = param.get("username");
         String password = param.get("password");
         String warehouseCode = param.get("warehouseCode");
@@ -17,7 +17,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/receiptApi")
-@Api(tags = {"receipt"}, description = "入库单接口")
+@Api(tags = {"入库单接口"}, value = "入库单接口receipt")
 public class ReceiptApi {
  
     @Resource
@@ -17,7 +17,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/api/receipt")
-@Api(tags = {"basicData"}, description = "入库接口")
+@Api(tags = {"入库接口"}, value = "入库接口receiptApi")
 public class ReceiptController {
  
     @Resource
@@ -14,7 +14,7 @@ import javax.annotation.Resource;
  
 @RestController
 @RequestMapping("/api/shipmentApi")
-@Api(tags = {"shipment"}, description = "出库单接口")
+@Api(tags = {"出库单接口"}, value = "出库单接口shipment")
 public class ShipmentApi {
  
     @Resource
@@ -134,6 +134,8 @@ public class AdjustService {
                     throw new SecurityException("选择单据类型为普通调整时，盘点单编码不能为空！");
                 }
                 break;
+            default:
+                throw new ServiceException("类型错误！");
  
         }
  
@@ -104,7 +104,7 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
         Location newlocation =new Location();
         String code=ShiroUtils.getWarehouseCode();
         //重入的库位由wcs提供
-        if(!taskFinishDomain.getRedirectionLocationCode().equals("0")) {
+        if(!"0".equals(taskFinishDomain.getRedirectionLocationCode())) {
             LambdaQueryWrapper<Location> locationLa = Wrappers.lambdaQuery();
             locationLa.eq(Location::getCode, taskFinishDomain.getRedirectionLocationCode())
                     .eq(Location::getStatus,"empty")
@@ -197,35 +197,37 @@ public class QuantityConstant {
  
     //8、波次状态
  
-    //新建波次
-    public static final Integer WAVE_STATUS_BUILD = 0;
+    //未执行
+    public static final Integer WAVE_STATUS_BUILD = 10;
  
-    //开始波次
-    public static final Integer WAVE_STATUS_START = 100;
+    //执行中
+    public static final Integer WAVE_STATUS_START = 20;
  
-    //剔除不符合条件订单
-    public static final Integer WAVE_STATUS_EXCLUDE = 150;
+    //结束
+    public static final Integer WAVE_STATUS_END = 30;
  
-    //指定分配规则
-    public static final Integer WAVE_STATUS_ASSIGN = 200;
+    //执行失败
+    public static final Integer WAVE_STATUS_ERROR = 40;
  
-    //分配库存
-    public static final Integer WAVE_STATUS_ALLOCATION = 300;
  
-    //订单分组
-    public static final Integer WAVE_STATUS_GROUPING = 400;
+    //波次新建
+    public static final Integer WAVE_STEP_BUILD = 0;
  
-    //创建货箱
-    public static final Integer WAVE_STATUS_CREATECONTAINER = 500;
+    //剔除订单
+    public static final Integer WAVE_STEP_CULL = 5;
  
-    //生成任务
-    public static final Integer WAVE_STATUS_BUILDTASK = 600;
+    //波次执行
+    public static final Integer WAVE_STEP_START = 10;
+
+    //波次释放
+    public static final Integer WAVE_STEP_FREED = 130;
+
+    //波次完成
+    public static final Integer WAVE_STEP_END = 100;
  
-    //结束波次
-    public static final Integer WAVE_STATUS_END = 900;
+    //波次失败
+    public static final Integer WAVE_STEP_ERROR = 120;
  
-    //失败
-    public static final Integer WAVE_STATUS_FAILED = 999;
  
  
  
@@ -20,21 +20,21 @@ public class DocTypeUtil {
         DocType type = DocType.PDF;
         docType = docType.toUpperCase();
  
-        if(docType.equals("DOC")){
+        if("DOC".equals(docType)){
             type =DocType.DOC;
-        } else if (docType.equals("XLS")) {
+        } else if ("XLS".equals(docType)) {
             type = DocType.XLS;
-        } else if(docType.equals("XLSX")) {
+        } else if("XLSX".equals(docType)) {
             type = DocType.XLSX;
-        }else if (docType.equals("XML")) {
+        }else if ("XML".equals(docType)) {
             type = DocType.XML;
-        } else if (docType.equals("RTF")) {
+        } else if ("RTF".equals(docType)) {
             type = DocType.RTF;
-        } else if (docType.equals("CSV")) {
+        } else if ("CSV".equals(docType)) {
             type = DocType.CSV;
-        } else if (docType.equals("HTML")) {
+        } else if ("HTML".equals(docType)) {
             type = DocType.HTML;
-        } else if (docType.equals("TXT")) {
+        } else if ("TXT".equals(docType)) {
             type = DocType.TXT;
         }
         return type;
 package com.huaheng.common.jasper;
  
+import com.huaheng.common.exception.service.ServiceException;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.export.*;
 import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
@@ -138,6 +139,9 @@ public class JasperreportUtils {
             case DOC:
                 contentType = "application/msword";
                 break;
+            default:
+                throw new ServiceException("格式错误！");
+
         }
         return contentType;
     }
@@ -192,7 +196,6 @@ public class JasperreportUtils {
      * @param docType
      * @return
      */
-    @SuppressWarnings("deprecation")
     public JRAbstractExporter getJRExporter(DocType docType) {
         JRAbstractExporter exporter = null;
         switch (docType) {
@@ -223,6 +226,8 @@ public class JasperreportUtils {
             case TXT:
                 exporter = new JRTextExporter();
                 break;
+            default:
+                throw new ServiceException("格式错误！");
         }
         return exporter;
     }
@@ -251,7 +256,7 @@ public class JasperreportUtils {
  
  
         // 3、判断资源类型
-        if (ext.equals("xls")) {
+        if ("xls".equals(ext)) {
             SimpleXlsReportConfiguration configuration = new SimpleXlsReportConfiguration();
             // 删除记录最下面的空行
             configuration.setRemoveEmptySpaceBetweenRows(Boolean.TRUE);
@@ -261,7 +266,7 @@ public class JasperreportUtils {
             configuration.setWhitePageBackground(Boolean.FALSE);
             exporter.setConfiguration(configuration);
         }
-        if(ext.equals("xlsx")) {
+        if("xlsx".equals(ext)) {
             SimpleXlsxReportConfiguration configuration = new SimpleXlsxReportConfiguration();
             configuration.setRemoveEmptySpaceBetweenRows(Boolean.TRUE);
             configuration.setRemoveEmptySpaceBetweenColumns(Boolean.TRUE);
@@ -270,7 +275,7 @@ public class JasperreportUtils {
             configuration.setDetectCellType(Boolean.TRUE);
             exporter.setConfiguration(configuration);
         }
-        if (ext.equals("txt")) {
+        if ("txt".equals(ext)) {
             SimpleTextReportConfiguration configuration = new SimpleTextReportConfiguration();
             configuration.setCharWidth((float)8);
             configuration.setCharHeight((float)15);
@@ -297,17 +302,17 @@ public class JasperreportUtils {
  
         // 7、解决中文乱码问题
         response.setCharacterEncoding("UTF-8");
-        if (ext.equals("csv") || ext.equals("doc") || ext.equals("rtf") || ext.equals("txt")) {
+        if ("csv".equals(ext) || "doc".equals(ext) || "rtf".equals(ext) || "txt".equals(ext)) {
             outWriter = response.getWriter();
             SimpleWriterExporterOutput outPut = new SimpleWriterExporterOutput(outWriter);
             exporter.setExporterOutput(outPut);
             //exporter.setParameter(JRExporterParameter.OUTPUT_WRITER, outWriter);
         } else {
-            if(ext.equals("xml")) {
+            if("xml".equals(ext)) {
                 outWriter = response.getWriter();
                 XmlExporterOutput outPut  = new SimpleXmlExporterOutput(outWriter);
                 exporter.setExporterOutput(outPut);
-            }else if(ext.equals("html")){
+            }else if("html".equals(ext)){
                 outWriter = response.getWriter();
                 HtmlExporterOutput outPut = new SimpleHtmlExporterOutput(outWriter);
                 exporter.setExporterOutput(outPut);
@@ -457,7 +462,7 @@ public class JasperreportUtils {
                 }
                 if (null != val) {
                     if (type.endsWith("String")) {
-                        if (val.equals("0")) {
+                        if ("0".equals(val)) {
                             f.set(obj, "--");
                         } else {
                             /*
@@ -40,8 +40,11 @@ public class DataUtils {
      */
     public static String getString(Object object)
     {
-        if (object == null)  return null;
-        else return object.toString();
+        if (object == null) {
+            return null;
+        } else {
+            return object.toString();
+        }
     }
  
     /**
@@ -51,8 +54,11 @@ public class DataUtils {
      */
     public static Integer getInteger(Object object)
     {
-        if (object == null)  return null;
-        else return Integer.valueOf(object.toString());
+        if (object == null) {
+            return null;
+        } else {
+            return Integer.valueOf(object.toString());
+        }
     }
  
     /**
@@ -62,8 +68,11 @@ public class DataUtils {
      */
     public static BigDecimal getBigDecimal(Object object)
     {
-        if (object == null)  return null;
-        else return new BigDecimal(object.toString());
+        if (object == null) {
+            return null;
+        } else {
+            return new BigDecimal(object.toString());
+        }
     }
  
     /**
@@ -73,8 +82,11 @@ public class DataUtils {
      */
     public static Double getDouble(Object object)
     {
-        if (object == null)  return null;
-        else return new Double(object.toString());
+        if (object == null) {
+            return null;
+        } else {
+            return new Double(object.toString());
+        }
     }
  
     /**
@@ -68,7 +68,7 @@ public class YamlUtil
         if (map != null && !map.isEmpty() && qualifiedKey != null)
         {
             String input = String.valueOf(qualifiedKey);
-            if (!input.equals(""))
+            if (!"".equals(input))
             {
                 if (input.contains("."))
                 {
@@ -192,7 +192,7 @@ public class HttpUtils
             String ret = "";
             while ((ret = br.readLine()) != null)
             {
-                if (ret != null && !ret.trim().equals(""))
+                if (ret != null && !"".equals(ret.trim()))
                 {
                     result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                 }
@@ -35,9 +35,9 @@ public class ExcelUtil&lt;T&gt;
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
  
     /**
-     * Excel sheet最大行数，默认65536
+     * Excel sheet最大行数，默认65535
      */
-    public static final int sheetSize = 65536;
+    public static final int Sheet_Size = 65535;
  
     /**
      * 工作表名称
@@ -292,7 +292,7 @@ public class ExcelUtil&lt;T&gt;
         try
         {
             // 取出一共有多少个sheet.
-            double sheetNo = Math.ceil(list.size() / sheetSize);
+            double sheetNo = Math.ceil(list.size() / Sheet_Size);
             for (int index = 0; index <= sheetNo; index++)
             {
                 createSheet(sheetNo, index);
@@ -353,12 +353,12 @@ public class ExcelUtil&lt;T&gt;
      *
      * @param index 序号
      * @param row 单元格行
-     * @param cell 类型单元格
+     *
      */
     public void fillExcelData(int index, Row row)
     {
-        int startNo = index * sheetSize;
-        int endNo = Math.min(startNo + sheetSize, list.size());
+        int startNo = index * Sheet_Size;
+        int endNo = Math.min(startNo + Sheet_Size, list.size());
         for (int i = startNo; i < endNo; i++)
         {
             row = sheet.createRow(i + 1 - startNo);
@@ -24,11 +24,16 @@ public class ApkController {
     @ApiOperation("获取apk更新信息")
     public AjaxResult getUpdateApkInfo(@RequestBody Map<String, String> param) {
         System.out.println("getUpdateApkInfo pkgName:" + param.get("pkgName"));
-        if  (param.get("pkgName") == null)
+        if  (param.get("pkgName") == null) {
             throw new JSONException("pkgName不能为空");
-        if  (param.get("versionCode") == null)
+        }
+        if  (param.get("versionCode") == null) {
             throw new JSONException("versionCode不能为空");
+        }
         List<ApkInfo>  apkinfos = apkMapper.getApkInfoByPkgName(param.get("pkgName"));
+        if(apkinfos == null || apkinfos.size() <= 0) {
+            return AjaxResult.error("当前已经是最新版本");
+        }
         ApkInfo apkInfo = apkinfos.get(0);
         int maxVersion = Integer.MAX_VALUE;
         String project = param.containsKey("project") ? param.get("project") : null;
@@ -61,16 +66,21 @@ public class ApkController {
     @ApiOperation("插入apk更新信息")
     public ApkInfo insertApkInfo(@RequestBody Map<String, String> param) {
         System.out.println("insertApkInfo pkgName:" + param.get("pkgName"));
-        if  (param.get("pkgName") == null)
+        if  (param.get("pkgName") == null) {
             throw new JSONException("pkgName不能为空");
-        if  (param.get("versionCode") == null)
+        }
+        if  (param.get("versionCode") == null) {
             throw new JSONException("versionCode不能为空");
-        if  (param.get("versionName") == null)
+        }
+        if  (param.get("versionName") == null) {
             throw new JSONException("versionName");
-        if  (param.get("url") == null)
+        }
+        if  (param.get("url") == null) {
             throw new JSONException("url");
-        if  (param.get("md5") == null)
+        }
+        if  (param.get("md5") == null) {
             throw new JSONException("md5");
+        }
         ApkInfo apkInfo = buildApkInfo(param);
         try {
             apkMapper.insertApkInfo(apkInfo.getPkgName(), apkInfo.getVersionCode(), apkInfo.getVersionName(), apkInfo.getUrl(), apkInfo.getMd5());
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/mobile/")
-@Api(tags = {"MobileUserController"}, description = "移动端用户信息")
+@Api(tags = {"移动端用户信息"}, value = "移动端用户信息MobileUserController")
 public class MobileUserController extends BaseController {
  
     @Resource
@@ -102,10 +102,7 @@ public class MobileUserController extends BaseController {
     @PostMapping("/getCompanyInfo")
     @ApiOperation("获取公司信息")
     public AjaxResult getCompanyInfo() {
-        LambdaQueryWrapper<Company> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Company::getDeleted, false);
-
-        List<Company> companies = companyService.list(queryWrapper);
+        List<Company> companies = companyService.selectCompanyByCurrentUserId();
         List<CompanyInfo> companyInfos = new ArrayList<>();
         for(Company company : companies) {
             companyInfos.add(new CompanyInfo(company.getId(), company.getCode(), company.getName()));
@@ -37,7 +37,7 @@ import java.util.*;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/inventory")
-@Api(tags = {"MobileInventoryController"}, description = "手机立体库库存相关")
+@Api(tags = {"手机立体库库存相关"}, value = "手机立体库库存相关MobileInventoryController")
 public class MobileInventoryController {
  
     @Resource
@@ -157,7 +157,24 @@ public class MobileInventoryController {
         if(location == null) {
             return AjaxResult.error("没有这个库位");
         }
-        return AjaxResult.success("库位存在");
+        return AjaxResult.success("库位存在").setData(code);
+    }
+
+    @PostMapping( "/isContainer")
+    @ApiOperation("判断是不是库位")
+    @ResponseBody
+    public AjaxResult isContainer(@RequestBody @ApiParam(value="任务id") Map<String, String> param) {
+        String code = param.get("code");
+        if (StringUtils.isEmpty(code)) {
+            return AjaxResult.error("location不能为空");
+        }
+        LambdaQueryWrapper<Container> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Container::getCode, code);
+        Container container = containerService.getOne(queryWrapper);
+        if(container == null) {
+            return AjaxResult.error("没有这个容器");
+        }
+        return AjaxResult.success("容器存在").setData(code);
     }
  
     @PostMapping("/getLocationCode")
@@ -369,6 +386,15 @@ public class MobileInventoryController {
     public AjaxResult getEmptyContainerInLocation(@RequestBody Map<String, String> param) {
         String warehouCOde =  ShiroUtils.getWarehouseCode();
         List<Location> list = containerService.getEmptyContainerInLocation(null,null,ShiroUtils.getWarehouseCode());
+        List<Location> removeList = new ArrayList<>();
+        for(Location location : list) {
+            String containerCode = location.getContainerCode();
+            Integer taskCount = taskService.UncompleteCount(containerCode);
+            if (taskCount != null && taskCount.intValue() > 0)  {
+                removeList.add(location);
+            }
+        }
+        list.removeAll(removeList);
         return  AjaxResult.success(list);
     }
  
@@ -384,7 +410,7 @@ public class MobileInventoryController {
         for(Location  location : locations) {
             for(Container container : containers) {
                 if(container.getCode().equals(location.getContainerCode())) {
-                    if(container.getStatus().equals("some")) {
+                    if("some".equals(container.getStatus())) {
                         location.setStatus("some");
                     }
                 }
@@ -3,6 +3,7 @@ package com.huaheng.mobile.receipt;
 import com.alibaba.fastjson.JSONException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.general.domain.Receipt;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.api.general.domain.ReceiptDomain;
 import com.huaheng.common.constant.QuantityConstant;
@@ -30,6 +31,8 @@ import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import com.huaheng.pc.system.dict.domain.DictData;
+import com.huaheng.pc.system.dict.service.IDictDataService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
@@ -42,9 +45,8 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
  
 /**
  *
@@ -54,7 +56,7 @@ import java.util.Map;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/receipt/batch")
-@Api(tags = {"MobileBatchReceiptController"}, description = "移动端收货")
+@Api(tags = {"移动端收货"}, value = "移动端收货MobileBatchReceiptController")
 public class MobileBatchReceiptController {
  
     @Resource
@@ -77,6 +79,8 @@ public class MobileBatchReceiptController {
     private TaskDetailService taskDetailService;
     @Resource
     private CompanyService companyService;
+    @Resource
+    private IDictDataService dictDataService;
  
  
     @PostMapping("/scanContainer")
@@ -97,10 +101,10 @@ public class MobileBatchReceiptController {
         if (container == null) {
             return AjaxResult.error("托盘编码错误");
         }
-        if (!container.getStatus().equals("empty")) {
+        if (!"empty".equals(container.getStatus())) {
             return AjaxResult.error("托盘状态不为空");
         }
-        if (!container.getLocationCode().equals("")) {
+        if (!"".equals(container.getLocationCode())) {
             return AjaxResult.error("");
         }
         return result;
@@ -327,6 +331,73 @@ public class MobileBatchReceiptController {
         return AjaxResult.success("收货成功");
     }
  
+    @PostMapping("/listReceipt")
+    @ApiOperation("移动端根据表单整盘入库")
+    @Log(title = "移动端根据表单整盘入库", action = BusinessType.OTHER)
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult listReceipt(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
+        if (receiptBills == null || receiptBills.size() <=0) {
+            throw new JSONException("没有收货信息");
+        }
+        String containerCode = receiptBills.get(0).receiptContainerCode;
+        String companyCode = receiptBills.get(0).getCompanyCode();
+        String receiptDetailId = receiptBills.get(0).getReceiptDetailId();
+        String locationCode = receiptBills.get(0).locationCode;
+
+        LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
+        containerQueryWrapper.eq(Container::getCode, containerCode);
+        Container container = containerService.getOne(containerQueryWrapper);
+        if(container == null) {
+            throw new JSONException("不存在这个托盘");
+        }
+
+        if(locationCode != null) {
+            LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+            locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
+            Location location = locationService.getOne(locationLambdaQueryWrapper);
+            if(location == null) {
+                throw new JSONException("不存在这个托盘");
+            }
+
+            if(!"empty".equals(location.getStatus())) {
+                throw new JSONException("库位状态不是空闲");
+            }
+        }
+
+        LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
+        receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
+        ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
+        if(receiptDetail == null) {
+            throw new JSONException("没有找到入库单详情");
+        }
+
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
+        receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
+        ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
+        if(receiptHeader == null) {
+            throw new JSONException("没有找到入库单");
+        }
+
+        List<ReceiptContainerView> receiptContainerViewList = new ArrayList<>();
+        for(ReceiptBill receiptBill : receiptBills) {
+            if(receiptBill.getQty().compareTo(BigDecimal.ZERO) == 0) {
+                continue;
+            }
+            ReceiptContainerView receiptContainerView = new ReceiptContainerView();
+            receiptContainerView.setLocationCode(receiptBill.getLocationCode());
+            receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
+            receiptContainerView.setReceiptContainerCode(receiptBill.getReceiptContainerCode());
+            receiptContainerView.setReceiptDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
+            receiptContainerView.setQty(receiptBill.getQty());
+            receiptContainerView.setTaskType((short)100);
+            receiptContainerViewList.add(receiptContainerView);
+        }
+        receiptContainerHeaderService.batchSave(receiptContainerViewList);
+        AjaxResult retResult = taskHeaderService.createQuickTask(containerCode);
+
+        return retResult;
+    }
+
     @PostMapping("/findReceipt")
     @ApiOperation("移动端查询入库单")
     @Log(title = "移动端查询入库单", action = BusinessType.OTHER)
@@ -338,9 +409,6 @@ public class MobileBatchReceiptController {
         } else if (StringUtils.isNull(companyCode)){
             return AjaxResult.error("公司编码为空");
         }
-//        else if (StringUtils.isNull(referType)) {
-//            return AjaxResult.error("上游系统关联单类型为空");
-//        }
  
         /* 查询入库单，如果数据库中不存在，则调用ERP接口拉取单据，成功后再次查询返回结果*/
          LambdaQueryWrapper<ReceiptHeader> receiptLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -393,7 +461,7 @@ public class MobileBatchReceiptController {
             if (loc == null) {
                 return AjaxResult.error("目标库位不存在");
             }
-            if (!loc.getStatus().equals("empty")) {
+            if (!"empty".equals(loc.getStatus())) {
                 return AjaxResult.error("目标库位非空闲");
             }
         }
@@ -434,4 +502,37 @@ public class MobileBatchReceiptController {
  
         return AjaxResult.success(taskHeader.getId());
     }
+
+    @PostMapping("/searchReceipt")
+    @ApiOperation("移动端查询入库单")
+    @Log(title = "移动端查询入库单", action = BusinessType.OTHER)
+    public AjaxResult searchReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String companyCode = param.get("companyCode");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = df.format(new Date());
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.DATE, -7);
+        Date first = c.getTime();
+        String start = df.format(first);//前一天
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
+        receiptHeaderQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
+                .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(ReceiptHeader::getCreated, now)
+                .gt(ReceiptHeader::getCreated, start)
+                .orderByDesc(ReceiptHeader::getCreated);
+        List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
+        return AjaxResult.success(receiptHeaderList);
+    }
+
+    @PostMapping("/getDictListData")
+    @ApiOperation("移动端查询字典信息")
+    @Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
+    public AjaxResult getDictListData(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String dictType = param.get("dictType");
+        List<DictData> dictDataList = dictDataService.selectDictDataByType(dictType);
+        return AjaxResult.success(dictDataList);
+    }
+
+
 }
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/receipt/oneByOne")
-@Api(tags = {"MobileOneByOneReceiptController"}, description = "移动端逐件收货")
+@Api(tags = {"移动端逐件收货"}, value = "移动端逐件收货MobileOneByOneReceiptController")
 public class MobileOneByOneReceiptController {
  
     @Resource
@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/mobile/putaway/execute")
-@Api(tags = {"MobilePutawayController"}, description = "手机收货上架")
+@Api(tags = {"手机收货上架"}, value = "手机收货上架MobilePutawayController")
 public class MobilePutawayController {
  
     @Resource
@@ -24,7 +24,7 @@ import java.util.Map;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/task/taskForASRS")
-@Api(tags = {"MobileTaskForASRSController"}, description = "手机立体库任务拣货相关")
+@Api(tags = {"手机立体库任务拣货相关"}, value = "手机立体库任务拣货相关MobileTaskForASRSController")
 public class MobileTaskForASRSController {
  
  
@@ -48,7 +48,7 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
         {
             for (UserCompany userCompanyItem : userCompanys)
             {
-                if (companyItem.getId() == userCompanyItem.getCompanyId())
+                if (companyItem.getId().equals(userCompanyItem.getCompanyId()))
                 {
                     companyItem.setFlag(true);
                     break;
@@ -101,7 +101,7 @@ public class ConfigValueController extends BaseController {
     @ResponseBody
     public AjaxResult addSave(ConfigValue configValue)  {
         //检测盘点首选项是否停用
-        if(configValue.getRecordType().equals("cycleCountPreference")){
+        if("cycleCountPreference".equals(configValue.getRecordType())){
             CycleCountPreference cycleCountPreferenceTemp = new CycleCountPreference();
             cycleCountPreferenceTemp.setCode(configValue.getIdentifier());
             cycleCountPreferenceTemp.setWarehouseCode(configValue.getWarehouseCode());
@@ -104,7 +104,7 @@ public class ConfigWarningService extends ServiceImpl&lt;ConfigWarningMapper, Confi
  
     /**
      * 物料预警
-     * @param map 任务明细
+     * @param materialCode,materialName 任务明细
      */
     public void materialWarning(String materialCode, String materialName){
         /* 查询预警配置*/
@@ -149,7 +149,7 @@ public class ContainerController extends BaseController {
  
         for (Integer id : Convert.toIntArray(ids)) {
             Container container = containerService.getById(id);
-            if (container.getStatus().equals("empty") && StringUtils.isEmpty(container.getLocationCode())) {
+            if ("empty".equals(container.getStatus()) && StringUtils.isEmpty(container.getLocationCode())) {
                 container.setEnable(false);
                 container.setLastUpdatedBy(ShiroUtils.getLoginName());
                 containerService.updateById(container);
@@ -56,8 +56,9 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     }
  
     private Integer getNumber(String type) {
-        if (!containerTypeService.checkConfig(type))
+        if (!containerTypeService.checkConfig(type)) {
             throw new ServiceException("容器类型编码不存在");
+        }
         LambdaQueryWrapper<Container> lambda = Wrappers.lambdaQuery();
         lambda.select(Container::getCode).eq(Container::getContainerType, type)
             .orderByDesc(Container::getId).last("Limit 1");
@@ -72,6 +73,7 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         }
     }
  
+    @Override
     public String importMaterial(List<Container> containerList, Boolean updateSupport, String operName){
         if (StringUtils.isNull(containerList) || containerList.size() == 0) {
             throw new  BusinessException("导入数据不能为空！");
@@ -128,8 +130,9 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
      * */
     @Override
     public void updateLocationCodeAndStatus(String containerCode, String locationCode, String status) {
-        if (StringUtils.isNotEmpty(containerCode) || StringUtils.isNotEmpty(locationCode))
+        if (StringUtils.isNotEmpty(containerCode) || StringUtils.isNotEmpty(locationCode)) {
             containerMapper.updateLocationCodeAndStatus(ShiroUtils.getWarehouseCode(), containerCode, locationCode, status);
+        }
     }
  
     /**
@@ -138,6 +141,7 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
      * @param containerCode 容器编码
      * @return
      */
+    @Override
     @Transactional
     public void removeContainer(String containerType, String containerCode) {
         if ("LS".equals(containerType)) {
@@ -142,8 +142,9 @@ public class ContainerCapacityController extends BaseController {
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids))
         {
  
@@ -137,8 +137,9 @@ public class ContainerTypeController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-		    return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		for (Integer id : Convert.toIntArray(ids))
 		{
 		    containerTypeService.removeById(id);
@@ -28,6 +28,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
  
+
+/**
+ * 盘点单首选项
+ * */
 @Controller
 @RequestMapping("/config/cycleCountPreference")
 public class cycleCountPreferenceController extends BaseController {
@@ -14,6 +14,7 @@ import java.util.Map;
 @Service("excelService")
 public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, ExcelTemplate> implements ExcelTemplateService{
  
+    @Override
     public List<Map<String, Object>> getList(){
         LambdaQueryWrapper<ExcelTemplate> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ExcelTemplate::getWarehouseCode, ShiroUtils.getWarehouseCode())
@@ -258,7 +258,7 @@ public class LocationController extends BaseController {
             List<String> batchList = inventoryDetails.stream().map(InventoryDetail::getBatch).collect(Collectors.toList());
             List<String> materialCodeList = inventoryDetails.stream().map(InventoryDetail::getMaterialCode).collect(Collectors.toList());
             List<BigDecimal> qtyList = inventoryDetails.stream().map(InventoryDetail::getQty).collect(Collectors.toList());
-            if (status.equals("empty")) {
+            if ("empty".equals(status)) {
                 if(StringUtils.isEmpty(containerCode)) {
                     userDef3 = LocationStatus.IDLE_EMPTY_LOCATION;
                 } else {
@@ -272,7 +272,7 @@ public class LocationController extends BaseController {
                         userDef3 = LocationStatus.IDLE_FULL_CONTAINER;
                     }
                 }
-            } else if(status.equals("lock")) {
+            } else if("lock".equals(status)) {
                 if(StringUtils.isEmpty(containerCode)) {
                     userDef3 = LocationStatus.LOCK_EMPTY_LOCATION;
                 } else {
@@ -26,4 +26,7 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
  
     List<Location> pickLocation();
  
+    List<Location> selectContainerEmpty(@Param("warehouseCode") String warehouseCode );
+
+
 }
 \ No newline at end of file
@@ -74,4 +74,9 @@ public interface LocationService extends IService&lt;Location&gt;{
      * @return location
      */
     List<Location> pickLocation();
+
+
+
+    List<Location> selectContainerEmpty(String warehouseCode);
+
 }
@@ -268,5 +268,10 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         return locationMapper.pickLocation();
     }
  
+    @Override
+    public List<Location> selectContainerEmpty(String warehouseCode) {
+        return locationMapper.selectContainerEmpty(warehouseCode);
+    }
+
  
 }
@@ -153,8 +153,9 @@ public class LocationTypeController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		for (Integer id : Convert.toIntArray(ids))
 		{
             locationTypeService.removeById(id);
@@ -3,6 +3,7 @@ package com.huaheng.pc.config.locationType.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import com.huaheng.pc.config.locationType.domain.LocationType;
@@ -20,6 +21,7 @@ public class LocationTypeServiceImpl extends ServiceImpl&lt;LocationTypeMapper, Loc
     public List<Map<String, Object>> getLocationPrefix(){
         LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .select(LocationType::getCode,LocationType::getName)
                 .eq(LocationType::getEnable, true);
         return this.listMaps(lambdaQueryWrapper);
     }
@@ -3,6 +3,7 @@ package com.huaheng.pc.config.shipmentPreference.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
@@ -91,7 +92,10 @@ public class ShipmentPreferenceServiceImpl extends ServiceImpl&lt;ShipmentPreferenc
                     //判断单据是否按出库流程操作
                     ShipmentHeader shipmentHeader = shipmentHeaderService.getById(id);
                     if (shipmentHeader == null || shipmentHeader.getFirstStatus() < status) {
-                        throw new ServiceException("单据状态不对，此操作不符合出库流程，请按照出库流程出库");
+                        throw new ServiceException("出库单ID为"+id+"的单据状态不对，请按照出库流程先审核单据");
+                    }
+                    if(shipmentHeader.getLastStatus() > QuantityConstant.SHIPMENT_HEADER_WAVE){
+                        throw new ServiceException("出库单ID为"+id+"的单据无法加入波次");
                     }
                     shipmentHeaderList.add(shipmentHeader);
                 }
@@ -104,6 +108,9 @@ public class ShipmentPreferenceServiceImpl extends ServiceImpl&lt;ShipmentPreferenc
                 if (shipmentHeader == null || shipmentHeader.getFirstStatus() < status) {
                     throw new ServiceException("单据状态不对，此操作不符合出库流程，请按照出库流程出库");
                 }
+                if(shipmentHeader.getLastStatus() > QuantityConstant.SHIPMENT_HEADER_WAVE){
+                    throw new ServiceException("出库单"+code+"的单据无法加入波次");
+                }
                 shipmentHeaderList.add(shipmentHeader);
             }
         }
@@ -53,6 +53,7 @@ public class ShipmentTypeServiceImpl extends ServiceImpl&lt;ShipmentTypeMapper, Shi
         }
     }
  
+    @Override
     public List<Map<String, Object>> getType(){
         LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode())
@@ -139,8 +139,9 @@ public class SupplierController extends BaseController {
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids)) {
             Supplier supplier = supplierService.getById(id);
  
@@ -2,7 +2,13 @@ package com.huaheng.pc.config.supplier.service;
  
 import com.huaheng.pc.config.supplier.domain.Supplier;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
 public interface SupplierService extends IService<Supplier>{
  
+    List<Map<String, Object>> getCode();
+
  
 }
 package com.huaheng.pc.config.supplier.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.supplier.mapper.SupplierMapper;
 import com.huaheng.pc.config.supplier.domain.Supplier;
  
-@Service
+import java.util.List;
+import java.util.Map;
+
+@Service("SupplierService")
 public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService{
  
+    @Override
+    public List<Map<String, Object>> getCode(){
+        LambdaQueryWrapper<Supplier> lambda = Wrappers.lambdaQuery();
+        lambda.select(Supplier::getCode, Supplier::getId, Supplier::getName)
+                .eq(Supplier::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        return this.listMaps(lambda);
+    }
 }
+package com.huaheng.pc.config.transfer.controller;
+
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+/**
+ * 移库配置
+ * 配置闲时时间段，
+ * 闲时移库热门物料到靠近出口的位置
+ *
+ *需要首先收集热门物料的信息。
+ * 或者查询最近一根约的出入单，确定物料热度
+ *
+ *
+ * */
+@Controller
+@RequestMapping("/config/transfer")
+public class TransferController {
+
+
+
+
+
+
+}
+package com.huaheng.pc.config.transfer.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+//@TableName(value = "")
+public class Transfer implements Serializable {
+
+
+
+
+
+
+
+}
+package com.huaheng.pc.config.transfer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.transfer.domain.Transfer;
+
+public interface TransferMapper extends BaseMapper<Transfer> {
+
+
+
+
+
+
+
+}
+package com.huaheng.pc.config.transfer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.transfer.domain.Transfer;
+
+public interface TransferService extends IService<Transfer> {
+
+
+
+}
+package com.huaheng.pc.config.transfer.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.transfer.domain.Transfer;
+import com.huaheng.pc.config.transfer.mapper.TransferMapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 移库配置
+ * */
+@Service("TransferService")
+public class TransferServiceImpl extends ServiceImpl<TransferMapper, Transfer> implements TransferService {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
@@ -136,8 +136,9 @@ public class WareHouseController extends BaseController {
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String codes) {
-        if (StringUtils.isEmpty(codes))
+        if (StringUtils.isEmpty(codes)) {
             return AjaxResult.error("id不能为空");
+        }
         for (String code : Convert.toStrArray(codes)) {
             Warehouse warehouse = new Warehouse();
             InventoryHeader inventory = new InventoryHeader();
@@ -138,8 +138,9 @@ public class ZoneController extends BaseController {
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids))
         {
             Zone record = new Zone();
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.mapper.ZoneMapper;
 import org.springframework.stereotype.Service;
@@ -23,7 +24,8 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements Zo
     @Transactional
     public List<Map<String, Object>> getZoneCodeList() {
         LambdaQueryWrapper<Zone> lambda = Wrappers.lambdaQuery();
-        lambda.select(Zone::getId, Zone::getCode, Zone::getName);
+        lambda.select(Zone::getId, Zone::getCode, Zone::getName)
+                .eq(Zone::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambda);
     }
  
@@ -137,8 +137,9 @@ public class ZoneCapacityController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		for (Integer id : Convert.toIntArray(ids))
 		{
             zoneCapacityService.removeById(id);
@@ -182,7 +182,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
             location.setWarehouseCode(inventoryDetail.getWarehouseCode());
             LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(location);
             location = locationService.getOne(lambdaQueryWrapper);
-            if (!location.getStatus().equals("empty")) {
+            if (!"empty".equals(location.getStatus())) {
                return AjaxResult.error (inventoryDetail.getId() + "库存非空闲，请等待其他任务完成再进行调整！");
             }
             //判断调整库存状态还是数量
@@ -120,8 +120,9 @@ public class adjustHeaderController extends BaseController {
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids))
         {
             AjaxResult result = adjustHeaderService.deleteHeader(id);
@@ -97,11 +97,14 @@ public class AdjustHeaderServiceImpl extends ServiceImpl&lt;AdjustHeaderMapper, Adj
                 throw new SecurityException("选择单据类型为质检调整时，质检单编码不能为空！");
             }
                 break;
-            case "adjust":   //盘点调整
+            case "cyclecountAdjust":   //盘点调整
                 if(StringUtils.isEmpty(adjustHeader.getCycleCountCode())){
                     throw new SecurityException("选择单据类型为盘点调整时，盘点单编码不能为空！");
                 }
                 break;
+            //除质检和调整需要前置单据，其他不需要
+            default:
+                break;
         }
  
         adjustHeader.setCreated(new Date());
@@ -169,8 +169,9 @@ public class CycleCountDetailController extends BaseController {
     @ResponseBody
     public AjaxResult remove(String ids){
  
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("删除的明细id不能为空");
+        }
         Integer[] detailsIds = Convert.toIntArray(ids);
         CycleCountDetail cyclecountDetail = cycleCountDetailService.getById(detailsIds[0]);
         CycleCountHeader ch = new CycleCountHeader();
@@ -135,6 +135,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
             //查询该条库存明细
             InventoryDetail inventoryDetail = inventoryDetailService.getById(inventoryDetailId);
             //写入盘点明细
+            if(!inventoryDetail.getCompanyCode().equals(cyclecountHeader.getCompanyCode())){
+                throw new ServiceException("库存与盘点主单货主不一致！");
+            }
             CycleCountDetail ccd = new CycleCountDetail();
             ccd.setPreferenceCode(preferenceCode);
             ccd.setCycleCountHeadCode(cyclecountHeader.getCode());
@@ -237,7 +240,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
         LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
         Location loc = locationService.getOne(lambdaQueryWrapper);
-        if(!loc.getStatus().equals("empty")){
+        if(!"empty".equals(loc.getStatus())){
             return AjaxResult.error(cycleCountDetail.getLocationCode()+"库位不在空闲状态，请先完成其他任务，操作失败！");
         }
         if(StringUtils.isEmpty(loc.getContainerCode())){
@@ -355,12 +358,12 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         LambdaQueryWrapper<CycleCountHeader> cycleCountHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountHeader);
          cycleCountHeader = cycleCountHeaderService.getOne(cycleCountHeaderLambdaQueryWrapper); //主单
         //任务执行后再实盘登记
-        if(cyclecountDetail.getEnableStatus() < QuantityConstant.CYCLECOUNT_STATUS_EXECUTING){
+        /*if(cyclecountDetail.getEnableStatus() < QuantityConstant.CYCLECOUNT_STATUS_EXECUTING){
             return AjaxResult.error("盘点任务未执行不能登记数量！");
         }
         if(cyclecountDetail.getEnableStatus() == QuantityConstant.CYCLECOUNT_STATUS_COMPLETED){
             return AjaxResult.error("盘点任务完成后不能再登记数量！");
-        }
+        }*/
         if(cycleCountHeader == null){
             return AjaxResult.error("主单据不存在");
         }
@@ -157,8 +157,9 @@ public class CycleCountHeaderController extends BaseController {
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids))
         {
             AjaxResult result = cycleCountHeaderService.delete(id);
@@ -67,7 +67,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         List<CycleCountDetail> list = cycleCountDetailService.list(lam);
         //当有子单的状态为100时触发主单的完成状态
         //100状态只有全部完成才写入主单
-        long count100 = list.stream().filter(t->t.getEnableStatus() == QuantityConstant.CYCLECOUNT_STATUS_COMPLETED).count(); //明细已完成的条数
+        long count100 = list.stream().filter(t-> t.getEnableStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_COMPLETED)).count(); //明细已完成的条数
         if(count100 == list.size() ){
             cyclecountHeader.setStatusCyc(QuantityConstant.CYCLECOUNT_STATUS_COMPLETED);
             this.saveOrUpdate(cyclecountHeader);
@@ -141,6 +141,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
     /**
      * 新增盘点差异调整单
      * */
+    @Override
     @Transactional
     public AjaxResult insertByAdjust(Integer id) {
  
@@ -83,7 +83,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         if(loc == null){
             throw new ServiceException("库存没有库位！");
         }
-        if(!loc.getStatus().equals("empty")){
+        if(!"empty".equals(loc.getStatus())){
             throw new ServiceException(inventoryDetail.getLocationCode()+"状态非空闲，操作失败");
         }
         if(StringUtils.isEmpty(loc.getContainerCode())){
@@ -157,7 +157,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
             }
  
             //查找未质检的
-            if(inventoryDetail.getQcCheck().equals("2")) {
+            if("2".equals(inventoryDetail.getQcCheck())) {
                 codeSet.add(inventoryDetail.getReceiptCode());
             }
         }
@@ -167,7 +167,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
             //对库存分类，已入库单划分
             for(Integer id : ids){
                 InventoryDetail inventoryDetail=this.getById(id);
-                if(inventoryDetail.getReceiptCode().equals(code) && inventoryDetail.getQcCheck().equals("2")){
+                if(inventoryDetail.getReceiptCode().equals(code) && "2".equals(inventoryDetail.getQcCheck())){
                     inventoryDetails.add(inventoryDetail);
                 }
             }
@@ -177,18 +177,18 @@ public class InventoryHeaderController extends BaseController
     /**
      * 空托盘出库查看任务
      * @param containerCode
-     * @param location
+     * @param sourceLocation
      * @return
      */
     @RequiresPermissions("inventory:inventoryHeader:emptyCheckOut")
     @PostMapping("/emptyCheckOut")
     @Log(title = "任务-任务管理", operating = "生成空托盘出库查看任务", action = BusinessType.INSERT)
     @ResponseBody
-    public AjaxResult emptyCheckOut(String containerCode,String location){
-        /*if(StringUtils.isEmpty(containerCode) || StringUtils.isEmpty(location)){
+    public AjaxResult emptyCheckOut(String containerCode,String sourceLocation){
+        if(StringUtils.isEmpty(containerCode) || StringUtils.isEmpty(sourceLocation)){
             throw new ServiceException("容器和库位不能有空值！");
-        }*/
-        return inventoryHeaderService.createEmptyCheckOut(containerCode, location);
+        }
+        return inventoryHeaderService.createEmptyCheckOut(containerCode, sourceLocation);
     }
  
     /**
@@ -219,5 +219,6 @@ public class InventoryHeaderController extends BaseController
  
  
  
-	
+
+
 }
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
  
@@ -75,7 +76,7 @@ public class InventoryHeader implements Serializable {
      */
     @TableField(value = "totalQty")
     @ApiModelProperty(value="总数量")
-    private Integer totalQty;
+    private BigDecimal totalQty;
  
     /**
      * 总行量
@@ -103,22 +103,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (StringUtils.isNotEmpty(container.getLocationCode()))  {
             return AjaxResult.error("容器已在库位[" + container.getLocationCode() + "]上");
         }
-        //库位
-        Location temp = new Location();
-        temp.setCode(destinationLocation);
-        temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
-        Location loc = locationService.getOne(lambda);
+        Location loc = null;
         if(StringUtils.isNotEmpty(destinationLocation)) {
-            //校验目标地址
-            if (loc == null) {
-                return AjaxResult.error("目标库位不存在");
-            }
-            if (StringUtils.isNotEmpty(loc.getContainerCode())) {
-                return AjaxResult.error("目标库位已存在托盘");
-            }
-            if (!loc.getStatus().equals("empty")) {
-                return AjaxResult.error("目标库位非空闲");
+            //库位
+            Location temp = new Location();
+            temp.setCode(destinationLocation);
+            temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
+            loc = locationService.getOne(lambda);
+            if (StringUtils.isNotEmpty(destinationLocation)) {
+                //校验目标地址
+                if (loc == null) {
+                    return AjaxResult.error("目标库位不存在");
+                }
+                if (StringUtils.isNotEmpty(loc.getContainerCode())) {
+                    return AjaxResult.error("目标库位已存在托盘");
+                }
+                if (!"empty".equals(loc.getStatus())) {
+                    return AjaxResult.error("目标库位非空闲");
+                }
             }
         }
  
@@ -133,21 +136,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
  
         //创建主任务
         TaskHeader taskHeader = new TaskHeader();
-        taskHeader.setWarehouseCode(loc.getWarehouseCode());
+        taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
         taskHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));//货主
         taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHELF); //入库内部类型都给100
         taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYRECEIPT);
         taskHeader.setContainerCode(container.getCode());
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
         taskHeader.setFromLocation("");
-        taskHeader.setToLocation(loc.getCode());
+        if(loc != null) {
+            taskHeader.setToLocation(loc.getCode());
+        }
         taskHeader.setCreated(new Date());
         taskHeader.setCreatedBy(ShiroUtils.getLoginName());
         taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
         taskHeader.setLastUpdated(new Date());
         if(taskHeaderService.save(taskHeader)){
             //锁定库位状态
-            locationService.updateStatus(loc.getContainerCode(),"lock");
+            if(loc != null) {
+                locationService.updateStatus(loc.getContainerCode(), "lock");
+            }
         }else{
             throw new ServiceException("空托入库主表生成失败！");
         }
@@ -168,11 +175,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if(taskDetailService.save(taskDetail) == false){
             throw new ServiceException("空托入库任务明细生成失败！");
         }
-
-        /**
-         * 锁库位
-         */
-        locationService.updateStatus(loc.getCode(), "lock");
+        //锁库位
+        if(loc != null) {
+            locationService.updateStatus(loc.getCode(), "lock");
+        }
         return AjaxResult.success(taskHeader.getId());
     }
  
@@ -206,7 +212,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if(StringUtils.isEmpty(loc.getContainerCode())){
             return AjaxResult.error("源货位没有托盘");
         }
-        if(!loc.getStatus().equals("empty")){
+        if(!"empty".equals(loc.getStatus())){
             return AjaxResult.error("源货位非空闲");
         }
         //判断托盘是否已经存在任务
@@ -285,7 +291,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if(StringUtils.isEmpty(loc.getContainerCode())){
             return AjaxResult.error("源货位没有托盘");
         }
-        if(!loc.getStatus().equals("empty")){
+        if(!"empty".equals(loc.getStatus())){
             return AjaxResult.error("源货位非空闲");
         }
         //创建任务
@@ -101,7 +101,10 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
             receiptContainerHeader.setCompanyCode(receiptDetail.getCompanyCode());
             receiptContainerHeader.setContainerCode(containerCode);
-            Container container = containerService.findAllByCode(containerCode);
+            Container condition = new Container();
+            condition.setCode(containerCode);
+            LambdaQueryWrapper<Container> containerHeaderQueryWrapper = Wrappers.lambdaQuery(condition);
+            Container container = containerService.getOne(containerHeaderQueryWrapper);
             receiptContainerHeader.setContainerType(container.getContainerType());
             receiptContainerHeader.setTaskType(String.valueOf(taskType));
             if (taskType.equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
@@ -240,10 +243,12 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         if (checkLocationCode(list.get(0).getLocationCode(), list.get(0).getLocationCode(), Integer.valueOf(list.get(0).getTaskType())) == true) {
             locationService.updateStatus(list.get(0).getLocationCode(), "lock");
         }
-        ReceiptContainerView view = list.get(0);
-        AjaxResult ajaxResult = saveCountain(view.getReceiptCode(), view.getReceiptContainerCode(),
-                view.getReceiptDetailId(), view.getLocationCode(), view.getQty().intValue(), null);
-        return null;
+        AjaxResult ajaxResult = null;
+        for (ReceiptContainerView receiptContainerView : list) {
+            ajaxResult = saveCountain(receiptContainerView.getReceiptCode(), receiptContainerView.getReceiptContainerCode(),
+                    receiptContainerView.getReceiptDetailId(), receiptContainerView.getLocationCode(), receiptContainerView.getQty().intValue(), null);
+        }
+        return ajaxResult;
     }
  
     /**
@@ -178,6 +178,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
      * @param receiptDetail
      * @return
      */
+    @Override
     @Transactional
     public ReceiptDetail queryflow(ReceiptDetail receiptDetail){
         //当单据状态为驳回或作废时不更新状态
@@ -76,6 +76,13 @@ public class ReceiptHeader implements Serializable {
     private Integer referId;
  
     /**
+     * 供应商编码
+     */
+    @TableField(value = "supplierCode")
+    @ApiModelProperty(value="供应商编码")
+    private String supplierCode;
+
+    /**
      * 关联订单类型
      */
     @TableField(value = "referType")
@@ -101,8 +101,9 @@ public class ExcelReportController extends BaseController {
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids)  {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids))
         {
            int i = mapper.delete(id);
@@ -108,8 +108,9 @@ public class ShipmentContainerDetailController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		return shipmentContainerHeaderService.cancelCombinationDetail(Arrays.asList((Convert.toIntArray(ids))));
 	}
 }
@@ -141,8 +141,9 @@ public class ShipmentContainerHeaderController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
         List<Integer> IdList = Arrays.asList(Convert.toIntArray(ids));
 		return shipmentContainerHeaderService.cancelCombination(IdList);
  
@@ -158,8 +159,9 @@ public class ShipmentContainerHeaderController extends BaseController
     public AjaxResult createTask(String ids)
     {
     	AjaxResult ajaxResult=new AjaxResult();
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
+        }
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         for (Integer id : idList) {
             //获取表头
@@ -107,6 +107,14 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="货主编码")
     private String companyCode;
  
+
+    /**
+     * 序号
+     */
+    @TableField(value = "waveId")
+    @ApiModelProperty(value="序号")
+    private Integer waveId;
+
     /**
      * 数量
      */
@@ -958,4 +966,12 @@ public class ShipmentContainerHeader implements Serializable {
     public void setSystemCreated(Integer systemCreated) {
         this.systemCreated = systemCreated;
     }
+
+    public Integer getWaveId() {
+        return waveId;
+    }
+
+    public void setWaveId(Integer waveId) {
+        this.waveId = waveId;
+    }
 }
 \ No newline at end of file
@@ -137,7 +137,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().add(shipmentCombinationModel.getShipQty()));
         inventoryDetailService.saveOrUpdate(inventoryDetail);
         //获取库位，然后锁定
-        if(location.getStatus().equals("empty")) {
+        if("empty".equals(location.getStatus())) {
             location.setStatus("lock");
             locationService.saveOrUpdate(location);
         }
@@ -346,7 +346,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                 taskDetail.setWaveId(shipmentContainerDetaill.getWaveId());
                 taskDetail.setBatch(shipmentContainerDetaill.getBatch());
                 taskDetail.setProjectNo(shipmentContainerDetail.getProjectNo());
-                if (shipmentContainerHeader.getStatus() == QuantityConstant.SHIPMENT_CONTAINER_TASK) {
+                if (shipmentContainerHeader.getStatus().equals(QuantityConstant.SHIPMENT_CONTAINER_TASK)) {
                     taskDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD);
                 } else {
                     taskDetail.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
@@ -481,6 +481,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
  
  
     //出库自动组盘
+    @Override
     public AjaxResult autoCombination(List<ShipmentDetail> shipmentDetailList){
         int num = 0;
         List<Integer> list=new ArrayList<>();
@@ -501,7 +502,9 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
             List<InventoryDetail> inventoryList = shippingCombinationService.getInventorys(item);
             if(inventoryList.size() < 1 && item.getWaveId() != 0){
                 Wave wave = waveService.getById(item.getWaveId());
-                wave.setStatus(QuantityConstant.WAVE_STATUS_FAILED);
+                wave.setStatus(QuantityConstant.WAVE_STATUS_ERROR);
+                wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_ERROR);
+                wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
                 waveService.updateById(wave);
                 throw new ServiceException("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存，波次失败");
             }
@@ -87,6 +87,9 @@ public class ShipmentDetailController extends BaseController
 		PageDomain pageDomain = TableSupport.buildPageRequest();
 		Integer pageNum = pageDomain.getPageNum();
 		Integer pageSize = pageDomain.getPageSize();
+		List<ShipmentDetail> shipmentDetails =new ArrayList<>();
+		List<ShipmentDetail> shipmentDetailList =new ArrayList<>();
+		List<ShipmentDetail> shipmentDetailLists =new ArrayList<>();
  
 		lambdaQueryWrapper
 				.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
@@ -104,14 +107,30 @@ public class ShipmentDetailController extends BaseController
 			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
 		} else {
 			List<ShipmentDetail> list = shipmentDetailService.list(lambdaQueryWrapper);
-			list.forEach(t->{
+			for(ShipmentDetail item : list){
 				InventoryDetail inventory=new InventoryDetail();
-				inventory.setWarehouseCode(t.getWarehouseCode());
-				inventory.setMaterialCode(t.getMaterialCode());
-				inventory.setInventorySts(t.getInventorySts());
-				t.setInventoryQty(inventoryDetailService.getSumQty(inventory));
-			});
-			return getDataTable(list);
+				inventory.setWarehouseCode(item.getWarehouseCode());
+				inventory.setMaterialCode(item.getMaterialCode());
+				inventory.setInventorySts(item.getInventorySts());
+				item.setInventoryQty(inventoryDetailService.getSumQty(inventory));
+				if(item.getShipQty().compareTo(item.getRequestQty()) !=0){
+					if(item.getInventoryQty().compareTo(new BigDecimal(0)) == 0){
+						shipmentDetails.add(item);
+					}else {
+						shipmentDetailList.add(item);
+					}
+				}else {
+					shipmentDetailLists.add(item);
+				}
+
+			}
+			if(shipmentDetailList !=null && shipmentDetailList.size()>0) {
+				shipmentDetails.addAll(shipmentDetailList);
+			}
+			if(shipmentDetailLists !=null && shipmentDetailLists.size()>0) {
+				shipmentDetails.addAll(shipmentDetailLists);
+			}
+			return getDataTable(shipmentDetails);
 		}
 	}
  
@@ -180,15 +199,16 @@ public class ShipmentDetailController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		for (Integer id : Convert.toIntArray(ids))
 		{
 			ShipmentDetail shipmentDetail=shipmentDetailService.getById(id);
 			if(shipmentDetail == null){
 				return AjaxResult.error("id为"+id+"的单据明细找不到");
 			}
-			if(shipmentDetail.getStatus()>100 && shipmentDetail.getStatus()<500){
+			if(shipmentDetail.getStatus()>=100){
 				return AjaxResult.error("此单据状态在订单池和拣货完成之间，无法删除");
 			}
 		}
@@ -111,8 +111,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
             shipmentHeaderService.saveOrUpdate(shipmentHeader);
             return AjaxResult.success("新增单据明细成功");
         }
-        else
+        else {
             return AjaxResult.error("新增单据明细失败");
+        }
     }
  
  
@@ -125,8 +126,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
     @Override
     @Transactional
     public AjaxResult deleteDetail(String id) {
-        if (StringUtils.isEmpty(id))
+        if (StringUtils.isEmpty(id)) {
             return AjaxResult.error("id不能为空");
+        }
         String[] ids = id.split(",");
         List<Map<String,Integer>> list = shipmentDetailMapper.SelectFirstStatus(id);
         if (list.size() < 1) {
@@ -135,7 +137,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         if (list.size() > 1) {
             return AjaxResult.error("有多个主单据，不能一起删除！");
         }
-        if (list.get(0).get("status") > QuantityConstant.SHIPMENT_HEADER_POOL) {
+        if (list.get(0).get("firstStatus") > QuantityConstant.SHIPMENT_HEADER_POOL) {
             return AjaxResult.error("单据状进入订单池，不允许删除明细");
         }
         Integer result = shipmentDetailMapper.batchDelete(ids);
@@ -155,8 +157,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
             }
             return AjaxResult.success("删除单据明细成功");
         }
-        else
+        else {
             return AjaxResult.error("删除单据明细失败");
+        }
     }
  
     @Override
@@ -243,7 +246,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
             wave.setMasterCode(code);
             wave.setWaveName(waveMaster.getName());
             wave.setStatus(QuantityConstant.WAVE_STATUS_BUILD);
-            wave.setCurrentWaveStep(QuantityConstant.WAVE_STATUS_BUILD.toString());
+            wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_BUILD);
             wave.setTotalShipments(Convert.toIntArray(ids).length);
             wave.setTotalLines(shipmentDetailList.size());
             wave.setTotalQty(qty);
@@ -268,7 +271,11 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         }
  
         for(ShipmentHeader shipmentHeader :shipmentHeaderList){
-            shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);
+            shipmentHeader.setWaveId(wave.getId());
+            shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);
+            if(shipmentHeader.getLastStatus()<QuantityConstant.SHIPMENT_HEADER_WAVE) {
+                shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);
+            }
         }
         flag = shipmentHeaderService.updateBatchById(shipmentHeaderList);
         if(flag == false){
@@ -37,8 +37,9 @@ public class ShipmentDetailHistoryServiceImpl extends ServiceImpl&lt;ShipmentDetail
     @Override
     @Transactional
     public AjaxResult deleteDetail(String id) {
-        if (StringUtils.isEmpty(id))
+        if (StringUtils.isEmpty(id)) {
             return AjaxResult.error("id不能为空");
+        }
         String[] ids = id.split(",");
         List<Map<String,Integer>> list = shipmentDetailHistoryMapper.SelectFirstStatus(id);
         if (list.size() < 1) {
@@ -67,7 +68,8 @@ public class ShipmentDetailHistoryServiceImpl extends ServiceImpl&lt;ShipmentDetail
             }
             return AjaxResult.success("删除单据明细成功");
         }
-        else
+        else {
             return AjaxResult.error("删除单据明细失败");
+        }
     }
 }
@@ -101,8 +101,9 @@ public class ShipmentHeaderHistoryController extends BaseController
 	@PostMapping( "/remove")
 	@ResponseBody
 	public AjaxResult remove(String ids)  {
-		if (StringUtils.isEmpty(ids))
-			return AjaxResult.error("id不能为空");
+		if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
 		for (Integer id : Convert.toIntArray(ids))
 		{
 			boolean result=shipmentHeaderHistoryService.removeById(id);
@@ -2,6 +2,7 @@ package com.huaheng.pc.shipment.shippingCombination.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -19,6 +20,7 @@ import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailServiceImpl;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
+import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -161,6 +163,12 @@ public class ShippingCombinationController extends BaseController {
     @ResponseBody
     public  AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
         ShipmentContainerHeader shipmentContainerHeader= shipmentContainerHeaderService.combination(shipmentCombinationModel);
+        ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
+        shipmentTask.setShipmentContainerHeaderIds(shipmentContainerHeader.getId());
+        AjaxResult ajaxResult = taskHeaderService.createTaskFromShipmentContainers(shipmentTask);
+        if (ajaxResult.hasErr()){
+            throw new ServiceException("任务生成失败");
+        }
         return  AjaxResult.success(shipmentContainerHeader.getId());
     }
  
@@ -174,6 +182,17 @@ public class ShippingCombinationController extends BaseController {
     @ResponseBody
     public AjaxResult autoCombination(String shipmentCode){
         AjaxResult ajaxResult = shipmentContainerHeaderService.autoCombination(shipmentCode);
+        LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeader=Wrappers.lambdaQuery();
+        shipmentContainerHeader.eq(ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_BUILD);
+        List<ShipmentContainerHeader> shipmentContainerHeaders=shipmentContainerHeaderService.list(shipmentContainerHeader);
+        for(ShipmentContainerHeader item: shipmentContainerHeaders){
+            ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
+            shipmentTask.setShipmentContainerHeaderIds(item.getId());
+            AjaxResult ajaxResults = taskHeaderService.createTaskFromShipmentContainers(shipmentTask);
+            if (ajaxResults.hasErr()){
+                throw new ServiceException("任务生成失败");
+            }
+        }
         return ajaxResult;
     }
  
@@ -73,6 +73,8 @@ public class WaveController extends BaseController {
                 .eq(Wave::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .eq(StringUtils.isNotEmpty(wave.getWaveMode()
                 ), Wave::getWaveMode,wave.getWaveMode())
+                .eq(StringUtils.isNotEmpty(wave.getCreatedBy()
+                ), Wave::getCreatedBy,wave.getCreatedBy())
                 .eq(wave.getStatus()!=null, Wave::getStatus,wave.getStatus())
                 .like(StringUtils.isNotEmpty(wave.getWaveName()
                 ), Wave::getWaveName,wave.getWaveName());
@@ -173,6 +175,37 @@ public class WaveController extends BaseController {
         return result;
     }
  
+    /**
+     * 剔除单据
+     */
+    @RequiresPermissions("shipment:wave:cullWave")
+    @Log(title = "出库-波次", operating = "剔除单据", action = BusinessType.UPDATE)
+    @PostMapping("/cullWave")
+    @ResponseBody
+    public AjaxResult cullWave(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        AjaxResult result=waveService.cullWave(ids);
+        return result;
+    }
+
+
+    /**
+     * 波次完成
+     */
+    @RequiresPermissions("shipment:wave:endWave")
+    @Log(title = "出库-波次", operating = "波次完成", action = BusinessType.UPDATE)
+    @PostMapping("/endWave")
+    @ResponseBody
+    public AjaxResult endWave(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        AjaxResult result=waveService.endWave(ids);
+        return result;
+    }
+
  
     /**
      * 释放
@@ -56,14 +56,14 @@ public class Wave implements Serializable {
      */
     @TableField(value = "currentWaveStep")
     @ApiModelProperty(value="当前波次步骤")
-    private String currentWaveStep;
+    private Integer currentWaveStep;
  
     /**
      * 上一波次步骤
      */
     @TableField(value = "lastWaveStep")
     @ApiModelProperty(value="上一波次步骤")
-    private String lastWaveStep;
+    private Integer lastWaveStep;
  
     /**
      * 总单数
@@ -8,24 +8,25 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
 import com.huaheng.pc.shipment.wave.domain.Wave;
 import com.huaheng.pc.shipment.wave.mapper.WaveMapper;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
  
 @Service
 public class WaveService extends ServiceImpl<WaveMapper, Wave> {
@@ -41,6 +42,8 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
     private TaskHeaderService taskHeaderService;
     @Autowired
     private ShipmentHeaderService shipmentHeaderService;
+    @Autowired
+    private ShippingCombinationService shippingCombinationService;
  
     /**
      * 开始波次，对带有此波次号的单据进行后续的后台操作
@@ -59,8 +62,8 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
  
             //1、查看此波次的状态,状态不为o时，无法开始波次
             Wave wave = this.getById(id);
-            if(wave == null || (wave.getStatus()> QuantityConstant.WAVE_STATUS_BUILD &&
-                    wave.getStatus() < QuantityConstant.WAVE_STATUS_FAILED)){
+            if(wave == null || (wave.getCurrentWaveStep()> QuantityConstant.WAVE_STEP_BUILD &&
+                    wave.getCurrentWaveStep() < QuantityConstant.WAVE_STEP_ERROR)){
                 return AjaxResult.error("id为"+id+"的波次找不到，或者状态不能做开始操作");
             }
             waves.add(wave);
@@ -79,15 +82,22 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
  
         //3、自动组盘
         AjaxResult ajaxResult=shipmentContainerHeaderService.autoCombination(list);
-        if(ajaxResult.getData() != null){
-            //4、生成任务
-            shipmentContainerHeaderService.createTask(Arrays.asList(Convert.toIntArray(ajaxResult.getData().toString())));
+        if(ajaxResult.getCode() != 200){
+            for(Wave wave : waves) {
+                wave.setStatus(QuantityConstant.WAVE_STATUS_ERROR);
+                wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_ERROR);
+                wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
+                this.updateById(wave);
+            }
+            throw new ServiceException("波次执行失败,组盘失败");
         }
  
+
         //5、修改波次的状态
         for(Wave wave : waves){
-            wave.setStatus(QuantityConstant.WAVE_STATUS_END);
-            wave.setCurrentWaveStep("生成任务");
+            wave.setStatus(QuantityConstant.WAVE_STATUS_START);
+            wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_START);
+            wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
         }
         Boolean flag = this.updateBatchById(waves);
         if(flag == false){
@@ -98,6 +108,110 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
  
  
     /**
+     * 剔除单据，剔除无法组盘的单据
+     * 1、找到无法组盘的单据
+     * 2、剔除单据
+     * 3、修改波次的状态
+     */
+
+    @Transactional
+    public AjaxResult cullWave(String ids) {
+        //判断波次是否可以完成
+        for (Integer id : Convert.toIntArray(ids)) {
+            Wave wave =this.getById(id);
+            if(wave == null){
+                return AjaxResult.error("id为"+id+"的波次不存在");
+            }
+
+            if(!wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_BUILD) &&
+                    !wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_ERROR)){
+                return AjaxResult.error("id为"+id+"的波次已执行，无法剔除单据");
+            }
+
+            LambdaQueryWrapper<ShipmentDetail> detailLamb = Wrappers.lambdaQuery();
+            detailLamb.eq(ShipmentDetail::getWaveId,id)
+                    .eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+            List<ShipmentDetail> shipmentDetailList =shipmentDetailService.list(detailLamb);
+            for(ShipmentDetail item :shipmentDetailList){
+                List<InventoryDetail> list =shippingCombinationService.getInventorys(item);
+                if(list.isEmpty()){
+                    item.setWaveId(0);
+                    shipmentDetailService.updateById(item);
+                }
+            }
+
+            //修改波次状态
+            wave.setStatus(QuantityConstant.WAVE_STATUS_BUILD);
+            wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_CULL);
+            wave.setLastWaveStep(QuantityConstant.WAVE_STEP_START);
+            wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+            wave.setLastUpdated(new Date());
+            this.updateById(wave);
+        }
+        return AjaxResult.success("波次运行成功");
+    }
+
+
+
+    /**
+     * 完成波次，对带有此波次号的组盘进行后续的后台操作
+     * 1、查看波次是否符合完成波次的条件
+     * 2、生成任务
+     * 3、修改波次的状态
+     */
+
+    @Transactional
+    public AjaxResult endWave(String ids) {
+        //判断波次是否可以完成
+        for (Integer id : Convert.toIntArray(ids)) {
+            Wave wave =this.getById(id);
+            if(wave == null){
+                return AjaxResult.error("id为"+id+"的波次不存在");
+            }
+
+            if(!wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_START)){
+                return AjaxResult.error("id为"+id+"的波次未执行，无法完成");
+            }
+
+            //2、找到此波次的所有阻盘头，生成任务
+            LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLamb = Wrappers.lambdaQuery();
+            shipmentContainerHeaderLamb.eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                    .eq(ShipmentContainerHeader::getWaveId,id);
+            List<ShipmentContainerHeader> shipmentContainerHeaders =shipmentContainerHeaderService.list(shipmentContainerHeaderLamb);
+
+            if(shipmentContainerHeaders.isEmpty()){
+                return AjaxResult.error("id为"+id+"的波次的出库组盘头未找到");
+            }
+
+            //找到未生成出库任务的组盘头
+            List<Integer> idList =new ArrayList<>();
+            for(ShipmentContainerHeader item : shipmentContainerHeaders){
+                if(item.getStatus().equals(QuantityConstant.SHIPMENT_CONTAINER_BUILD)){
+                    idList.add(item.getId());
+                }
+            }
+            if(idList.isEmpty()){
+                return AjaxResult.error("id为"+id+"的波次的出库组盘头都已生成任务");
+            }
+
+            AjaxResult ajaxResult =shipmentContainerHeaderService.createTask(idList);
+            if(ajaxResult.hasErr()){
+                throw new ServiceException("id为"+id+"的波次的出库组盘头生成任务失败");
+            }
+
+            //修改波次状态
+            wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_END);
+            wave.setLastWaveStep(QuantityConstant.WAVE_STEP_START);
+            wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+            wave.setLastUpdated(new Date());
+            this.updateById(wave);
+        }
+        return AjaxResult.success("波次运行成功");
+    }
+
+
+
+    /**
      * 释放波次，执行任务
      * 1、查看此波次的状态，是否可以释放波次
      * 2、查看波次的状态，是成功释放还是失败释放
@@ -112,39 +226,42 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
      */
     @Transactional
     public AjaxResult freed(String ids) {
-        Boolean flag = false;
-        List<TaskDetail> taskDetailList = new ArrayList<>();
-        for (Integer id : Convert.toIntArray(ids)) {
+            Boolean flag = false;
+            for (Integer id : Convert.toIntArray(ids)) {
  
-            //1、查看此波次是否可以释放
-            Wave wave = this.getById(id);
-            if(wave == null || (wave.getStatus()!=QuantityConstant.WAVE_STATUS_END && wave.getStatus()!=QuantityConstant.WAVE_STATUS_FAILED)){
-                return AjaxResult.error(id+"波次不可释放");
-            }
+                //1、查看此波次是否可以释放
+                Wave wave = this.getById(id);
+                 if(wave == null || wave.getStatus().equals(QuantityConstant.WAVE_STATUS_START)){
+                    return AjaxResult.error(id+"波次不可释放,正在执行中");
+                }
  
             //2、查看此波次的状态,看是成功释放还是失败释放
-            if(wave.getStatus() == QuantityConstant.WAVE_STATUS_END) {
-                //成功释放——找到此波次的未执行的子任务列表
-                LambdaQueryWrapper<TaskDetail> lam = Wrappers.lambdaQuery();
-                lam.eq(TaskDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
-                        .eq(TaskDetail::getStatus, QuantityConstant.TASK_STATUS_BUILD)
-                        .eq(TaskDetail::getWaveId, id);
-                List<TaskDetail> taskDetails = taskDetailService.list(lam);
-                if (taskDetails != null) {
-                    taskDetailList.addAll(taskDetails);
-                }
-            }else {
-                //失败释放——找到次波次的所有子单据
+                //失败释放——找到次波次的所有子单据和主单
                 LambdaQueryWrapper<ShipmentDetail> detailLam = Wrappers.lambdaQuery();
                 detailLam.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
                         .eq(ShipmentDetail::getWaveId,wave.getId());
                 List<ShipmentDetail> shipmentDetails =shipmentDetailService.list(detailLam);
  
-                //2.修改子单据的波次为0
+                LambdaQueryWrapper<ShipmentHeader> headerLam =Wrappers.lambdaQuery();
+                headerLam.eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                        .eq(ShipmentHeader::getWaveId,wave.getId());
+                List<ShipmentHeader> shipmentHeaders = shipmentHeaderService.list(headerLam);
+
+                if(shipmentDetails.isEmpty()) {
+                    throw new ServiceException("该波次"+id+"的子单未查到");
+                }
+
+                if(shipmentHeaders.isEmpty()) {
+                    throw new ServiceException("该波次"+id+"的主单未查到");
+                }
+
+                //2.修改主子单据的波次为0
                 //3.修改主子单的状态
                 HashSet<Integer> set = new HashSet<>();
                 for(ShipmentDetail item : shipmentDetails){
-                    if(item.getShipQty().compareTo(item.getRequestQty())!=0) {
+                    if(item.getShipQty().compareTo(item.getRequestQty())==0) {
+                        item.setStatus(QuantityConstant.SHIPMENT_HEADER_GROUPDISK);
+                    }else {
                         item.setStatus(QuantityConstant.SHIPMENT_HEADER_POOL);
                     }
                     item.setWaveId(0);
@@ -154,30 +271,55 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
                 if(flag == false){
                     throw new ServiceException("修改出库子单状态失败");
                 }
-                for(Integer shipmentId :set){
-                    ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentId);
-                    if(shipmentHeader == null){
-                        throw  new ServiceException("没有对应的出库主单");
-                    }
-                    if(shipmentHeader.getFirstStatus()<= QuantityConstant.SHIPMENT_HEADER_WAVE) {
+
+                for(ShipmentHeader shipmentHeader : shipmentHeaders) {
+                    if (shipmentHeader.getFirstStatus() <= QuantityConstant.SHIPMENT_HEADER_WAVE) {
                         shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_POOL);
-                        flag = shipmentHeaderService.updateById(shipmentHeader);
-                        if (flag == false) {
-                            throw new ServiceException("修改出库主单失败");
-                        }
+                    }
+                    if (shipmentHeader.getLastStatus() <= QuantityConstant.SHIPMENT_HEADER_WAVE) {
+                        shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_POOL);
+                    }
+                    flag = shipmentHeaderService.updateById(shipmentHeader);
+                    if (flag == false) {
+                        throw new ServiceException("修改出库主单失败");
                     }
                 }
-            }
-        }
  
-        HashSet<Integer> idSet = new HashSet();
-        //成功释放——遍历子任务列表，找出主单（distinct）id
-        for(TaskDetail item : taskDetailList){
-            idSet.add(item.getTaskId());
-        }
-        //成功释放——将这些主任务执行
-        taskHeaderService.sendTaskToWcs(idSet.toArray(new Integer[idSet.size()]));
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_END)) {
+                    //成功释放——找到此波次的未执行的子任务列表
+                    LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery();
+                    lam.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                            .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD)
+                            .eq(TaskHeader::getWaveId, id);
+                    List<TaskHeader> taskHeaders = taskHeaderService.list(lam);
+                    if (taskHeaders == null) {
+                        throw new ServiceException("该波次的主任务找不到");
+                    }
+                    List<Integer> taskIds =new ArrayList<>();
+                    for(TaskHeader item :taskHeaders){
+                        taskIds.add(item.getId());
+                    }
+                    taskHeaderService.sendTaskToWcs(taskIds.toArray(new Integer[taskIds.size()]));
+                }
  
+                //修改波次状态
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_END)) {
+                    wave.setStatus(QuantityConstant.WAVE_STATUS_END);
+                    wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_FREED);
+                    wave.setLastWaveStep(QuantityConstant.WAVE_STEP_END);
+                }
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STATUS_BUILD)){
+                    wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_FREED);
+                    wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
+                }
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STATUS_ERROR)){
+                    wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_FREED);
+                    wave.setLastWaveStep(QuantityConstant.WAVE_STEP_ERROR);
+                }
+                wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+                wave.setLastUpdated(new Date());
+                this.updateById(wave);
+        }
         return AjaxResult.success("波次释放成功");
     }
 }
@@ -31,8 +31,9 @@ public class DictDataServiceImpl implements IDictDataService
     @Override
     public List<DictData> selectDictDataList(DictData dictData)
     {
-        if (dictData.getWarehouseCode() == null)
+        if (dictData.getWarehouseCode() == null) {
             dictData.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        }
         return dictDataMapper.selectDictDataList(dictData);
     }
  
@@ -106,8 +107,9 @@ public class DictDataServiceImpl implements IDictDataService
     @Override
     public int insertDictData(DictData dictData)
     {
-        if (dictData.getWarehouseCode() == null)
+        if (dictData.getWarehouseCode() == null) {
             dictData.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        }
         dictData.setCreateBy(ShiroUtils.getLoginName());
         return dictDataMapper.insertDictData(dictData);
     }
@@ -139,10 +141,11 @@ public class DictDataServiceImpl implements IDictDataService
         dictData.setDictType(type);
         dictData.setDictValue(dictValue);
         Integer id = dictDataMapper.checkConfig(dictData);
-        if (id == null)
+        if (id == null) {
             return false;
-        else
+        } else {
             return  true;
+        }
     }
  
  
@@ -151,6 +154,7 @@ public class DictDataServiceImpl implements IDictDataService
     * @param warehouseCode
     * @return
     */
+    @Override
     public int deleteDictDataByWarehouseCode(String warehouseCode){
         return dictDataMapper.deleteDictDataByWarehouseCode(warehouseCode);
     }
@@ -160,8 +164,9 @@ public class DictDataServiceImpl implements IDictDataService
     {
         List<DictData> dictDataList=new ArrayList<>();
         for(DictData dictData: dictDatas) {
-            if (dictData.getWarehouseCode() == null)
+            if (dictData.getWarehouseCode() == null) {
                 dictData.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            }
             dictData.setCreateBy(ShiroUtils.getLoginName());
             dictDataList.add(dictData);
         }
@@ -39,8 +39,9 @@ public class DictTypeServiceImpl  implements IDictTypeService
     @Override
     public List<DictType> selectDictTypeList(DictType dictType)
     {
-        if (dictType.getWarehouseCode() == null)
+        if (dictType.getWarehouseCode() == null) {
             dictType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        }
         return dictTypeMapper.selectDictTypeList(dictType);
     }
  
@@ -103,8 +104,9 @@ public class DictTypeServiceImpl  implements IDictTypeService
     @Override
     public int insertDictType(DictType dictType)
     {
-        if (dictType.getWarehouseCode() == null)
+        if (dictType.getWarehouseCode() == null) {
             dictType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        }
         dictType.setCreateBy(ShiroUtils.getLoginName());
         return dictTypeMapper.insertDictType(dictType);
     }
@@ -170,8 +172,9 @@ public class DictTypeServiceImpl  implements IDictTypeService
     {
         List<DictType> dictTypeList=new ArrayList<>();
         for(DictType dictType:dictTypes){
-            if (dictType.getWarehouseCode() == null)
+            if (dictType.getWarehouseCode() == null) {
                 dictType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            }
             dictType.setCreateBy(ShiroUtils.getLoginName());
             dictTypeList.add(dictType);
         }
@@ -102,7 +102,7 @@ public class HomeController extends BaseController {
     @ResponseBody
     public AjaxResult getInventoryStatus(String type){
         List<Map<String, Object>> list=new ArrayList<>();
-        if(type.equals("1")) {
+        if("1".equals(type)) {
             Warehouse warehouse=new Warehouse();
             List<Warehouse> warehouseList=warehouseService.selectListEntityByEqual(warehouse);
             for(Warehouse item:warehouseList) {
@@ -171,15 +171,15 @@ public class HomeController extends BaseController {
         List<TaskDetail> receiptDetails=new ArrayList<>();
         List<TaskDetail> shipmentDetails=new ArrayList<>();
         Map map=new ModelMap();
-        if(type.equals("1")) {
+        if("1".equals(type)) {
             receiptDetails = receiptDetailService.getReceiptQtyLast7Days();
             shipmentDetails = shipmentDetailService.getShipmentQtyLast7Days();
         }
-        if(type.equals("2")){
+        if("2".equals(type)){
             receiptDetails =receiptDetailService.getWarehouseReceipt();
             shipmentDetails=shipmentDetailService.getWarehouseShipment();
         }
-        if(type.equals("3")){
+        if("3".equals(type)){
             receiptDetails =receiptDetailService.getCompanyReceipt();
             shipmentDetails=shipmentDetailService.getCompanyShipment();
         }
@@ -193,7 +193,7 @@ public class HomeController extends BaseController {
     @ResponseBody
     public AjaxResult getInventoryProp(String type){
         List<Map<String, Object>> list=new ArrayList<>();
-        if(type.equals("1")) {
+        if("1".equals(type)) {
             Warehouse warehouse=new Warehouse();
             List<Warehouse> warehouseList=warehouseService.selectListEntityByEqual(warehouse);
             for(Warehouse item:warehouseList) {
@@ -78,7 +78,7 @@ public class IndexController extends BaseController
         for(LinkedHashMap<String, Object> item : results){
             ChartData chartData = new ChartData();
             for(Map.Entry<String, Object> entries : item.entrySet()){
-                if(entries.getKey().equals("状态")){
+                if("状态".equals(entries.getKey())){
                     option.legend().getData().add(entries.getValue());
                     chartData.setName(entries.getValue().toString());
                 }else{
@@ -160,8 +160,9 @@ public class UserController extends BaseController
         }
         AjaxResult ajaxResult = toAjax(userService.updateUser(user));
  
-        if (ShiroUtils.getLoginName().equals(user.getUserName()))
+        if (ShiroUtils.getLoginName().equals(user.getUserName())) {
             ShiroUtils.logout();
+        }
  
         return ajaxResult;
     }
@@ -167,7 +167,7 @@ public class User implements Serializable
  
     public static boolean isAdmin(String loginName)
     {
-        return loginName.equals("superAdmin");
+        return "superAdmin".equals(loginName);
     }
  
     @Override
@@ -417,7 +417,7 @@ public class UserServiceImpl implements IUserService
     {
         Integer userId = StringUtils.isNull(user.getId()) ? -1 : user.getId();
         User info = userMapper.checkPhoneUnique(user.getPhoneNumber());
-        if (StringUtils.isNotNull(info) && info.getId() != userId)
+        if (StringUtils.isNotNull(info) && !info.getId().equals(userId))
         {
             return UserConstants.USER_PHONE_NOT_UNIQUE;
         }
@@ -435,7 +435,7 @@ public class UserServiceImpl implements IUserService
     {
         Integer userId = StringUtils.isNull(user.getId()) ? -1 : user.getId();
         User info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getId() != userId)
+        if (StringUtils.isNotNull(info) && !info.getId().equals(userId))
         {
             return UserConstants.USER_EMAIL_NOT_UNIQUE;
         }
@@ -502,8 +502,9 @@ public class UserServiceImpl implements IUserService
         else
         {
             list =  userMapper.getWarehouseByUserName(loginName);
-            if (list.size()==1)
+            if (list.size()==1) {
                 list=userMapper.getWarehouseByUserCode(loginName);
+            }
  
  
         }
@@ -108,8 +108,9 @@ public class TaskHeaderController extends BaseController {
     @ResponseBody
     public AjaxResult execute(String taskId)
     {
-        if (StringUtils.isEmpty(taskId))
+        if (StringUtils.isEmpty(taskId)){
             return AjaxResult.error("taskId不能为空");
+        }
         AjaxResult ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
         return ajaxResult;
     }
@@ -122,8 +123,9 @@ public class TaskHeaderController extends BaseController {
     @PostMapping( "/completeTaskByWMS")
     @ResponseBody
     public AjaxResult completeTaskByWMS(String taskId){
-        if (StringUtils.isEmpty(taskId))
+        if (StringUtils.isEmpty(taskId)){
             return AjaxResult.error("taskId不能为空");
+        }
         return taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskId), null);
     }
  
@@ -142,6 +144,23 @@ public class TaskHeaderController extends BaseController {
         return taskHeaderService.cancelTask(Convert.toIntArray(ids));
     }
  
-
+    /**
+     * 自动分配任务库位
+     * WCS
+     * @param taskId
+     * @param high
+     * @return
+     */
+    @PostMapping("/setLocationCode")
+    @ResponseBody
+    public AjaxResult setLocationCode( Integer taskId, Integer high){
+        if (taskId == null){
+            return AjaxResult.error("任务id不能为空");
+        }
+        if (high == null){
+            return AjaxResult.error("高库位标识不能为空");
+        }
+        return taskHeaderService.setLocationCode(taskId, high);
+    }
  
 }
@@ -89,4 +89,11 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
     List<MobileTask> mobileFindTransferTask(String containerCode);
  
     AjaxResult completeEmptyOut(TaskHeader taskHeader);
+
+    AjaxResult createAutoEmptyOut(String warehouseCode);
+
+    String getLocationCode(Integer taskId,String warehouseCode,String weight);
+
+    AjaxResult setLocationCode(Integer taskId, Integer high);
+
 }
@@ -13,6 +13,7 @@ import com.huaheng.common.utils.DataUtils;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.mobile.download.Constant;
 import com.huaheng.pc.config.configWarning.service.ConfigWarningService;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
@@ -55,6 +56,7 @@ import com.huaheng.pc.task.taskHeader.domain.MobileTask;
 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -122,7 +124,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @param taskHeaderList
      * @return
      */
-    @Transactional
     @Override
     public List<TaskHeader> preferenceRealize(List<TaskHeader> taskHeaderList) {
         //盘点任务头，默认不显示库位，容器。
@@ -149,7 +150,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @throws Exception
      */
     @Override
-    public AjaxResult completeTask(String locationCode) throws Exception {
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeTask(String locationCode) {
         LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
         taskQueryWrapper.eq(TaskHeader::getToLocation, locationCode);
         List<TaskHeader> list = this.list(taskQueryWrapper);
@@ -168,6 +170,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createReplenishTask(String containerCode, Short taskStatus) {
         LambdaQueryWrapper<ReceiptContainerHeader> headerQueryWrapper = Wrappers.lambdaQuery();
         headerQueryWrapper.eq(ReceiptContainerHeader::getContainerCode, containerCode)
@@ -198,8 +201,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         List<Integer> ids = new ArrayList<>();
         ids.add(containerHeader.getId());
-        createReceiptTask(ids);
-        return null;
+        this.createReceiptTask(ids);
+        return AjaxResult.success("成功！");
     }
  
     /**
@@ -208,6 +211,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<MobileTask> mobileFindTransferTask(String containerCode) {
         /* 查询该容器未完成的盘点任务明细*/
         LambdaQueryWrapper<TaskDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -247,7 +251,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 取消任务
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult cancelTask(Integer[] taskIds) {
         for (int taskId : taskIds) {
             TaskHeader taskHeader = taskHeaderService.getById(taskId);
@@ -287,7 +291,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 shipmentContainerHeaderService.updateById(shipmentContainerHeader);
             }
             //盘点取消任务，恢复明细状态为1
-            if (taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_CYCLECOUNT) {
+            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_CYCLECOUNT)) {
  
                 CycleCountDetail cycleCountDetail = new CycleCountDetail();
                 cycleCountDetail.setCompanyCode(taskDetail.getCompanyCode());
@@ -308,7 +312,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 }
  
             }
-            if (taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_SHELF || taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_PICKING) {
+            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF) || taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_PICKING)) {
                 if (taskHeader.getToLocation() != null) {
                     //更新托盘、库位状态
                     locationService.updateStatus(taskHeader.getToLocation(), "empty");
@@ -342,6 +346,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createQuickTask(String containerCode) {
         LambdaQueryWrapper<ReceiptContainerHeader> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ReceiptContainerHeader::getContainerCode, containerCode)
@@ -360,33 +365,33 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (containerDetailList.isEmpty()) {
             throw new SecurityException("没有组盘明细，请先组盘");
         }
-        if (receiptContainerHeader.getStatus().equals(QuantityConstant.RECEIPT_HEADER_BUILD)) {
+        if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_HEADER_BUILD.shortValue()) {
             String ids = String.valueOf(receiptContainerHeader.getId());
             if (StringUtils.isEmpty(ids)){
                 return AjaxResult.error("id不能为空");
             }
             List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
-            for (int i = 0; i<idList.size(); i++){
-                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
-                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
-                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
-                    receivingService.position(receiptContainerDetail);
-                }
-
-            }
+//            for (int i = 0; i<idList.size(); i++){
+//                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
+//                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
+//                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
+//                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+//                    receivingService.position(receiptContainerDetail);
+//                }
+//
+//            }
             if (StringUtils.isEmpty(ids)){
                 return AjaxResult.error("id不能为空");
             }
-            for (int i = 0; i<idList.size(); i++){
-                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
-                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
-                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
-                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
-                    receivingService.position(receiptContainerDetail);
-                }
-
-            }
+//            for (int i = 0; i<idList.size(); i++){
+//                LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
+//                lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
+//                List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
+//                for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+//                    receivingService.position(receiptContainerDetail);
+//                }
+//
+//            }
  
             Integer maxId = idList.stream().max(Comparator.comparing(Integer::intValue)).orElse(null);
  
@@ -396,7 +401,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     .le(ReceiptContainerHeader::getId, maxId);
             return taskHeaderService.createReceiptTask(idList);
         }
-        return null;
+        return AjaxResult.error("生成入库任务失败");
     }
  
     /**
@@ -406,7 +411,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel) {
         Boolean flag = true;
         Integer shipmentContainerHeaderId = shipmentTaskCreateModel.getShipmentContainerHeaderIds();
@@ -510,7 +515,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             if (flag == false) {
                 throw new ServiceException("新建任务明细失败，sql报错");
             }
-
             shipmentContainerDetail.setStatus(QuantityConstant.SHIPMENT_CONTAINER_TASK);
         }
         //更新货位状态
@@ -525,7 +529,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             throw new ServiceException("修改组盘明细状态明细失败，sql报错");
         }
         return AjaxResult.success(task.getId());
-
     }
  
     /**
@@ -533,7 +536,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 执行任务
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
         TaskHeader task = null;
         for (Integer taskId : taskIds) {
@@ -620,30 +623,41 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
-    @Transactional
-    public AjaxResult completeTaskByWMS(Integer[] taskIds, String[] weight) {
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeTaskByWMS(Integer[] taskIds, String[] weightConvert) {
         for (int i = 0;i<taskIds.length;i++) {
             TaskHeader task = taskHeaderService.getById(taskIds[i]);
+
             if (task == null) {
                 throw new ServiceException("任务" + taskIds[i] + "未找到，执行中止");
             }
-
+            //任务写入重量
+            String weight = "";
+            if (StringUtils.isNotNull(weightConvert)) {
+                weight = weightConvert[i];
+            }
+            task.setWeight(weight);
             //如果已完成则不管
             if (task.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
                 return AjaxResult.success("任务(" + taskIds[i] + ")任务已经是完成的！");
  
             }
+            //整盘入库,空托入库库位自动分配
+            //整盘入库手动完成分配库位，已分配则略过
+            if(task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLERECEIPT) || task.getTaskType().equals(QuantityConstant.TASK_TYPE_EMPTYRECEIPT)){
+                if(StringUtils.isEmpty(task.getToLocation())){
+                    //自动分配库位
+                    String result =  this.getLocationCode(task.getId(),ShiroUtils.getWarehouseCode(),weight);
+                    task.setToLocation(result);
+                }
+            }
             //如果没有库位不能完成
-//            if (StringUtils.isEmpty(task.getFromLocation())) {
-//                throw new ServiceException("任务" + taskId + "没有库位，执行中止");
-//            }
-            if (StringUtils.isNotNull(weight)) {
-                task.setWeight(weight[i]);
+            if (StringUtils.isEmpty(task.getFromLocation()) && StringUtils.isEmpty(task.getToLocation())) {
+                throw new ServiceException("任务" + task.getId() + "没有库位，执行中止");
             }
  
             this.completeTask(task);
         }
-
         return AjaxResult.success("完成任务成功！");
     }
  
@@ -652,6 +666,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      *
      * @param task
      */
+    @Transactional(rollbackFor = Exception.class)
     public void completeTask(TaskHeader task) {
         //区分任务类型
         if (task.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF) ) {
@@ -690,7 +705,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 完成入库任务
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeReceiptTask(TaskHeader task) {
         List<Map<String, Object>> taskReceiptContainerDetail = taskHeaderMapper.getReceiptTask(task.getId());
         if (taskReceiptContainerDetail.size() < 1) {
@@ -711,8 +726,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
                     header.setCompanyCode(task.getCompanyCode());//货主
                     header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
+                    header.setContainerStatus("some");
                     header.setLocationCode(task.getToLocation());
-                    header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
+                    header.setTotalQty(DataUtils.getBigDecimal(map.get("totalQty")));//总数量
                     header.setLocking(1);
                     header.setEnable(1);
                     header.setTotalWeight(task.getWeight());
@@ -743,6 +759,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 //                    detail.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
 //                    detail.setExpirationDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("expirationDate").toString()));//失效日期
                     detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
+                    detail.setLockedQty(DataUtils.getBigDecimal(0));
                     detail.setTaskQty(DataUtils.getBigDecimal(0));
                     detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
                     detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
@@ -754,9 +771,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     detail.setLastUpdatedBy(ShiroUtils.getLoginName());
                     LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
                     lambdaUpdateWrapper.eq(InventoryDetail::getId, DataUtils.getInteger(map.get("receiptDetailId")));
-                    if (!inventoryDetailService.update(detail, lambdaUpdateWrapper))
+                    if (!inventoryDetailService.update(detail, lambdaUpdateWrapper)){
                         throw new ServiceException("更新入库单明细失败");
-
+                    }
                 }
                 //记录库存交易记录
                 InventoryTransaction inventoryTransaction = new InventoryTransaction();
@@ -799,18 +816,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 task.setLastUpdated(new Date());
                 LambdaUpdateWrapper<TaskHeader> taskHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 taskHeaderLambdaUpdateWrapper.eq(TaskHeader::getId, task.getId());
-                if (!taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper))
+                if (!taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper)){
                     throw new ServiceException("更新任务主表失败");
-
+                }
                 //修改库位状态和对应的容器
                 Location location = new Location();
                 location.setContainerCode(task.getContainerCode());
                 location.setStatus("empty");
                 LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
-                if (!locationService.update(location, locationLambdaUpdateWrapper))
+                if (!locationService.update(location, locationLambdaUpdateWrapper)){
                     throw new ServiceException("更新库位失败");
-
+                }
                 //修改容器状态和对应的库位
                 Container container = new Container();
                 container.setLocationCode(task.getToLocation());
@@ -828,9 +845,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
                 LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId")));
-                if (!receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
+                if (!receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper)){
                     throw new ServiceException("更新组盘状态失败");
-
+                }
  
                 //修改入库组盘头表状态
  
@@ -868,6 +885,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult mobileCreateReceiptTask(String containerCode, String sourceLocation) {
         LambdaQueryWrapper<ReceiptContainerHeader> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ReceiptContainerHeader::getContainerCode, containerCode)
@@ -895,8 +913,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 生成
      * 立库移库
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) {
  
         //源库位校验
@@ -909,7 +927,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (loc1 == null) {
             return AjaxResult.error("源库位：" + sourceLocation + "未找到");
         }
-        if (!loc1.getStatus().equals("empty")) {
+        if (!"empty".equals(loc1.getStatus())) {
             return AjaxResult.error("源库位：" + sourceLocation + "状态非空闲");
         }
         if (StringUtils.isEmpty(loc1.getContainerCode())) {
@@ -934,7 +952,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (loc2 == null) {
             return AjaxResult.error("目标库位：" + destinationLocation + "未找到");
         }
-        if (!loc2.getStatus().equals("empty")) {
+        if (!"empty".equals(loc2.getStatus())) {
             return AjaxResult.error("目标库位：" + destinationLocation + "状态非空闲");
         }
         if (StringUtils.isNotEmpty(loc2.getContainerCode())) {
@@ -1115,7 +1133,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 任务
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createCheckOutTask(String[] ids) {
  
         for (String id : ids) {
@@ -1130,7 +1148,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             if (loc == null) {
                 throw new ServiceException("库存没有库位！");
             }
-            if (!loc.getStatus().equals("empty")) {
+            if (!"empty".equals(loc.getStatus())) {
                 throw new ServiceException(inventoryHeader.getLocationCode() + "状态非空闲，操作失败");
             }
             if (StringUtils.isEmpty(loc.getContainerCode())) {
@@ -1195,8 +1213,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 出库查看
      * 更新状态,解锁库存
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeSeeOutTask(TaskHeader taskHeader) {
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
         taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
@@ -1240,8 +1258,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @param taskHeader
      * @return
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeCycleCountTask(TaskHeader taskHeader) {
         /*盘点完成，传入任务主单，查出任务明细，通过任务明细查找盘点的明细单，
         完成任务同时，修改盘点细单和主单的状态，完成后库存锁复位*/
@@ -1293,7 +1311,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      *
      * @param taskHeader
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void completeEmptyIn(TaskHeader taskHeader) {
  
         //完成任务,修改主单和明细状态
@@ -1322,6 +1340,30 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         //解锁库位，更新容器
         locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(), taskHeader.getContainerCode(), "empty");
  
+        //写入库存头表
+        InventoryHeader inventoryHeader = new InventoryHeader();
+        inventoryHeader.setWarehouseCode(taskHeader.getWarehouseCode());
+        inventoryHeader.setLocationCode(taskHeader.getToLocation());
+        inventoryHeader.setContainerCode(taskHeader.getContainerCode());
+        inventoryHeader.setContainerStatus("empty");
+        inventoryHeader.setCompanyCode(taskHeader.getCompanyCode());
+        inventoryHeader.setMaterialSkuQty("0");
+        inventoryHeader.setTotalWeight("0");
+        inventoryHeader.setTotalQty(new BigDecimal(0));
+        inventoryHeader.setTotalLines(0);
+        inventoryHeader.setProjectNos("");
+        inventoryHeader.setBatchs("");
+        inventoryHeader.setLots("");
+        inventoryHeader.setLockRemark("");
+        inventoryHeader.setCreated(new Date());
+        inventoryHeader.setCreatedBy(ShiroUtils.getLoginName());
+        inventoryHeader.setLastUpdated(new Date());
+        inventoryHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+        Boolean j = inventoryHeaderService.save(inventoryHeader);
+        if(!j){
+            throw new ServiceException("新增空托库存头失败！");
+
+        }
     }
  
     /**
@@ -1329,8 +1371,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      *
      * @param taskHeader
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeEmptyOut(TaskHeader taskHeader) {
  
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
@@ -1356,7 +1398,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(), "", "empty");
         //更新容器信息
         containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(), "", "empty");
-        return AjaxResult.success("完成");
+        //删除库存头表
+        InventoryHeader tmp = new InventoryHeader();
+        tmp.setContainerStatus("empty");
+        tmp.setContainerCode(taskHeader.getContainerCode());
+        tmp.setLocationCode(taskHeader.getFromLocation());
+        LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(tmp);
+        Boolean j = inventoryHeaderService.remove(inventoryHeaderLambdaQueryWrapper);
+        if(!j){
+            throw new ServiceException("空库位记录删除失败!");
+        }
+        return AjaxResult.success("空托出库完成");
     }
  
     /**
@@ -1366,7 +1418,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createReceiptTask(List<Integer> ids) {
         for (Integer id : ids) {
             ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id);
@@ -1378,7 +1430,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 throw new ServiceException("任务不在当前仓库！");
             }
  
-
             //锁定容器
             Container container = new Container();
             container.setStatus("lock");
@@ -1481,7 +1532,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 }
             }
         }
-        return AjaxResult.success("生成上架任务成功！");
+        return AjaxResult.success("生成上架任务成功");
     }
  
     /**
@@ -1512,7 +1563,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 BigDecimal orignalQty = inventoryDetail.getQty();
                 //减扣库存单
                 InventoryHeader inventoryHeader = inventoryHeaderService.getById(inventoryDetail.getInventoryHeaderId());
-                inventoryHeader.setTotalQty(inventoryDetail.getQty().subtract(taskDetail.getQty()).intValue());
+                inventoryHeader.setTotalQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
                 //扣减库存明细
                 inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(taskDetail.getQty()));
                 inventoryDetail.setQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
@@ -1561,9 +1612,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 //                shipmentHeaderService.updateShipmentStatus(shipmentHeader.getId());
             }
             /* 物料预警*/
-            configWarningService.materialWarning(taskDetail.getMaterialCode(), taskDetail.getMaterialName());
-            /* 空库位剩余数量预警*/
-            configWarningService.emptyLocationWarning();
+//            configWarningService.materialWarning(taskDetail.getMaterialCode(), taskDetail.getMaterialName());
+//            /* 空库位剩余数量预警*/
+//            configWarningService.emptyLocationWarning();
         }
         //设置主任务为已执行
         task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
@@ -1592,7 +1643,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             throw new ServiceException("系统无此容器");
         }
         if (task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT)) {
-            if (ctn.getContainerType().equals("LS")) {
+            if ("LS".equals(ctn.getContainerType())) {
                 Boolean flag = containerService.removeById(ctn.getId());
                 if (flag == false) {
                     throw new ServiceException("删除临时容器失败");
@@ -1665,10 +1716,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 Map<String, Integer> status = shipmentDetailService.selectStatus(shipmentHeader.getId());
                 Integer maxStatus = status.get("maxStatus");
                 Integer minStatus = status.get("minStatus");
-                if (maxStatus == QuantityConstant.SHIPMENT_HEADER_COMPLETED) {
+                if (maxStatus.equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)) {
                     shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
                 }
-                if (minStatus == QuantityConstant.SHIPMENT_HEADER_COMPLETED) {
+                if (minStatus.equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)) {
                     shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
                 }
                 shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -1676,8 +1727,206 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 shipmentHeaderService.updateById(shipmentHeader);
             }
         }
+    }
  
+    /**
+     * 自动空托出库
+     * */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult createAutoEmptyOut(String warehouseCode){
+        /*先查询容器表，选中空托盘，再查询库存核实*/
+        //该容器中有库位信息，并且状态是空
+        List<Location> locationsList = locationService.selectContainerEmpty(warehouseCode);
+        if(locationsList.size() == 0){
+            throw new ServiceException("立库中没有空容器！");
+        }
+        //根据入库顺序正序排列取第一个
+        Location location = locationsList.get(0);
+        //反查库位
+        Container containerTmp = new Container();
+        containerTmp.setWarehouseCode(location.getWarehouseCode());
+        containerTmp.setCode(location.getContainerCode());
+        LambdaQueryWrapper<Container> containerLambda = Wrappers.lambdaQuery(containerTmp);
+        Container container = containerService.getOne(containerLambda);
+        if(container == null){
+            throw new ServiceException("选中的库位容器错误，请确认库位和容器！");
+        }
+        //生成空容器出库任务
+        inventoryHeaderService.createEmptyOut(container.getCode(), location.getCode());
+        return AjaxResult.success("空容器出库任务已下发!",container.getCode());
     }
  
+    /**
+     * 任务自动分配库位
+     *
+     * */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String getLocationCode(Integer taskId,String warehouseCode,String weight){
+
+        TaskHeader task = this.getById(taskId);
+        if (task == null) {
+            throw new ServiceException("找不到id为"+ taskId +"的任务");
+        }
+        if (StringUtils.isNotEmpty(task.getToLocation())) {
+            throw new ServiceException("任务已经有目的库位");
+        }
+        if(!warehouseCode.equals(task.getWarehouseCode())){
+            throw new ServiceException("仓库错误！");
+        }
+        /*if(task.getIsDoubleIn() != 1 ){
+            if(StringUtils.isNotEmpty(task.getToLocation())){
+                return AjaxResult.success("已经存在目的库位不再分配！");
+            }
+        }*/
+        //查询容器,根据容器类型分配库位
+        Container tmp = new Container();
+        tmp.setCode(task.getContainerCode());
+        tmp.setWarehouseCode(warehouseCode);
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery(tmp);
+        Container container = containerService.getOne(containerLambdaQueryWrapper);
+        //库位筛选
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.eq(Location::getWarehouseCode,task.getWarehouseCode())
+                .eq(Location::getContainerCode,"")
+                .eq(Location::getStatus,"empty")
+                .eq(Location::getDeleted,false);
+        /*if(container.getContainerType().equals("L")){
+            locationLambdaQueryWrapper.eq(Location::getRoadway,"2")
+                    .le(Location::getIColumn,8); //小于等于
+        }
+        else if(container.getContainerType().equals("M")) {
+            locationLambdaQueryWrapper.eq(Location::getRoadway,"2")
+                    .gt(Location::getIColumn,8);//大于
+        }
+        else if(container.getContainerType().equals("S")){
+            locationLambdaQueryWrapper.eq(Location::getRoadway,"1");
+        }
+        else if(container.getContainerType().equals("D")){
+            return AjaxResult.success("地面库区不自动分配库位");
+        }*/
+
+        List<Location> locations = locationService.list(locationLambdaQueryWrapper);
+        if (locations.size() == 0) {
+            throw new ServiceException("没有空闲库位！");
+        }
+        //随机取库位
+        Random rand = new Random();
+        Location location = locations.get(rand.nextInt(locations.size()));
+        if (location == null) {
+            throw new ServiceException("库位分配错误！");
+        }
+        //锁定库位
+        locationService.updateStatus(location.getCode(),"lock");
+        //给组盘分配库位
+        ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
+        receiptContainerHeader.setId(task.getAllocationHeadId());
+        receiptContainerHeader.setToLocation(location.getCode());
+        receiptContainerHeader.setContainerCode(container.getCode());
+        receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        receiptContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
+        receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+        //LambdaQueryWrapper<ReceiptContainerHeader> rchlqw = Wrappers.lambdaQuery(receiptContainerHeader);
+        receiptContainerHeaderService.saveOrUpdate(receiptContainerHeader);
+        //组盘明细分配库位
+        ReceiptContainerDetail tmpe = new ReceiptContainerDetail();
+        tmpe.setReceiptContainerId(task.getAllocationHeadId());
+        tmpe.setWarehouseCode(task.getWarehouseCode());
+        LambdaQueryWrapper<ReceiptContainerDetail> receiptContainerDetailLambda = Wrappers.lambdaQuery(tmpe);
+        List<ReceiptContainerDetail> receiptContainerDetailList = receiptContainerDetailService.list(receiptContainerDetailLambda);
+        //stream修改库位
+        receiptContainerDetailList
+                .stream()
+                .forEach(r -> r.setLocationCode(receiptContainerHeader.getToLocation()));
+        receiptContainerDetailService.updateBatchById(receiptContainerDetailList);
+        //给子任务分配库位
+        TaskDetail tdtmp = new TaskDetail();
+        tdtmp.setTaskId(task.getId());
+        tdtmp.setWarehouseCode(task.getWarehouseCode());
+        tdtmp.setTaskType(task.getTaskType());
+        LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery(tdtmp);
+        List<TaskDetail> taskDetails = taskDetailService.list(taskDetailLambdaQueryWrapper);
+        taskDetails.stream().forEach(t -> t.setToLocation(task.getToLocation()));
+        taskDetailService.updateBatchById(taskDetails);
+        //给任务分配库位
+        task.setToLocation(location.getCode());
+        task.setWeight(weight);
+        //task.setFromLocation(location.getCode());
+        //LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(task);
+        this.saveOrUpdate(task);
+        return location.getCode();
+    }
+
+
+    /**
+     * 自动分配库位
+     * @param taskId  任务号
+     * @param high 1是高库位，否则低库位
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult setLocationCode(Integer taskId, Integer high)    {
+        TaskHeader taskHeader = this.getById(taskId);
+        if (taskHeader == null) {
+            throw new ServiceException("找不到id为"+ taskId +"的任务！");
+        }
+        if (StringUtils.isNotEmpty(taskHeader.getToLocation())) {
+            return AjaxResult.success("任务已经有目的库位，不需要再分配");
+        }
+        Location location = new Location();
+        location.setWarehouseCode(ShiroUtils.getWarehouseCode());
+
+//        location.setRoadway(taskHeader.getr());//指定巷道
+        location.setContainerCode("");
+//        location.setZoneCode(taskHeader.getz());
+        location.setStatus("empty");
+        location.setDeleted(false);
+        if("M".equals(taskHeader.getContainerCode().substring(0,1))){
+            if (high.intValue() == 1) {
+                location.setILayer(5);
+            }
+        }
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery(location);
+        location = locationService.getOne(locationLambdaQueryWrapper);
+        if (location == null) {
+            throw new ServiceException("没有对应库位可以分配给容器了！");
+        }
+        //锁定库位
+        location.setStatus("lock");
+        locationService.update(location, locationLambdaQueryWrapper);
+        //给组盘分配库位
+
+        int internalTaskType = taskHeader.getInternalTaskType();
+        if(internalTaskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT.intValue() || internalTaskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT.intValue() ) {
+            ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
+            receiptContainerHeader.setId(taskHeader.getAllocationHeadId());
+            receiptContainerHeader.setToLocation(location.getCode());
+            LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderlLambdaQueryWrapper = Wrappers.lambdaQuery(receiptContainerHeader);
+            receiptContainerHeaderService.update(receiptContainerHeader, receiptContainerHeaderlLambdaQueryWrapper);
+            //给子任务分配库位
+            TaskDetail condition = new TaskDetail();
+            condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            condition.setTaskId(taskHeader.getId());
+            LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery(condition);
+            TaskDetail taskDetail = taskDetailService.getOne(taskDetailLambdaQueryWrapper);
+            if (taskDetail != null) {
+                taskDetail.setToLocation(location.getCode());
+                taskDetailService.update(taskDetail, taskDetailLambdaQueryWrapper);
+            }
+        }
+        //给任务分配库位
+        taskHeader.setToLocation(location.getCode());
+        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(taskHeader);
+        this.update(taskHeader, taskHeaderLambdaQueryWrapper);
+        return AjaxResult.success("生成库位成功",location.getCode());
+
+    }
+
+
+
+
+
  
 }
 \ No newline at end of file
@@ -2,25 +2,25 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 主库
-#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
+spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/xinyi_wms?characterEncoding=utf8&serverTimezone=GMT%2b8
+#spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
  
-#spring.datasource.druid.master.username=softhuaheng
-#spring.datasource.druid.master.password=HHrobot123.
-spring.datasource.druid.master.username=root
-spring.datasource.druid.master.password=123456
+spring.datasource.druid.master.username=softhuaheng
+spring.datasource.druid.master.password=HHrobot123.
+#spring.datasource.druid.master.username=root
+#spring.datasource.druid.master.password=123456
 # 从库
 spring.datasource.druid.slave.open = true
 spring.datasource.druid.slave.url=jdbc:mysql://199.19.109.117:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.username=softhuaheng
 #spring.datasource.druid.master.password=HHrobot123.
 # 初始连接数
-spring.datasource.druid.initial-size=10
+spring.datasource.druid.initial-size=4
 # 最大连接池数量
-spring.datasource.druid.max-active=100
+spring.datasource.druid.max-active=10
 # 最小连接池数量
-spring.datasource.druid.min-idle=10
+spring.datasource.druid.min-idle=4
 # 配置获取连接等待超时的时间
 spring.datasource.druid.max-wait=60000
 # 打开PSCache，并且指定每个连接上PSCache的大小
@@ -215,22 +215,22 @@
     <!--</appender>-->
  
     <!--将日志传到数据库 表logging_event-->
-	<appender name="DB" class="ch.qos.logback.classic.db.DBAppender">
-		<connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">
-			<dataSource class="${dataSource}">
-				<driverClassName>${driverClassName}</driverClassName>
-				<url>${url}</url>
-				<username>${username}</username>
-				<password>${password}</password>
-			</dataSource>
-		</connectionSource>
+	<!--<appender name="DB" class="ch.qos.logback.classic.db.DBAppender">-->
+		<!--<connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
+			<!--<dataSource class="${dataSource}">-->
+				<!--<driverClassName>${driverClassName}</driverClassName>-->
+				<!--<url>${url}</url>-->
+				<!--<username>${username}</username>-->
+				<!--<password>${password}</password>-->
+			<!--</dataSource>-->
+		<!--</connectionSource>-->
  
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>ERROR</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-	</appender>
+		<!--<filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+			<!--<level>ERROR</level>-->
+			<!--<onMatch>ACCEPT</onMatch>-->
+			<!--<onMismatch>DENY</onMismatch>-->
+		<!--</filter>-->
+	<!--</appender>-->
  
 	<!-- 显示形成的sql、使用的参数、结果集 -->
     <!--<logger name="java.sql" level="DEBUG" >-->
@@ -254,7 +254,7 @@
         <appender-ref ref="file_info" />
 		<appender-ref ref="file_warn"/>
 		<appender-ref ref="file_error"/>
-		<appender-ref ref="DB"/>
+		<!--<appender-ref ref="DB"/>-->
     </root>
  
  
@@ -54,8 +54,8 @@
 		INNER JOIN warehouse_company wc ON wc.companyId=c.id AND wc.warehouseCode = #{warehouseCode}
   </select>
   <select id="selectByWarehouseCode" resultType="com.huaheng.pc.config.company.domain.Company">
-        select company.id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId
-        where company.warehouseCode = #{warehouseCode}
+       select c.id, c.name ,c.code from company c INNER JOIN warehouse_company w ON c.id = w.companyId
+        where c.warehouseCode = #{warehouseCode}
   </select>
  
   <select id="selectListEntityByEqual" resultType="com.huaheng.pc.config.company.domain.Company">
@@ -35,10 +35,18 @@
   </sql>
  
     <select id="getEmptyContainerInLocation" resultType="com.huaheng.pc.config.location.domain.Location">
-        SELECT * FROM location t
+        SELECT t.id, t.code, t.warehouseCode, t.zoneCode, t.locationType, t.containerCode, t.iRow, t.iColumn, t.iLayer,
+        t.iGrid, t.roadway, t.status, t.`name`,  t.lastCycleCountDate, t.created, t.createdBy, t.lastUpdated, t.lastUpdatedBy,
+        t.version, t.userDef1, t.userDef2, t.userDef3, t.userDef4, t.userDef5, t.userDef6, t.userDef7, t.userDef8,
+        t.systemCreated
+        FROM location t
         <where>
-            t.zoneCode = 'L' AND t.warehouseCode = #{warehouseCode} AND t.status='empty' AND t.containerCode !='' AND t.containerCode is not NULL
-            AND t.`code` NOT in (SELECT b.locationCode FROM inventory_header b WHERE b.warehouseCode = #{warehouseCode} )
+            t.locationType = 'LK'
+            AND t.warehouseCode = #{warehouseCode}
+            AND t.status='empty'
+            AND t.containerCode !=''
+            AND t.containerCode is not NULL
+            AND t.`code` NOT in (SELECT b.locationCode FROM inventory_detail b WHERE b.warehouseCode = #{warehouseCode} )
             <if test="containerCode != null and containerCode !=''">
                 and t.containerCode = #{containerCode}
             </if>
@@ -48,6 +56,30 @@
         </where>
     </select>
  
+<!--    <select id="getEmptyContainerInLocation" resultType="com.huaheng.pc.config.location.domain.Location">
+        SELECT t.id, t.code, t.warehouseCode, t.zoneCode, t.locationType, t.containerCode, t.iRow, t.iColumn, t.iLayer,
+        t.iGrid, t.roadway, t.status, t.`name`,  t.lastCycleCountDate, t.created, t.createdBy, t.lastUpdated, t.lastUpdatedBy,
+        t.version, t.userDef1, t.userDef2, t.userDef3, t.userDef4, t.userDef5, t.userDef6, t.userDef7, t.userDef8,
+        t.systemCreated
+        FROM location t
+        INNER JOIN ( SELECT locationCode,containerCode FROM inventory_header WHERE containerStatus = 'empty' ) i
+        on i.containerCode = t.containerCode
+        AND i.locationCode = t.code
+        <where>
+            t.locationType = 'LK'
+            AND t.warehouseCode = #{warehouseCode}
+            AND t.status='empty'
+            AND t.containerCode !=''
+            AND t.containerCode is not NULL
+            <if test="containerCode != null and containerCode !=''">
+                and t.containerCode = #{containerCode}
+            </if>
+            <if test="locationCode != null and locationCode !=''">
+                and t.`code` = #{locationCode}
+            </if>
+        </where>
+    </select>-->
+
     <update id="updateLocationCodeAndStatus">
          UPDATE container set `status`=#{status}, locationCode=#{locationCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{containerCode}
     </update>
@@ -30,11 +30,12 @@
     <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
     <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
     <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
+      <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer, 
-    iGrid, roadway, `name`, `enable`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy,
+    iGrid, roadway, status, `name`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy,
     version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
     systemCreated
   </sql>
@@ -96,7 +97,30 @@
     </select>
  
   <select id="pickLocation" resultType="com.huaheng.pc.config.location.domain.Location">
-        select * from location
-        where containerCode != '' and status = "empty"
+        select id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer,
+                iGrid, roadway, status, `name`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy,
+                version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
+                systemCreated from location
+        where containerCode != '' and status = 'empty'
     </select>
+
+    <select id="selectContainerEmpty" resultType="com.huaheng.pc.config.location.domain.Location">
+        SELECT id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer,
+        iGrid, roadway, `name`, `enable`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy,
+        version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
+        systemCreated
+        FROM location t
+        <where>
+            t.warehouseCode = #{warehouseCode}
+            AND t.status='empty'
+            AND t.containerCode !=''
+            AND t.containerCode is not NULL
+            AND t.`code` NOT in
+            (SELECT b.locationCode FROM inventory_detail WHERE b.warehouseCode = #{warehouseCode})
+            ORDER BY t.lastUpdated ASC
+        </where>
+    </select>
+
+
+
 </mapper>
 \ No newline at end of file
@@ -57,10 +57,10 @@
  
  
   <select id="SelectFirstStatus" resultType="java.util.Map">
-        SELECT h.id, h.firstStatus
+        SELECT h.id, h.firstStatus, h.status
         FROM shipment_header h
         INNER JOIN shipment_detail d ON h.id = d.shipmentId AND d.id IN (#{ids})
-        GROUP BY h.id,firstStatus
+        GROUP BY h.id,h.firstStatus
     </select>
  
   <delete id="batchDelete">
@@ -65,30 +65,30 @@
                 <input id="shipmentGroupSize" name="shipmentGroupSize" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">是否补货：</label>
-            <div class="col-sm-8">
-                <div class="onoffswitch">
-                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="needReplenishment" name="needReplenishment">
-                    <label class="onoffswitch-label" for="needReplenishment">
-                        <span class="onoffswitch-inner"></span>
-                        <span class="onoffswitch-switch"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">取消波次时保留补货任务：</label>
-            <div class="col-sm-8">
-                <div class="onoffswitch">
-                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="holdRplnTask" name="holdRplnTask">
-                    <label class="onoffswitch-label" for="holdRplnTask">
-                        <span class="onoffswitch-inner"></span>
-                        <span class="onoffswitch-switch"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
+        <!--<div class="form-group">-->
+            <!--<label class="col-sm-3 control-label">是否补货：</label>-->
+            <!--<div class="col-sm-8">-->
+                <!--<div class="onoffswitch">-->
+                    <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="needReplenishment" name="needReplenishment">-->
+                    <!--<label class="onoffswitch-label" for="needReplenishment">-->
+                        <!--<span class="onoffswitch-inner"></span>-->
+                        <!--<span class="onoffswitch-switch"></span>-->
+                    <!--</label>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">-->
+            <!--<label class="col-sm-3 control-label">取消波次时保留补货任务：</label>-->
+            <!--<div class="col-sm-8">-->
+                <!--<div class="onoffswitch">-->
+                    <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="holdRplnTask" name="holdRplnTask">-->
+                    <!--<label class="onoffswitch-label" for="holdRplnTask">-->
+                        <!--<span class="onoffswitch-inner"></span>-->
+                        <!--<span class="onoffswitch-switch"></span>-->
+                    <!--</label>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
         <!--<div class="form-group">
             <label class="col-sm-3 control-label">数据版本：</label>
             <div class="col-sm-8">
@@ -211,12 +211,12 @@
             shipmentGroupSize: {
                 required: true,
             },
-            holdRplnTask: {
-                required: true,
-            },
-            needReplenishment: {
-                required: true,
-            }
+            // holdRplnTask: {
+            //     required: true,
+            // },
+            // needReplenishment: {
+            //     required: true,
+            // }
         },
         submitHandler: function(form) {
             var tableValue = $.common.getTableValue("#form-waveMaster-add");