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

# Conflicts: # src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
huhai
2 parents 5f854853 b43696fc
Showing 99 changed files with 985 additions and 393 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/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
src/main/java/com/huaheng/mobile/download/ApkController.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")
@@ -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,10 +24,12 @@ 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("当前已经是最新版本");
@@ -64,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
+package com.huaheng.mobile.invenory;
+
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
+
+import java.util.List;
+
+public class InventoryDomain {
+
+    private InventoryHeader inventoryHeader;
+    private List<InventoryDetail> inventoryDetails;
+
+    public InventoryHeader getInventoryHeader() {
+        return inventoryHeader;
+    }
+
+    public void setInventoryHeader(InventoryHeader inventoryHeader) {
+        this.inventoryHeader = inventoryHeader;
+    }
+
+    public List<InventoryDetail> getInventoryDetails() {
+        return inventoryDetails;
+    }
+
+    public void setInventoryDetails(List<InventoryDetail> inventoryDetails) {
+        this.inventoryDetails = inventoryDetails;
+    }
+}
@@ -11,14 +11,19 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.mobile.task.TaskDomain;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import com.huaheng.pc.report.excelReport.mapper.ExcelReportMapper;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
  
 /**
@@ -37,12 +43,14 @@ import java.util.*;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/inventory")
-@Api(tags = {"MobileInventoryController"}, description = "手机立体库库存相关")
+@Api(tags = {"手机立体库库存相关"}, value = "手机立体库库存相关MobileInventoryController")
 public class MobileInventoryController {
  
     @Resource
     private InventoryHeaderService inventoryService;
     @Resource
+    private InventoryDetailService inventoryDetailService;
+    @Resource
     private TaskHeaderService taskService;
     @Resource
     private LocationService locationService;
@@ -386,15 +394,6 @@ 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);
     }
  
@@ -410,7 +409,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");
                     }
                 }
@@ -418,4 +417,73 @@ public class MobileInventoryController {
         }
         return  AjaxResult.success(locations);
     }
+
+    @PostMapping("/searchInventory")
+    @ApiOperation("移动端查询库存")
+    @Log(title = "移动端查询库存", action = BusinessType.OTHER)
+    public AjaxResult searchInventory(@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<InventoryDetail> inventoryQueryWrapper = Wrappers.lambdaQuery();
+        inventoryQueryWrapper.eq(InventoryDetail::getCompanyCode, companyCode)
+                .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .orderByDesc(InventoryDetail::getCreated);
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryQueryWrapper);
+        return AjaxResult.success(inventoryDetailList);
+    }
+
+    @PostMapping("/searchInventoryInLocation")
+    @ApiOperation("移动端查询库存")
+    @Log(title = "移动端查询库存", action = BusinessType.OTHER)
+    public AjaxResult searchInventoryInLocation(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String companyCode = param.get("companyCode");
+        String containerCode = param.get("containerCode");
+        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<InventoryDetail> inventoryQueryWrapper = Wrappers.lambdaQuery();
+        inventoryQueryWrapper.eq(InventoryDetail::getCompanyCode, companyCode)
+                .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .orderByDesc(InventoryDetail::getCreated);
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryQueryWrapper);
+        return AjaxResult.success(inventoryDetailList);
+    }
+
+
+    @PostMapping("/findInventory")
+    @ApiOperation("移动端查询库存详情")
+    @Log(title = "移动端查询库存详情", action = BusinessType.OTHER)
+    public AjaxResult findInventory(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String inventoryDetailId = param.get("inventoryDetailId");
+        String companyCode = param.get("companyCode");
+        String materialCode = param.get("materialCode");
+        String materialName = param.get("materialName");
+        String materialSpec = param.get("materialSpec");
+        String shipper = param.get("shipper");       //货主
+        if (StringUtils.isNull(inventoryDetailId)){
+            return AjaxResult.error("任务id为空");
+        } else if (StringUtils.isNull(companyCode)){
+            return AjaxResult.error("公司编码为空");
+        }
+
+        /* 查询入库单，如果数据库中不存在，则调用ERP接口拉取单据，成功后再次查询返回结果*/
+        LambdaQueryWrapper<InventoryDetail> inventoryQueryWrapper = Wrappers.lambdaQuery();
+        inventoryQueryWrapper.eq(InventoryDetail::getId, inventoryDetailId)
+                .eq(InventoryDetail::getCompanyCode, companyCode);
+        InventoryDetail inventoryDetail = inventoryDetailService.getOne(inventoryQueryWrapper);
+        if(inventoryDetail == null) {
+            return AjaxResult.error("没有找到库存详情");
+        }
+        return AjaxResult.success(inventoryDetail);
+    }
 }
@@ -21,6 +21,8 @@ import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
@@ -56,7 +58,7 @@ import java.util.*;
 @CrossOrigin
 @RestController
 @RequestMapping("/mobile/receipt/batch")
-@Api(tags = {"MobileBatchReceiptController"}, description = "移动端收货")
+@Api(tags = {"移动端收货"}, value = "移动端收货MobileBatchReceiptController")
 public class MobileBatchReceiptController {
  
     @Resource
@@ -81,6 +83,8 @@ public class MobileBatchReceiptController {
     private CompanyService companyService;
     @Resource
     private IDictDataService dictDataService;
+    @Resource
+    private ReceiptTypeService receiptTypeService;
  
  
     @PostMapping("/scanContainer")
@@ -101,10 +105,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;
@@ -149,7 +153,7 @@ public class MobileBatchReceiptController {
         return AjaxResult.success(materials);
     }
  
-    @PostMapping("/getLatestReceipt")
+      @PostMapping("/getLatestReceipt")
     @ApiOperation("移动端获取入库单")
     @Log(title = "移动端获取入库单", action = BusinessType.OTHER)
     public AjaxResult getLatestReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
@@ -359,7 +363,7 @@ public class MobileBatchReceiptController {
                 throw new JSONException("不存在这个托盘");
             }
  
-            if(!location.getStatus().equals("empty")) {
+            if(!"empty".equals(location.getStatus())) {
                 throw new JSONException("库位状态不是空闲");
             }
         }
@@ -380,6 +384,9 @@ public class MobileBatchReceiptController {
  
         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());
@@ -458,7 +465,7 @@ public class MobileBatchReceiptController {
             if (loc == null) {
                 return AjaxResult.error("目标库位不存在");
             }
-            if (!loc.getStatus().equals("empty")) {
+            if (!"empty".equals(loc.getStatus())) {
                 return AjaxResult.error("目标库位非空闲");
             }
         }
@@ -516,7 +523,8 @@ public class MobileBatchReceiptController {
         receiptHeaderQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
                 .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .le(ReceiptHeader::getCreated, now)
-                .gt(ReceiptHeader::getCreated, start);
+                .gt(ReceiptHeader::getCreated, start)
+                .orderByDesc(ReceiptHeader::getCreated);
         List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
         return AjaxResult.success(receiptHeaderList);
     }
@@ -530,5 +538,13 @@ public class MobileBatchReceiptController {
         return AjaxResult.success(dictDataList);
     }
  
+    @PostMapping("/getReceiptType")
+    @ApiOperation("移动端查询入库类型")
+    @Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
+    public AjaxResult getReceiptType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        LambdaQueryWrapper<ReceiptType> receiptTypeLambda = Wrappers.lambdaQuery();
+        List<ReceiptType> receiptType = receiptTypeService.list(receiptTypeLambda);
+        return AjaxResult.success(receiptType);
+    }
  
 }
@@ -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
@@ -62,7 +62,7 @@ public class MobilePutawayController {
                 .eq(Location::getContainerCode, param.get("containerCode"));
         Location location = locationService.getOne(queryWrapper);
         if(location == null) {
-            AjaxResult.error("没有该库位");
+            return AjaxResult.error("没有该库位");
         }
         return AjaxResult.success("获取成功",location.getCode());
     }
@@ -2,6 +2,8 @@ package com.huaheng.mobile.shipment;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.general.domain.ReceiptDomain;
+import com.huaheng.api.general.domain.ShipmentDomain;
 import com.huaheng.common.exception.BusinessException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -12,6 +14,11 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.invenory.TaskIds;
 import com.huaheng.pc.config.company.domain.Company;
 import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
+import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
@@ -19,15 +26,16 @@ import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
  
 /**
  * @author mahua
@@ -49,6 +57,8 @@ public class MobileShipmentController extends BaseController {
     private CompanyService companyService;
     @Autowired
     private TaskHeaderService taskHeaderService;
+    @Autowired
+    private ShipmentTypeService shipmentTypeService;
  
     /**
      * 自动组盘
@@ -57,7 +67,8 @@ public class MobileShipmentController extends BaseController {
      */
     @PostMapping("/autoCombination")
     @ResponseBody
-    public AjaxResult autoCombination(String shipmentCode){
+    public AjaxResult autoCombination(@RequestBody  Map<String, String> param){
+        String shipmentCode = param.get("shipmentCode");
         AjaxResult ajaxResult = shipmentContainerHeaderService.autoCombination(shipmentCode);
         return ajaxResult;
     }
@@ -85,11 +96,6 @@ public class MobileShipmentController extends BaseController {
         ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(lambdaQueryWrapper);
  
         if (shipmentHeader == null) {
-//            LambdaQueryWrapper<Company> lambdaQueryWrapper1 = Wrappers.lambdaQuery();
-//            lambdaQueryWrapper1.eq(Company::getCode, param.get("companyCode"));
-//            Company company = companyService.getOne(lambdaQueryWrapper1);
-//            shipmentHeaderService.findErpShipment(String.valueOf(company.getId()), param.get("shipmentType"), param.get("referCode"));
-//            shipmentHeader = shipmentHeaderService.getOne(lambdaQueryWrapper);
             return AjaxResult.error("没有找到出库单");
         }
         LambdaQueryWrapper<ShipmentDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -101,6 +107,7 @@ public class MobileShipmentController extends BaseController {
         return AjaxResult.success(shipment);
     }
  
+
     /**
      * 根据出库单号生成出库任务
      */
@@ -108,10 +115,15 @@ public class MobileShipmentController extends BaseController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult createShipmentTask(@RequestBody List<TaskIds> taskDetails){
+        List<Integer> ids = new ArrayList<>();
+        for (TaskIds task : taskDetails) {
+            ids.add(task.getTaskId());
+        }
+        List<Integer> listWithoutDuplicates = ids.stream().distinct().collect(Collectors.toList());
         ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
         List<Integer> taskIds = new ArrayList<>();
-        for (TaskIds task : taskDetails) {
-            shipmentTask.setShipmentContainerHeaderIds(task.getTaskId());
+        for (Integer id : listWithoutDuplicates) {
+            shipmentTask.setShipmentContainerHeaderIds(id);
             AjaxResult ajaxResult = taskHeaderService.createTaskFromShipmentContainers(shipmentTask);
             if(ajaxResult.hasErr()){
                 return ajaxResult;
@@ -121,4 +133,65 @@ public class MobileShipmentController extends BaseController {
         }
         return AjaxResult.success(taskIds);
     }
+
+    @PostMapping("/findShipment")
+    @ApiOperation("移动端查询出库单")
+    @Log(title = "移动端查询出库单", action = BusinessType.OTHER)
+    public AjaxResult findShipment(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String shipmentCode = param.get("shipmentCode");
+        String companyCode = param.get("companyCode");
+        if (StringUtils.isNull(shipmentCode)){
+            return AjaxResult.error("上游系统关联单号为空");
+        } else if (StringUtils.isNull(companyCode)){
+            return AjaxResult.error("公司编码为空");
+        }
+
+        /* 查询入库单，如果数据库中不存在，则调用ERP接口拉取单据，成功后再次查询返回结果*/
+        LambdaQueryWrapper<ShipmentHeader> shipmentLambdaQueryWrapper = Wrappers.lambdaQuery();
+        shipmentLambdaQueryWrapper.eq(ShipmentHeader::getCode, shipmentCode)
+                .eq(ShipmentHeader::getCompanyCode, companyCode);
+        ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(shipmentLambdaQueryWrapper);
+        if(shipmentHeader == null) {
+            return AjaxResult.error("没有找到出库单");
+        }
+        ShipmentDomain shipment = new ShipmentDomain();
+        shipment.setShipmentHeader(shipmentHeader);
+
+        LambdaQueryWrapper<ShipmentDetail> shipmentDetailQueryWrapper = Wrappers.lambdaQuery();
+        shipmentDetailQueryWrapper.eq(ShipmentDetail::getShipmentId, shipmentHeader.getId());
+        List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentDetailQueryWrapper);
+        shipment.setShipmentDetails(shipmentDetailList);
+        return AjaxResult.success(shipment);
+    }
+
+    @PostMapping("/searchShipment")
+    @ApiOperation("移动端查询出库单")
+    @Log(title = "移动端查询出库单", action = BusinessType.OTHER)
+    public AjaxResult searchShipment(@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<ShipmentHeader> shipmentHeaderQueryWrapper = Wrappers.lambdaQuery();
+        shipmentHeaderQueryWrapper.eq(ShipmentHeader::getCompanyCode, companyCode)
+                .eq(ShipmentHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(ShipmentHeader::getCreated, now)
+                .gt(ShipmentHeader::getCreated, start)
+                .orderByDesc(ShipmentHeader::getCreated);
+        List<ShipmentHeader> receiptHeaderList = shipmentHeaderService.list(shipmentHeaderQueryWrapper);
+        return AjaxResult.success(receiptHeaderList);
+    }
+
+    @PostMapping("/getShipmentType")
+    @ApiOperation("移动端查询入库类型")
+    @Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
+    public AjaxResult getShipmentType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        LambdaQueryWrapper<ShipmentType> shipmentTypeLambda = Wrappers.lambdaQuery();
+        List<ShipmentType> shipmentTypes = shipmentTypeService.list(shipmentTypeLambda);
+        return AjaxResult.success(shipmentTypes);
+    }
 }
@@ -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 {
  
  
+package com.huaheng.mobile.task;
+
+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.ShipmentDomain;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
+import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Enzo Cotter
+ * @date 2019/12/15
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/mobile/task")
+@Api(tags = {"手持立体库库存相关"}, value = "手持立体库库存相关")
+public class MobileTaskController  {
+
+    @Autowired
+    private TaskHeaderService taskHeaderService;
+    @Autowired
+    private TaskDetailService taskDetailService;
+    @Autowired
+    private InventoryTransactionService inventoryTransactionService;
+    @PostMapping("/searchTask")
+    @ApiOperation("移动端查询任务")
+    @Log(title = "移动端查询任务", action = BusinessType.OTHER)
+    public AjaxResult searchTask(@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<TaskHeader> taskHeaderQueryWrapper = Wrappers.lambdaQuery();
+        taskHeaderQueryWrapper.eq(TaskHeader::getCompanyCode, companyCode)
+                .eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(TaskHeader::getCreated, now)
+                .gt(TaskHeader::getCreated, start)
+                .orderByDesc(TaskHeader::getCreated);
+        List<TaskHeader> taslHeaderList = taskHeaderService.list(taskHeaderQueryWrapper);
+        return AjaxResult.success(taslHeaderList);
+    }
+
+    @PostMapping("/findTask")
+    @ApiOperation("移动端查询任务详情")
+    @Log(title = "移动端查询任务详情", action = BusinessType.OTHER)
+    public AjaxResult findTask(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        String taskHeadId = param.get("taskHeadId");
+        String companyCode = param.get("companyCode");
+        if (StringUtils.isNull(taskHeadId)){
+            return AjaxResult.error("任务id为空");
+        } else if (StringUtils.isNull(companyCode)){
+            return AjaxResult.error("公司编码为空");
+        }
+
+        /* 查询入库单，如果数据库中不存在，则调用ERP接口拉取单据，成功后再次查询返回结果*/
+        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeadId)
+                .eq(TaskHeader::getCompanyCode, companyCode);
+        TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
+        if(taskHeader == null) {
+            return AjaxResult.error("没有找到任务");
+        }
+        TaskDomain taskDomain = new TaskDomain();
+        taskDomain.setTaskHeader(taskHeader);
+
+        LambdaQueryWrapper<TaskDetail> taskDetailQueryWrapper = Wrappers.lambdaQuery();
+        taskDetailQueryWrapper.eq(TaskDetail::getTaskId, taskHeader.getId());
+        List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailQueryWrapper);
+        taskDomain.setTaskDetails(taskDetailList);
+        return AjaxResult.success(taskDomain);
+    }
+
+    @PostMapping("/searchTodayInfo")
+    @ApiOperation("移动端查询今天信息")
+    @Log(title = "移动端查询今天信息", action = BusinessType.OTHER)
+    public AjaxResult searchTodayInfo(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
+        TodayInfo todayInfo = new TodayInfo();
+        String companyCode = param.get("companyCode");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String now = df.format(new Date());
+        now = now + " 23:59:59";
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.DATE, 0);
+        Date first = c.getTime();
+        String start = df.format(first);//前一天
+        start = start + " 00:00:00";
+        LambdaQueryWrapper<TaskHeader> taskHeaderQueryWrapper = Wrappers.lambdaQuery();
+        taskHeaderQueryWrapper.eq(TaskHeader::getCompanyCode, companyCode)
+                .eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(TaskHeader::getCreated, now)
+                .gt(TaskHeader::getCreated, start)
+                .orderByDesc(TaskHeader::getCreated);
+        List<TaskHeader> taslHeaderList = taskHeaderService.list(taskHeaderQueryWrapper);
+        todayInfo.setTodayTAask(taslHeaderList.size());
+
+        LambdaQueryWrapper<InventoryTransaction> inventoryTransactionLambdaQueryWrapperQuery = Wrappers.lambdaQuery();
+        inventoryTransactionLambdaQueryWrapperQuery.eq(InventoryTransaction::getCompanyCode, companyCode)
+                .eq(InventoryTransaction::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .le(InventoryTransaction::getCreated, now)
+                .gt(InventoryTransaction::getCreated, start)
+                .orderByDesc(InventoryTransaction::getCreated);
+        int todayReceipt = 0, todayShipment = 0;
+        List<InventoryTransaction> inventoryTransactionList = inventoryTransactionService.list(inventoryTransactionLambdaQueryWrapperQuery);
+        if(inventoryTransactionList != null) {
+            for (InventoryTransaction inventoryTransaction : inventoryTransactionList) {
+                if(inventoryTransaction.getTransactionType() == 10) {
+                    todayReceipt = todayReceipt + inventoryTransaction.getTaskQty().intValue();
+                } else  if(inventoryTransaction.getTransactionType() == 20) {
+                    todayShipment = todayShipment + inventoryTransaction.getTaskQty().intValue();
+                }
+            }
+        }
+        todayInfo.setTodayReceipt(todayReceipt);
+        todayInfo.setTodayShipment(todayShipment);
+        return AjaxResult.success(todayInfo);
+    }
+
+}
+package com.huaheng.mobile.task;
+
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskDomain {
+
+    private TaskHeader taskHeader;
+
+    private List<TaskDetail> taskDetails;
+}
+package com.huaheng.mobile.task;
+
+public class TodayInfo {
+
+    private Integer todayTAask;
+    private Integer todayReceipt;
+    private Integer todayShipment;
+
+    public Integer getTodayTAask() {
+        return todayTAask;
+    }
+
+    public void setTodayTAask(Integer todayTAask) {
+        this.todayTAask = todayTAask;
+    }
+
+    public Integer getTodayReceipt() {
+        return todayReceipt;
+    }
+
+    public void setTodayReceipt(Integer todayReceipt) {
+        this.todayReceipt = todayReceipt;
+    }
+
+    public Integer getTodayShipment() {
+        return todayShipment;
+    }
+
+    public void setTodayShipment(Integer todayShipment) {
+        this.todayShipment = todayShipment;
+    }
+}
@@ -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);
@@ -20,8 +20,6 @@ import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.mapper.ContainerMapper;
 import org.springframework.transaction.annotation.Transactional;
  
-import static com.huaheng.framework.web.domain.AjaxResult.error;
-
 @Service
 public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
  
@@ -32,14 +30,9 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
  
     @Override
     public AjaxResult<List<Container>> insertContainer(String type, Integer quantity) {
-        List<Container>  containerList = new ArrayList<>();// 新增托盘总数
-        List<Container> containers =new ArrayList<>();// 每次插入的托盘数
-        int result=0;//插入的结果
+        List<Container>  containerList = new ArrayList<>();
+        List<Container> containers =new ArrayList<>();
         Integer number = getNumber(type);
-        if(quantity>99999)
-        {
-            return AjaxResult.error("托盘编码对应的流水码不能大于99999",containerList);
-        }
         for(int i=0; i<quantity; i++) {
             number++;
             Container container = new Container();
@@ -53,31 +46,19 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
             container.setEnable(true);
             container.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
             container.setWarehouseCode(ShiroUtils.getWarehouseCode());
-            containers.add(container);// 每1000个 新增一次
-            if( i>0 && i%1000==1 ){
-                result= containerMapper.addList(containers);
-                if(result<=0){
-                    return AjaxResult.error("插入数据出错，请核对",containerList);
-                }
-                containerList.addAll(containers);
+            containers.add(container);
+            if( i>0 && (i%1000==0 || i == quantity-1)){
+                containerMapper.addList(containers);
                 containers = new ArrayList<>();
             }
         }
-        if(!containers.isEmpty()){
-            result= containerMapper.addList(containers);// 不够1000的
-            if(result<=0){
-                return AjaxResult.error("插入数据出错，请核对",containerList);
-            }
-            containerList.addAll(containers);
-        }
-        return AjaxResult.success(containerList);
+        return AjaxResult.success(containers);
     }
-/**
-    根据托盘类型获取托盘的最大编码值  如果没有则返回0  流水码最大为5位 99999
- **/
+
     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");
@@ -92,14 +73,8 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         }
     }
  
-    /**
-     *  托盘导入
-     * @param containerList
-     * @param updateSupport  TODO：这个参数没有使用 ？？
-     * @param operName
-     * @return
-     */
-    public String importContainer(List<Container> containerList, Boolean updateSupport, String operName){
+    @Override
+    public String importMaterial(List<Container> containerList, Boolean updateSupport, String operName){
         if (StringUtils.isNull(containerList) || containerList.size() == 0) {
             throw new  BusinessException("导入数据不能为空！");
         }
@@ -113,10 +88,11 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
                 lambdaQueryWrapper.eq(Container::getCode, container.getCode());
                 // 验证是否存在这个容器
                 Container m = this.getOne(lambdaQueryWrapper);
+
                 if (StringUtils.isNull(m)) {
-                    System.out.println(operName);
-                    container.setCreatedBy(operName);
-                    container.setLastUpdatedBy(operName);
+                    System.out.println(ShiroUtils.getLoginName());
+                    container.setCreatedBy(ShiroUtils.getUser().getLoginName());
+                    container.setLastUpdatedBy(ShiroUtils.getLoginName());
                     this.save(container);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、编码 " + container.getCode() + " 导入成功");
@@ -150,12 +126,13 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     }
  
     /**
-     * 修改容器表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);
+        }
     }
  
     /**
@@ -164,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);
@@ -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 {
@@ -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);
@@ -17,4 +17,6 @@ public interface ShipmentTypeService extends IService&lt;ShipmentType&gt;{
     boolean ShipmentTypeCopy(String warehouseCode, String newWarehouseCode);
  
     List<Map<String, Object>> getType();
+
+    Boolean checkCode(String code);
 }
@@ -9,6 +9,7 @@ import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
 import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
 import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
+import com.huaheng.pc.system.dict.domain.DictData;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -53,10 +54,26 @@ 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())
                 .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList());
         return this.listMaps(lambdaQueryWrapper);
     }
+
+    @Override
+    public Boolean checkCode(String code) {
+        LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList());
+        List<ShipmentType> shipmentTypeList = this.list(lambdaQueryWrapper);
+        for(ShipmentType shipmentType : shipmentTypeList) {
+            String shipmentCode = shipmentType.getCode();
+            if(shipmentCode.equals(code)) {
+                return true;
+            }
+        }
+       return false;
+    }
 }
@@ -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);
+    }
 }
@@ -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();
@@ -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();
@@ -240,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())){
@@ -358,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);
                 }
             }
@@ -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;
  
     /**
      * 总行量
@@ -119,7 +119,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
                 if (StringUtils.isNotEmpty(loc.getContainerCode())) {
                     return AjaxResult.error("目标库位已存在托盘");
                 }
-                if (!loc.getStatus().equals("empty")) {
+                if (!"empty".equals(loc.getStatus())) {
                     return AjaxResult.error("目标库位非空闲");
                 }
             }
@@ -212,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("源货位非空闲");
         }
         //判断托盘是否已经存在任务
@@ -291,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("源货位非空闲");
         }
         //创建任务
@@ -10,11 +10,13 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
 import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.domain.ContainerStatus;
 import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
@@ -26,9 +28,12 @@ import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
+import java.io.PushbackInputStream;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.util.Calendar;
@@ -64,7 +69,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
      */
     @Override
     @Transactional
-    public AjaxResult saveContainer(String receiptCode, String containerCode, Integer receiptDetailId,
+    public AjaxResult saveCountain(String receiptCode, String containerCode, Integer receiptDetailId,
                  String locationCode, Integer qty, String locatingRule) {
         ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
         //检查容器编码合法性
@@ -77,7 +82,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             if (taskType == 0){ throw new ServiceException("容器状态未知"); }
         }
         //检查库位编码合法性
-        if (checkLocationCode(locationCode, containerCode, taskType)) {
+        if (checkLocationCode(locationCode, containerCode, taskType) == true) {
             locationService.updateStatus(locationCode, "lock");
         }
  
@@ -235,12 +240,12 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             throw new ServiceException("收货明细是空！");
         }
         checkContainer(list.get(0));
-        if (checkLocationCode(list.get(0).getLocationCode(), list.get(0).getLocationCode(), Integer.valueOf(list.get(0).getTaskType()))) {
-            locationService.updateStatus(list.get(0).getLocationCode(), "lock");
-        }
+//        if (checkLocationCode(list.get(0).getLocationCode(), list.get(0).getLocationCode(), Integer.valueOf(list.get(0).getTaskType())) == true) {
+//            locationService.updateStatus(list.get(0).getLocationCode(), "lock");
+//        }
         AjaxResult ajaxResult = null;
         for (ReceiptContainerView receiptContainerView : list) {
-            ajaxResult = saveContainer(receiptContainerView.getReceiptCode(), receiptContainerView.getReceiptContainerCode(),
+            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) {
             //获取表头
@@ -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<>();
@@ -199,8 +199,9 @@ 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);
@@ -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) {
@@ -155,8 +157,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
             }
             return AjaxResult.success("删除单据明细成功");
         }
-        else
+        else {
             return AjaxResult.error("删除单据明细失败");
+        }
     }
  
     @Override
@@ -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("删除单据明细失败");
+        }
     }
 }
 package com.huaheng.pc.shipment.shipmentHeader.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  
 import java.util.List;
@@ -15,4 +16,10 @@ public interface ShipmentHeaderMapper extends BaseMapper&lt;ShipmentHeader&gt; {
  
     List<ShipmentHeader> selectListByCreated();
  
+    /**
+     *  获得最新出库单
+     * @return
+     */
+    List<ShipmentHeader> getLatestShipment();
+
 }
 \ No newline at end of file
@@ -25,4 +25,5 @@ public interface ShipmentHeaderService extends IService&lt;ShipmentHeader&gt;{
  
     List<ShipmentHeader> selectListByCreated();
  
+    List<ShipmentHeader> getLatestShipment();
 }
@@ -13,6 +13,8 @@ import com.huaheng.pc.config.company.service.CompanyService;
 import com.huaheng.pc.config.customer.domain.Customer;
 import com.huaheng.pc.config.customer.service.CustomerServiceImpl;
 import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
@@ -57,11 +59,14 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     private CustomerServiceImpl customerService;
     @Resource
     private MaterialService materialService;
+    @Resource
+    private ShipmentTypeService shipmentTypeService;
  
     //新增出库主单
     @Override
     public AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) {
-        if(dictDataService.checkConfig("shipmentType", shipmentHeader.getShipmentType()) == false)
+
+        if(shipmentTypeService.checkCode(shipmentHeader.getShipmentType()) == false)
         {
             return  AjaxResult.error("没有对应的出库单类型");
         }
@@ -259,4 +264,10 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         return shipmentHeaderMapper.selectListByCreated();
     }
  
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ShipmentHeader> getLatestShipment() {
+        return shipmentHeaderMapper.getLatestShipment();
+    }
+
 }
@@ -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;
     }
  
@@ -123,8 +123,8 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
                 return AjaxResult.error("id为"+id+"的波次不存在");
             }
  
-            if(wave.getCurrentWaveStep() != QuantityConstant.WAVE_STEP_BUILD &&
-            wave.getCurrentWaveStep()!=QuantityConstant.WAVE_STEP_ERROR){
+            if(!wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_BUILD) &&
+                    !wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_ERROR)){
                 return AjaxResult.error("id为"+id+"的波次已执行，无法剔除单据");
             }
  
@@ -169,7 +169,7 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
                 return AjaxResult.error("id为"+id+"的波次不存在");
             }
  
-            if(wave.getCurrentWaveStep() != QuantityConstant.WAVE_STEP_START){
+            if(!wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_START)){
                 return AjaxResult.error("id为"+id+"的波次未执行，无法完成");
             }
  
@@ -186,7 +186,7 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
             //找到未生成出库任务的组盘头
             List<Integer> idList =new ArrayList<>();
             for(ShipmentContainerHeader item : shipmentContainerHeaders){
-                if(item.getStatus() == QuantityConstant.SHIPMENT_CONTAINER_BUILD){
+                if(item.getStatus().equals(QuantityConstant.SHIPMENT_CONTAINER_BUILD)){
                     idList.add(item.getId());
                 }
             }
@@ -231,7 +231,7 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
  
                 //1、查看此波次是否可以释放
                 Wave wave = this.getById(id);
-                 if(wave == null || wave.getStatus() == QuantityConstant.WAVE_STATUS_START){
+                 if(wave == null || wave.getStatus().equals(QuantityConstant.WAVE_STATUS_START)){
                     return AjaxResult.error(id+"波次不可释放,正在执行中");
                 }
  
@@ -285,7 +285,7 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
                     }
                 }
  
-                if(wave.getCurrentWaveStep() == QuantityConstant.WAVE_STEP_END) {
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STEP_END)) {
                     //成功释放——找到此波次的未执行的子任务列表
                     LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery();
                     lam.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
@@ -299,20 +299,20 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
                     for(TaskHeader item :taskHeaders){
                         taskIds.add(item.getId());
                     }
-                    taskHeaderService.sendTaskToWcs((Integer[])taskIds.toArray());
+                    taskHeaderService.sendTaskToWcs(taskIds.toArray(new Integer[taskIds.size()]));
                 }
  
                 //修改波次状态
-                if(wave.getCurrentWaveStep() == QuantityConstant.WAVE_STEP_END) {
+                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() == QuantityConstant.WAVE_STATUS_BUILD){
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STATUS_BUILD)){
                     wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_FREED);
                     wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
                 }
-                if(wave.getCurrentWaveStep() == QuantityConstant.WAVE_STATUS_ERROR){
+                if(wave.getCurrentWaveStep().equals(QuantityConstant.WAVE_STATUS_ERROR)){
                     wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_FREED);
                     wave.setLastWaveStep(QuantityConstant.WAVE_STEP_ERROR);
                 }
@@ -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);
     }
  
@@ -152,10 +154,12 @@ public class TaskHeaderController extends BaseController {
     @PostMapping("/setLocationCode")
     @ResponseBody
     public AjaxResult setLocationCode( Integer taskId, Integer high){
-        if (taskId == null)
+        if (taskId == null){
             return AjaxResult.error("任务id不能为空");
-        if (high == null)
+        }
+        if (high == null){
             return AjaxResult.error("高库位标识不能为空");
+        }
         return taskHeaderService.setLocationCode(taskId, high);
     }
  
@@ -92,7 +92,7 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
  
     AjaxResult createAutoEmptyOut(String warehouseCode);
  
-    AjaxResult<String> getLocationCode(Integer taskId,String warehouseCode,String weight);
+    String getLocationCode(Integer taskId,String warehouseCode,String weight);
  
     AjaxResult setLocationCode(Integer taskId, Integer high);
  
@@ -124,7 +124,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @param taskHeaderList
      * @return
      */
-    @Transactional
     @Override
     public List<TaskHeader> preferenceRealize(List<TaskHeader> taskHeaderList) {
         //盘点任务头，默认不显示库位，容器。
@@ -151,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);
@@ -170,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)
@@ -200,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("成功！");
     }
  
     /**
@@ -210,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();
@@ -249,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);
@@ -289,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());
@@ -310,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");
@@ -344,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)
@@ -408,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();
@@ -512,7 +515,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             if (flag == false) {
                 throw new ServiceException("新建任务明细失败，sql报错");
             }
-
             shipmentContainerDetail.setStatus(QuantityConstant.SHIPMENT_CONTAINER_TASK);
         }
         //更新货位状态
@@ -527,7 +529,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             throw new ServiceException("修改组盘明细状态明细失败，sql报错");
         }
         return AjaxResult.success(task.getId());
-
     }
  
     /**
@@ -535,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) {
@@ -618,43 +619,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())){
                     //自动分配库位
-                    AjaxResult ajaxResult =  this.getLocationCode(task.getId(),ShiroUtils.getWarehouseCode(),null);
-                    String locationCode = (String )ajaxResult.getData();
-                    task.setToLocation(locationCode);
+                    String result =  this.getLocationCode(task.getId(),ShiroUtils.getWarehouseCode(),weight);
+                    task.setToLocation(result);
                 }
             }
-
             //如果没有库位不能完成
             if (StringUtils.isEmpty(task.getFromLocation()) && StringUtils.isEmpty(task.getToLocation())) {
                 throw new ServiceException("任务" + task.getId() + "没有库位，执行中止");
             }
  
-            if (StringUtils.isNotNull(weight)) {
-                task.setWeight(weight[i]);
-            }
-
             this.completeTask(task);
         }
-
         return AjaxResult.success("完成任务成功！");
     }
  
@@ -663,6 +662,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) ) {
@@ -701,7 +701,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) {
@@ -724,7 +724,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     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());
@@ -755,6 +755,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());//创建时间
@@ -766,9 +767,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();
@@ -811,18 +812,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());
@@ -840,9 +841,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("更新组盘状态失败");
-
+                }
  
                 //修改入库组盘头表状态
  
@@ -880,6 +881,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)
@@ -907,8 +909,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 生成
      * 立库移库
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) {
  
         //源库位校验
@@ -921,7 +923,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())) {
@@ -946,7 +948,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())) {
@@ -1127,7 +1129,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 任务
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createCheckOutTask(String[] ids) {
  
         for (String id : ids) {
@@ -1142,7 +1144,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())) {
@@ -1207,8 +1209,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()); //更新用户
@@ -1252,8 +1254,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * @param taskHeader
      * @return
      */
-    @Transactional
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult completeCycleCountTask(TaskHeader taskHeader) {
         /*盘点完成，传入任务主单，查出任务明细，通过任务明细查找盘点的明细单，
         完成任务同时，修改盘点细单和主单的状态，完成后库存锁复位*/
@@ -1305,7 +1307,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      *
      * @param taskHeader
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void completeEmptyIn(TaskHeader taskHeader) {
  
         //完成任务,修改主单和明细状态
@@ -1343,7 +1345,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         inventoryHeader.setCompanyCode(taskHeader.getCompanyCode());
         inventoryHeader.setMaterialSkuQty("0");
         inventoryHeader.setTotalWeight("0");
-        inventoryHeader.setTotalQty(0);
+        inventoryHeader.setTotalQty(new BigDecimal(0));
         inventoryHeader.setTotalLines(0);
         inventoryHeader.setProjectNos("");
         inventoryHeader.setBatchs("");
@@ -1365,8 +1367,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);
@@ -1412,7 +1414,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);
@@ -1557,7 +1559,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()));
@@ -1606,9 +1608,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);
@@ -1637,7 +1639,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("删除临时容器失败");
@@ -1710,10 +1712,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());
@@ -1727,6 +1729,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 自动空托出库
      * */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult createAutoEmptyOut(String warehouseCode){
         /*先查询容器表，选中空托盘，再查询库存核实*/
         //该容器中有库位信息，并且状态是空
@@ -1751,20 +1754,19 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     /**
-     * 自动分配库位
+     * 任务自动分配库位
      *
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public synchronized AjaxResult<String> getLocationCode(Integer taskId,String warehouseCode,String weight){
-
+    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())) {
-            return AjaxResult.error("任务已经有目的库位");
+            throw new ServiceException("任务已经有目的库位");
         }
         if(!warehouseCode.equals(task.getWarehouseCode())){
             throw new ServiceException("仓库错误！");
@@ -1849,7 +1851,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         //task.setFromLocation(location.getCode());
         //LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(task);
         this.saveOrUpdate(task);
-        return  AjaxResult.success("分配库位成功", location.getCode());
+        return location.getCode();
     }
  
  
@@ -1877,7 +1879,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 //        location.setZoneCode(taskHeader.getz());
         location.setStatus("empty");
         location.setDeleted(false);
-        if(taskHeader.getContainerCode().substring(0,1).equals("M")){
+        if("M".equals(taskHeader.getContainerCode().substring(0,1))){
             if (high.intValue() == 1) {
                 location.setILayer(5);
             }
@@ -35,17 +35,15 @@
   </sql>
  
     <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
+        SELECT *
         FROM location t
         <where>
-            t.locationType = 'LK'
+            t.locationType = 'L'
             AND t.warehouseCode = #{warehouseCode}
             AND t.status='empty'
             AND t.containerCode !=''
             AND t.containerCode is not NULL
+            AND t.containerCode NOT in (SELECT h.containerCode from task_header h WHERE status &lt; 100 AND warehouseCode=#{warehouseCode})
             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}
@@ -97,10 +97,7 @@
     </select>
  
   <select id="pickLocation" resultType="com.huaheng.pc.config.location.domain.Location">
-        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
+        select * from location
         where containerCode != '' and status = 'empty'
     </select>
  
@@ -75,4 +75,8 @@
     inner join task_detail t on t.billCode=s.code and
     t.status>700 and DATEDIFF(NOW(), t.lastUpdated)=0 GROUP BY s.code
     </select>
+
+  <select id="getLatestShipment" resultType="com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader">
+     select * from shipment_header order by id desc  limit 10
+  </select>
 </mapper>
 \ No newline at end of file
@@ -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");
@@ -322,7 +322,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                            if(row.enableStatus >= 10 && row.enableStatus < 100){
+                            if(row.enableStatus >= 1 && row.enableStatus < 110){
                                 actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
                             }
                             if(row.enableStatus  === 1 ){
@@ -102,6 +102,7 @@
     var prefix = ctx + "inventory/inventoryDetail";
     var inventoryStatus = [[${@dict.getType('inventorySts')}]];
     var inventoryLock = [[${@dict.getType('inventoryLock')}]];
+    var company =[[${@companyService.getCode()}]];
     $(function () {
         update();
     });
@@ -180,7 +181,18 @@
                 },
                 {
                     field: 'companyCode',
-                    title: '货主编码'
+                    title: '货主',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        $.each(company, function(index, dict) {
+                            if (dict.code == value) {
+                                actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                                return false;
+                            }
+                        });
+                        return actions.join('');
+                    }
                 },
                 {
                     field: 'receiptCode',
@@ -51,7 +51,7 @@
                     <ul id="select_info">
                         <li>
                             <select id="locationType" name="locationType" style="width: 100px">
-                                <option value="LK" selected>立库库位</option>
+                                <option value="L" selected>立库库位</option>
                                 <option value="Q">钱柜库位</option>
                                 <option value="DM">地面库位</option>
                             </select>
@@ -25,6 +25,12 @@
             </div>
         </div>
         <div class="form-group">
+            <label class="col-sm-3 control-label">总数量：</label>
+            <div class="col-sm-8">
+                <input id="totalQty" name="totalQty" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">供应商编码：</label>
             <div class="col-sm-8">
                 <input id="supplierCode" name="supplierCode" class="form-control" type="text">
@@ -79,12 +85,6 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">总数量：</label>
-            <div class="col-sm-8">
-                <input id="totalQty" name="totalQty" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
             <label class="col-sm-3 control-label">定位规则：</label>
             <div class="col-sm-8">
                 <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">
@@ -22,6 +22,12 @@
 				</div>
 			</div>
 			<div class="form-group">
+				<label class="col-sm-3 control-label">供应商：</label>
+				<div class="col-sm-8">
+					<input id="supplierCode" name="supplierCode" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
 				<label class="col-sm-3 control-label">入库单备注：</label>
 				<div class="col-sm-8">
 					<input id="receiptNote" name="receiptNote" class="form-control" type="text">
@@ -62,6 +68,7 @@
                     data : {
                         "receiptType": $("#receiptType option:selected").val(),
                         "companyCode": $("#companyCode option:selected").val(),
+						"supplierCode": $("input[name='supplierCode']").val(),
                         "receiptNote": $("input[name='receiptNote']").val(),
                         "scheduledArriveDate": $("input[name='scheduledArriveDate']").val(),
                     },
@@ -103,7 +103,7 @@
                         <form id = "receiptDetail" >
                             <ul id="tabHead" class="nav nav-tabs">
                                 <li class="active"><a href="#tabBase" data-toggle="tab">基础数据</a></li>
-                                <li role="presentation" ><a href="#tabCustomer" data-toggle="tab">客户信息</a></li>
+                                <li role="presentation" ><a href="#tabSupplierCode" data-toggle="tab">供应商信息</a></li>
                                 <li><a href="#tabExcute" data-toggle="tab">执行信息</a></li>
                                 <li><a href="#tabOther" data-toggle="tab">其他信息</a></li>
                                 <li><a href="#tabSystem" data-toggle="tab">系统信息</a></li>
@@ -205,6 +205,8 @@
     var receiptTypes = [[${@receiptTypeService.getType()}]];
     var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
     var uploadStatus = [[${@dict.getType('uploadStatus')}]];
+    var company =[[${@companyService.getCode()}]];
+    var supplier =[[${@SupplierService.getCode()}]];
     var detailCreateUrl = detailPrefix+"/add";
     var detailUpdateUrl = detailPrefix + "/edit/{id}";
     var detailRemoveUrl = detailPrefix+"/remove";
@@ -236,23 +238,33 @@
                     title : '创建用户',
                     sortable:true
                 },
-                {
-                    field : 'referCode',
-                    title : '关联单号',
-                    sortable:true
-                },
-                {
-                    field : 'referType',
-                    title : '关联订单类型'
-                },
+                // {
+                //     field : 'referType',
+                //     title : '关联订单类型'
+                // },
                 {
                     field : 'code',
                     title : '入库单号',
                 },
                 {
-                    field : 'companyCode',
-                    title : '货主编码',
-                    visible: [[${@table.getVisible('p')}]]
+                    field: 'companyCode',
+                    title: '货主',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        $.each(company, function(index, dict) {
+                            if (dict.code == value) {
+                                actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                                return false;
+                            }
+                        });
+                        return actions.join('');
+                    }
+                },
+                {
+                    field : 'referCode',
+                    title : '上游单号',
+                    sortable:true
                 },
                 {
                     field : 'warehouseCode',
@@ -275,6 +287,21 @@
                     }
                 },
                 {
+                    field : 'supplierCode',
+                    title : '供应商',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        $.each(supplier, function(index, dict) {
+                            if (dict.code == value) {
+                                actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                                return false;
+                            }
+                        });
+                        return actions.join('');
+                    }
+                },
+                {
                     field : 'scheduledArriveDate',
                     title : '预计到达日期',
                     sortable:true,
@@ -7,7 +7,7 @@
         <form class="form-horizontal m" id="form-receiving-add">
             <input id="receiptId" name="receiptId" type="hidden" readonly="readonly">
             <input id="receiptDetailId" name="receiptDetailId" type="hidden" readonly="readonly">
-			<div class="form-group">	
+			<div class="form-group">
 				<label class="col-sm-3 control-label">收货单编码：</label>
 				<div class="col-sm-8">
 					<input id="receiptCode" name="receiptCode" class="form-control" type="text" readonly="readonly">
@@ -31,7 +31,7 @@
                     <input id="inventorySts" name="inventorySts" class="form-control" type="text" readonly="readonly">
 				</div>
 			</div>
-			<div class="form-group">	
+			<div class="form-group">
 				<label class="col-sm-3 control-label">单据数量：</label>
 				<div class="col-sm-8">
 					<input id="totalQty" name="totalQty" class="form-control" type="text" readonly="readonly">
@@ -248,7 +248,13 @@
             },
                 {
                     field: 'id',
-                    title: '出库单id'
+                    title: '出库单id',
+                    sortable:true
+                },
+                {
+                    field: 'createdBy',
+                    title: '创建用户',
+                    sortable:true
                 },
                 {
                     field: 'code',
@@ -259,6 +265,7 @@
                     field: 'companyCode',
                     title: '货主',
                     align: 'center',
+                    sortable:true,
                     formatter: function(value, row, index) {
                         var actions = [];
                         $.each(company, function(index, dict) {
@@ -283,8 +290,9 @@
                 },
                 {
                     field: 'shipmentType',
-                    title: '类型',
+                    title: '出库类型',
                     align: 'center',
+                    sortable:true,
                     formatter: function(value, row, index) {
                         var actions = [];
                         $.each(shipmentTypes, function(index, dict) {
@@ -313,11 +321,13 @@
                 },
                 {
                     field: 'priority',
-                    title: '优先级'
+                    title: '优先级',
+                    visible:false
                 },
                 {
                     field: 'route',
                     title: '路线',
+                    visible:false,
                     sortable:true
                 },
                 {
@@ -354,10 +364,6 @@
                     sortable: true
                 },
                 {
-                    field: 'createdBy',
-                    title: '创建用户'
-                },
-                {
                     field: 'lastUpdated',
                     title: '最后修改时间',
                     visible:false
@@ -152,6 +152,28 @@
 		            checkbox: true
 		        },
 				{
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+						actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
+						if (row.lastStatus < 10)  {
+							if(row.zoneCode != "AGV"){
+								actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
+							}
+							actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
+							if(row.zoneCode != "AGV"){
+								actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+							}
+						}
+						if(row.lastStatus < 10 && row.zoneCode == "AGV"){
+							actions.push('<a style="background-color: #f59e00;border: #f59e00"  class="btn btn-primary btn-xs ' + agvFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>AGV完成</a>');
+						}
+						return actions.join('');
+					}
+				},
+				{
 					field : 'id', 
 					title : '任务id' ,
                     sortable: true
@@ -271,29 +293,7 @@
 					field : 'userDef3', 
 					title : '自定义字段3' ,
 					visible:false
-				},
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	 // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
-                        if (row.lastStatus < 10)  {
-                            if(row.zoneCode != "AGV"){
-                                actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
-                            }
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                            if(row.zoneCode != "AGV"){
-                            actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-                            }
-                        }
-                        if(row.lastStatus < 10 && row.zoneCode == "AGV"){
-                            actions.push('<a style="background-color: #f59e00;border: #f59e00"  class="btn btn-primary btn-xs ' + agvFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>AGV完成</a>');
-                        }
-                        return actions.join('');
-		            }
-		        }
+				}
 		        ]
             };
             $.table.init(options);
@@ -155,7 +155,24 @@
 		            checkbox: true
 		        },
 				{
-					field : 'id', 
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
+						if (row.status < 10)  {
+							actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
+							actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
+							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+						}
+						if (row.status >= 10 && row.status < 100)  {
+							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+						}
+						return actions.join('');
+					}
+				},
+				{
+					field : 'id',
 					title : '任务id' ,
                     sortable: true
 				},
@@ -241,24 +258,7 @@
 					field : 'userDef3', 
 					title : '自定义字段3' ,
 					visible:false
-				},
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
-                        if (row.status < 10)  {
-                            actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                            actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-                        }
-						if (row.status >= 10 && row.status < 100)  {
-							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-						}
-                        return actions.join('');
-		            }
-		        }
+				}
 		        ]
             };
             $.table.init(options);
@@ -453,7 +453,7 @@
             $.modal.confirm("确认要执行选中的" + rows.length + "条数据吗?", function() {
                 var url = ctx + 'task/taskHeader/execute';
                 var ids = "";
-                for(var i=rows.length-1; i < 0; i--) {
+                for(var i=rows.length-1; i >= 0; i--) {
                     ids = ids + rows[i].id + ","
                 }
                 var data = { "taskId": ids.substring(0, ids.length-1) };