平库入库功能

易文鹏
1 parent 74188821
Showing 31 changed files with 1855 additions and 1377 deletions
src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java
src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java
src/main/java/com/huaheng/api/wcs/controller/PickupErrorController.java
src/main/java/com/huaheng/api/wcs/controller/TaskFinishController.java
src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
src/main/java/com/huaheng/common/constant/QuantityConstant.java
src/main/java/com/huaheng/pc/config/container/domain/Container.java
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
src/main/java/com/huaheng/pc/config/zone/service/ZoneService.java
src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java
src/main/java/com/huaheng/pc/monitor/apilog/controller/ApiLogController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/controller/ReceiptContainerDetailController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
@@ -12,11 +12,12 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Map;
  
-/**空出处理接口
+/**
+ * 空出处理接口
  * wcs向wms传递数据
- * @author ricard
- * @date   2019/10/11
  *
+ * @author ricard
+ * @date 2019/10/11
  */
  
 @RestController
@@ -30,10 +31,9 @@ public class EmptyOutHandle extends BaseController {
     @PostMapping("/emptyOutHandle")
     @ApiOperation("wcs空出处理")
     @ResponseBody
-    public AjaxResult emptyOutHandle(@RequestBody Map<String,String> map) {
+    public AjaxResult emptyOutHandle(@RequestBody Map<String, String> map) {
         String taskNo = map.get("taskNo");
-        AjaxResult ajaxResult = emptyOutHandleService.EmptyOutHandle(taskNo);
-        return ajaxResult;
+        return handleQuest("emptyOutHandle", () -> emptyOutHandleService.EmptyOutHandle(taskNo));
     }
  
  
@@ -15,11 +15,12 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
  
-/**重入处理接口
+/**
+ * 重入处理接口
  * wcs向wms传递数据
- * @author ricard
- * @date   2019/10/11
  *
+ * @author ricard
+ * @date 2019/10/11
  */
  
 @RestController
@@ -34,7 +35,7 @@ public class OverrideHandle extends BaseController {
     @ApiOperation("wcs重入处理")
     @ResponseBody
     public AjaxResult reenterHandle(@RequestBody TaskFinishDomain taskFinishDomain) {
-        return overrideHandleService.OverrideHandle(taskFinishDomain);
+        return handleQuest("reenterHandle", () -> overrideHandleService.OverrideHandle(taskFinishDomain));
     }
  
 }
@@ -20,12 +20,12 @@ public class PickupErrorController extends BaseController {
  
     @PostMapping("/pickupError")
     @ApiOperation("取货错")
-    @ApiLogger(apiName = "取货错", from="WCS")
+    @ApiLogger(apiName = "取货错", from = "WCS")
     @Transactional(rollbackFor = Exception.class)
     @ResponseBody
-    public AjaxResult pickupError(@RequestBody Map<String,String> map) {
+    public AjaxResult pickupError(@RequestBody Map<String, String> map) {
         String taskNo = map.get("taskNo");
-        return pickupErrorHandleService.PickupErrorHandle(taskNo);
+        return handleQuest("pickupError", () -> pickupErrorHandleService.PickupErrorHandle(taskNo));
     }
  
  
@@ -35,14 +35,7 @@ public class TaskFinishController extends BaseController {
     @ApiLogger(apiName = "wcs任务完成", from = "WCS")
     @ResponseBody
     public AjaxResult complete(@RequestBody TaskFinishDomain taskFinishDomain) {
-        AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
-            @Override
-            public AjaxResult doProcess() {
-                AjaxResult ajaxResult = taskFinishService.completeTaskByWCS(taskFinishDomain);
-                return ajaxResult;
-            }
-        });
-        return ajaxResult;
+        return handleMultiProcess(() -> taskFinishService.completeTaskByWCS(taskFinishDomain));
     }
  
 }
@@ -23,8 +23,8 @@ public class TaskInfoController extends BaseController {
  
     @ResponseBody
     @PostMapping("/info")
-    @ApiLogger(apiName = "取消任务", from="WCS")
+    @ApiLogger(apiName = "取消任务", from = "WCS")
     public AjaxResult info(@RequestBody WcsTask wcsTask) {
-        return taskInfoService.taskInfo(wcsTask.getTaskNo(), wcsTask.getWarehouseCode(), wcsTask.getArea());
+        return handleMultiProcess(() -> taskInfoService.taskInfo(wcsTask.getTaskNo(), wcsTask.getWarehouseCode(), wcsTask.getArea()));
     }
 }
@@ -15,11 +15,12 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
  
-/**仓位分配 接口
+/**
+ * 仓位分配 接口
  * wcs向wms传递数据
- * @author ricard
- * @date   2019/10/11
  *
+ * @author ricard
+ * @date 2019/10/11
  */
  
 @RestController
@@ -31,28 +32,21 @@ public class WarecellAllocation extends BaseController {
  
     @Log(title = "wcs仓位分配", action = BusinessType.INSERT)
     @PostMapping("/warecellAllocation")
-    @ApiOperation(value="wcs仓位分配", notes="wcs仓位分配", httpMethod = "POST")
+    @ApiOperation(value = "wcs仓位分配", notes = "wcs仓位分配", httpMethod = "POST")
     @ResponseBody
-    @ApiLogger(apiName = "wcs调用wms分配库位", from="WCS")
+    @ApiLogger(apiName = "wcs调用wms分配库位", from = "WCS")
     /*
      WCS给的长，宽，高，重在有不同规格库位才有用，destination是区域， locationType库位类型
      */
-    public AjaxResult warecellAllocation(@RequestBody WarecellDomain warecellDomain)  {
-        AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
-            @Override
-            public AjaxResult doProcess() {
-                AjaxResult ajaxResult = warecellAllocationService.warecellAllocation(warecellDomain);
-                return ajaxResult;
-            }
-        });
-        return ajaxResult;
+    public AjaxResult warecellAllocation(@RequestBody WarecellDomain warecellDomain) {
+        return handleMultiProcess(() -> warecellAllocationService.warecellAllocation(warecellDomain));
     }
  
     @Log(title = "wcs去向分配", action = BusinessType.INSERT)
     @PostMapping("/destinationAllocation")
-    @ApiOperation(value="wcs去向分配", notes="wcs去向分配", httpMethod = "POST")
+    @ApiOperation(value = "wcs去向分配", notes = "wcs去向分配", httpMethod = "POST")
     @ResponseBody
-    @ApiLogger(apiName = "去向分配", from="WCS")
+    @ApiLogger(apiName = "去向分配", from = "WCS")
     public AjaxResult destinationAllocation(String taskNo, String length, String width, String height, String weight) {
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskNo(taskNo);
@@ -5,7 +5,7 @@ import com.huaheng.mobile.download.Constant;
 /**
  * 数字自定义常量
  *
- * @author  ricard
+ * @author ricard
  */
 public class QuantityConstant {
     /**
@@ -42,7 +42,9 @@ public class QuantityConstant {
     /**通过*/
 //    public static final Integer RECEIPT_HEADER_APPROVE = 50;
  
-    /**订单池*/
+    /**
+     * 订单池
+     */
     public static final Integer RECEIPT_HEADER_POOL = 100;
  
     //入库预约
@@ -63,19 +65,22 @@ public class QuantityConstant {
     //等待上架
     public static final Integer RECEIPT_HEADER_WAIT = 280;
  
-    /** 上架 */
+    /**
+     * 上架
+     */
     public static final Integer RECEIPT_HEADER_SHELF = 300;
  
-    /** 过账*/
+    /**
+     * 过账
+     */
     public static final Integer RECEIPT_HEADER_POSTING = 800;
  
-    /** 回传 */
+    /**
+     * 回传
+     */
     public static final Integer RECEIPT_HEADER_RETURN = 900;
  
  
-
-
-
     //2、出库单状态
  
     //新建
@@ -106,7 +111,6 @@ public class QuantityConstant {
     public static final Integer SHIPMENT_HEADER_RETURN = 900;
  
  
-
     // 查询未完成的出入库单据使用
     public static final Integer HEADER_STATE = 290;
  
@@ -123,96 +127,139 @@ public class QuantityConstant {
     public static final Integer UPLOAD_SUCCESS = 20;
  
  
-
-
     //4、入库组盘状态
  
     //新建
     public static final Integer RECEIPT_CONTAINER_BUILD = 0;
  
-    /** 生成任务 */
-    public static final Integer RECEIPT_CONTAINER_TASK= 10;
+    /**
+     * 生成任务
+     */
+    public static final Integer RECEIPT_CONTAINER_TASK = 10;
  
-    /**上架完成 */
+    /**
+     * 上架完成
+     */
     public static final Integer RECEIPT_CONTAINER_FINISHED = 20;
  
-    /** 复核完成*/
+    /**
+     * 复核完成
+     */
     public static final Integer RECEIPT_CONTAINER_REVIEWSUCCESS = 30;
  
  
-
     //5、出库组盘状态
  
-    /** 新建 */
+    /**
+     * 新建
+     */
     public static final Integer SHIPMENT_CONTAINER_BUILD = 0;
  
-    /** 生成任务 */
-    public static final Integer SHIPMENT_CONTAINER_TASK= 10;
+    /**
+     * 生成任务
+     */
+    public static final Integer SHIPMENT_CONTAINER_TASK = 10;
  
-    /** 拣货完成 */
+    /**
+     * 拣货完成
+     */
     public static final Integer SHIPMENT_CONTAINER_FINISHED = 20;
  
-    /** 复核完成 */
+    /**
+     * 复核完成
+     */
     public static final Integer SHIPMENT_CONTAINER_REVIEWSUCCESS = 30;
  
  
-
     //6、任务类型
  
-    /** 整盘入库 */
+    /**
+     * 整盘入库
+     */
     public static final int TASK_TYPE_WHOLERECEIPT = 100;
  
-    /** 补充入库 */
+    /**
+     * 补充入库
+     */
     public static final int TASK_TYPE_SUPPLEMENTRECEIPT = 200;
  
-    /** 整盘出库 */
+    /**
+     * 整盘出库
+     */
     public static final int TASK_TYPE_WHOLESHIPMENT = 300;
  
-    /** 分拣出库 */
+    /**
+     * 分拣出库
+     */
     public static final int TASK_TYPE_SORTINGSHIPMENT = 400;
  
-    /** 空容器入库 */
+    /**
+     * 空容器入库
+     */
     public static final int TASK_TYPE_EMPTYRECEIPT = 500;
  
-    /** 空容器出库 */
+    /**
+     * 空容器出库
+     */
     public static final int TASK_TYPE_EMPTYSHIPMENT = 600;
  
-    /** 盘点 */
+    /**
+     * 盘点
+     */
     public static final int TASK_TYPE_CYCLECOUNT = 700;
  
-    /** 移库 */
+    /**
+     * 移库
+     */
     public static final int TASK_TYPE_TRANSFER = 800;
  
-    /** 出库查看 */
+    /**
+     * 出库查看
+     */
     public static final int TASK_TYPE_VIEW = 900;
  
-    /** 过站 */
+    /**
+     * 过站
+     */
     public static final int TASK_TYPE_OVER_STATION = 1000;
  
-    /** 空托盘组入库 */
+    /**
+     * 空托盘组入库
+     */
     public static final int TASK_TYPE_MANY_EMPTYRECEIPT = 1100;
  
-    /** 空托盘组出库 */
+    /**
+     * 空托盘组出库
+     */
     public static final int TASK_TYPE_MANY_EMPTYSHIPMENT = 1200;
  
  
-
     //7、任务状态
  
-    /** 生成任务 */
+    /**
+     * 生成任务
+     */
     public static final int TASK_STATUS_BUILD = 1;
  
-    /** 下达任务 */
+    /**
+     * 下达任务
+     */
     public static final int TASK_STATUS_RELEASE = 10;
  
-    /** 开始执行 */
+    /**
+     * 开始执行
+     */
     public static final int TASK_STATUS_RUNNING = 20;
  
-    /** 到达拣选站台 */
+    /**
+     * 到达拣选站台
+     */
     public static final int TASK_STATUS_ARRIVED_STATION = 50;
  
  
-    /** 任务完成 */
+    /**
+     * 任务完成
+     */
     public static final int TASK_STATUS_COMPLETED = 100;
  
  
@@ -250,8 +297,6 @@ public class QuantityConstant {
     public static final Integer WAVE_STEP_ERROR = 120;
  
  
-
-
     //9、质检状态
  
     //新建
@@ -264,7 +309,6 @@ public class QuantityConstant {
     public static final Integer CHECK_STATUS_COMPLETED = 20;
  
  
-
     //10、盘点状态
  
     //新建
@@ -277,7 +321,7 @@ public class QuantityConstant {
     public static final Integer CYCLECOUNT_STATUS_EXECUTING = 10;
  
     //已登记
-    public static final Integer CYCLECOUNT_STATUS_REGISTERED= 15;
+    public static final Integer CYCLECOUNT_STATUS_REGISTERED = 15;
  
     //审核
     public static final Integer CYCLECOUNT_STATUS_REVIEW = 30;
@@ -295,36 +339,49 @@ public class QuantityConstant {
     public static final Integer CYCLECOUNT_STATUS_GENERATEADJUST = 110;
  
  
-
-
     //11、库存交易类型
  
-    /** 入库 */
+    /**
+     * 入库
+     */
     public static final Integer INVENTORY_TRANSACTION_RECEIPT = 10;
  
-    /** 出库 */
+    /**
+     * 出库
+     */
     public static final Integer INVENTORY_TRANSACTION_SHIPMENT = 20;
  
-    /** 调整入 */
+    /**
+     * 调整入
+     */
     public static final Integer INVENTORY_TRANSACTION_ADJUSTINTO = 30;
  
-    /** 调整出 */
+    /**
+     * 调整出
+     */
     public static final Integer INVENTORY_TRANSACTION_ADJUSTOUT = 40;
  
-    /** 调整属性 */
+    /**
+     * 调整属性
+     */
     public static final Integer INVENTORY_TRANSACTION_ADJUSTPROPERTIES = 50;
  
-    /** 盘点 */
+    /**
+     * 盘点
+     */
     public static final Integer INVENTORY_TRANSACTION_CYCLECOUNT = 60;
  
-    /** 移库入 */
+    /**
+     * 移库入
+     */
     public static final Integer INVENTORY_TRANSACTION_TRANSFERINTO = 70;
  
-    /** 移库出 */
+    /**
+     * 移库出
+     */
     public static final Integer INVENTORY_TRANSACTION_TRANSFEROUT = 80;
  
  
-
     //12、调整单状态
  
     //未批准
@@ -342,20 +399,25 @@ public class QuantityConstant {
  
     //13、任务内部类型
  
-    /** 上架任务*/
+    /**
+     * 上架任务
+     */
     public static final Integer TASK_INTENERTYPE_RECEIPT = 100;
  
-    /** 拣货任务*/
+    /**
+     * 拣货任务
+     */
     public static final Integer TASK_INTENERTYPE_SHIPMENT = 200;
  
-    /** 工作任务*/
+    /**
+     * 工作任务
+     */
     public static final Integer TASK_INTENERTYPE_WORK = 300;
  
     //盘点任务
     public static final Integer TASK_INTENERTYPE_CYCLECOUNT = 400;
  
  
-
     //13、质检单类型
  
     //入库质检
@@ -412,7 +474,7 @@ public class QuantityConstant {
     public static final String STATUS_LOCATION_EMPTY = "empty";
     public static final String STATUS_LOCATION_LOCK = "lock";
  
-    public static final String RULE_SHIPMENT_TASK= "shipmentTaskRule";
+    public static final String RULE_SHIPMENT_TASK = "shipmentTaskRule";
     public static final String RULE_TASK_LOCATION = "taskLocationRule";
     public static final String RULE_CONNECT_WCS = "connectWcs";
     public static final String RULE_ALLOCATION = "allocationRule";
@@ -444,6 +506,8 @@ public class QuantityConstant {
  
     public static final int EMPTY_OUT = 1;
     public static final int NORMAL_OUT = 0;
+    public static final String ZONE_TYPE_PK = "平库";
+    public static final String ZONE_TYPE_LK = "立库";
  
  
     public static String ryTask_warehouse_code;
@@ -10,14 +10,14 @@ import java.io.Serializable;
 import java.util.Date;
  
 @Data
-@ApiModel(value="com.huaheng.pc.config.container.domain.Container")
+@ApiModel(value = "com.huaheng.pc.config.container.domain.Container")
 @TableName(value = "container")
 public class Container implements Serializable {
     /**
      * 内部号
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="内部号")
+    @ApiModelProperty(value = "内部号")
     @Excel(name = "内部号", type = Excel.Type.EXPORT)
     private Integer id;
  
@@ -25,7 +25,7 @@ public class Container implements Serializable {
      * 容器名字
      */
     @TableField(value = "name")
-    @ApiModelProperty(value="容器名字")
+    @ApiModelProperty(value = "容器名字")
     @Excel(name = "容器名字")
     private String name;
  
@@ -33,7 +33,7 @@ public class Container implements Serializable {
      * 容器编码
      */
     @TableField(value = "code")
-    @ApiModelProperty(value="容器编码")
+    @ApiModelProperty(value = "容器编码")
     @Excel(name = "容器编码")
     private String code;
  
@@ -41,7 +41,7 @@ public class Container implements Serializable {
      * 区域
      */
     @TableField(value = "area")
-    @ApiModelProperty(value="区域")
+    @ApiModelProperty(value = "区域")
     @Excel(name = "区域")
     private String area;
  
@@ -49,7 +49,7 @@ public class Container implements Serializable {
      * 仓库代码
      */
     @TableField(value = "warehouseCode")
-    @ApiModelProperty(value="仓库代码")
+    @ApiModelProperty(value = "仓库代码")
     @Excel(name = "仓库编码")
     private String warehouseCode;
  
@@ -57,7 +57,7 @@ public class Container implements Serializable {
      * 货主编码
      */
     @TableField(value = "companyCode")
-    @ApiModelProperty(value="货主编码")
+    @ApiModelProperty(value = "货主编码")
     @Excel(name = "货主编码")
     private String companyCode;
  
@@ -69,7 +69,7 @@ public class Container implements Serializable {
      * 容器类型
      */
     @TableField(value = "containerType")
-    @ApiModelProperty(value="容器类型")
+    @ApiModelProperty(value = "容器类型")
     @Excel(name = "容器类型")
     private String containerType;
  
@@ -78,7 +78,7 @@ public class Container implements Serializable {
      * 容器类型
      */
     @TableField(value = "goodsShelfNo")
-    @ApiModelProperty(value="AGV货架编码")
+    @ApiModelProperty(value = "AGV货架编码")
     @Excel(name = "AGV货架编码")
     private String goodsShelfNo;
  
@@ -86,58 +86,58 @@ public class Container implements Serializable {
      * 创建时间
      */
     @TableField(value = "created", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建人
      */
     @TableField(value = "createdBy", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建人")
+    @ApiModelProperty(value = "创建人")
     private String createdBy;
  
     /**
      * 最后更新时间
      */
     @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="最后更新时间")
+    @ApiModelProperty(value = "最后更新时间")
     private Date lastUpdated;
  
     /**
      * 最后更新人
      */
     @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="最后更新人")
+    @ApiModelProperty(value = "最后更新人")
     private String lastUpdatedBy;
  
     /**
      * 状态
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private String status;
  
     /**
      * 状态
      */
     @TableField(value = "lastStatus")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private String lastStatus;
  
     @TableField(value = "useCount")
-    @ApiModelProperty(value="生成任务计数")
+    @ApiModelProperty(value = "生成任务计数")
     @Excel(name = "生成任务计数")
     private int useCount;
  
     @TableField(value = "movementCount")
-    @ApiModelProperty(value="移库计数")
+    @ApiModelProperty(value = "移库计数")
     @Excel(name = "移库计数")
     private int movementCount;
     /**
      * 启用；0—禁用
      */
     @TableField(value = "enable")
-    @ApiModelProperty(value="启用；0—禁用")
+    @ApiModelProperty(value = "启用；0—禁用")
     @Excel(name = "是否启用", prompt = "启用；0 禁用:1")
     private Boolean enable;
  
@@ -145,85 +145,90 @@ public class Container implements Serializable {
      * 打印次数
      */
     @TableField(value = "printNum")
-    @ApiModelProperty(value="打印次数")
+    @ApiModelProperty(value = "打印次数")
     private Integer printNum;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-    @ApiModelProperty(value="数据版本")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
-    @ApiModelProperty(value="自定义字段1")
+    @ApiModelProperty(value = "自定义字段1")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
-    @ApiModelProperty(value="自定义字段3")
+    @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
-    @ApiModelProperty(value="自定义字段4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
-    @ApiModelProperty(value="自定义字段5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
-    @ApiModelProperty(value="自定义字段6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
-    @ApiModelProperty(value="自定义字段7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
-    @ApiModelProperty(value="自定义字段8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
-    @ApiModelProperty(value="处理标记")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
-  /**
-   * 打印机名称
-   * 当该类模板调用时
-   */
-  //    private static final String printName = "Bar Code Printer T-4503E";
-  private static final long serialVersionUID = 1L;
+
+    @TableField(value = "flat")
+    @ApiModelProperty(value = "是否平库")
+    private Integer flat;
+
+    /**
+     * 打印机名称
+     * 当该类模板调用时
+     */
+    //    private static final String printName = "Bar Code Printer T-4503E";
+    private static final long serialVersionUID = 1L;
  
     @Override
     public String toString() {
@@ -246,8 +251,8 @@ public class Container implements Serializable {
         sb.append(", enable=").append(enable);
         sb.append(", printNum=").append(printNum);
         sb.append(", version=").append(version);
-      //        sb.append(", printName").append(printName);
-      sb.append(", userDef1=").append(userDef1);
+        //        sb.append(", printName").append(printName);
+        sb.append(", userDef1=").append(userDef1);
         sb.append(", userDef2=").append(userDef2);
         sb.append(", userDef3=").append(userDef3);
         sb.append(", userDef4=").append(userDef4);
@@ -109,17 +109,12 @@ public class ZoneController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(Zone zone) {
-        zone.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        zone.setCreatedBy(ShiroUtils.getName());
-        zone.setLastUpdatedBy(ShiroUtils.getName());
-        zone.setZoneDescribe(zone.getZoneDescribe());
-        zone.setZoneType(zone.getLocationType());
-        try {
-            zoneService.dataValidation(zone);
-        } catch (Exception e) {
-            return AjaxResult.error(e.getMessage());
-        }
-        return toAjax(zoneService.save(zone));
+        //try {
+        //    zoneService.dataValidation(zone);
+        //} catch (Exception e) {
+        //    return AjaxResult.error(e.getMessage());
+        //}
+        return toAjax(zoneService.saveZone(zone));
     }
  
     /**
@@ -155,10 +150,7 @@ public class ZoneController extends BaseController {
         if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
-        for (Integer id : Convert.toIntArray(ids)) {
-            Zone record = new Zone();
-            zoneService.removeById(id);
-        }
+        zoneService.removeZoneById(ids);
         return AjaxResult.success("删除成功！");
     }
  
@@ -6,22 +6,29 @@ import com.huaheng.pc.config.zone.domain.Zone;
 import java.util.List;
 import java.util.Map;
  
-public interface ZoneService extends IService<Zone>{
+public interface ZoneService extends IService<Zone> {
     public List<Map<String, Object>> getZoneCodeList();
  
     /* 复制库区表*/
     boolean zoneCopy(String warehouseCode, String newWarehouseCode);
  
-    boolean exists(String code,String warehouseCode);
+    boolean exists(String code, String warehouseCode);
  
     List<Map<String, Object>> getCode();
  
+    List<Map<String, Object>> getZoneFlatCodeList();
+
     Zone getZoneByArea(String area);
  
     /**
      * 数据校验
+     *
      * @param zone 待校验数据
      * @throws Exception 错误提升
      */
     void dataValidation(Zone zone) throws Exception;
+
+    int saveZone(Zone zone);
+
+    void removeZoneById(String id);
 }
@@ -3,12 +3,23 @@ package com.huaheng.pc.config.zone.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.service.ContainerService;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+import com.huaheng.pc.config.locationType.service.LocationTypeService;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.mapper.ZoneMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -21,6 +32,16 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements Zo
  
     @Resource
     private ZoneMapper zoneMapper;
+    @Autowired
+    private ZoneService zoneService;
+    @Resource
+    private LocationTypeService locationTypeService;
+    @Resource
+    private LocationService locationService;
+    @Resource
+    private ContainerService containerService;
+    @Resource
+    private ContainerTypeService containerTypeService;
  
     @Override
     public List<Map<String, Object>> getZoneCodeList() {
@@ -35,18 +56,17 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements Zo
     public boolean zoneCopy(String warehouseCode, String newWarehouseCode) {
         int i = 0;
         //复制流程主表
-        i = zoneMapper.zoneCopy(warehouseCode,newWarehouseCode);
-        if(i < 1){
+        i = zoneMapper.zoneCopy(warehouseCode, newWarehouseCode);
+        if (i < 1) {
             throw new ServiceException("复制菜单数据失败");
         }
         return true;
     }
  
     @Override
-    public boolean exists(String code,String warehouseCode)
-    {
+    public boolean exists(String code, String warehouseCode) {
         LambdaQueryWrapper<Zone> lambda = Wrappers.lambdaQuery();
-        lambda.eq(Zone::getCode,code)
+        lambda.eq(Zone::getCode, code)
                 .eq(Zone::getWarehouseCode, warehouseCode);
         return this.listMaps(lambda).size() != 0;
     }
@@ -59,6 +79,16 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements Zo
         return this.listMaps(lambda);
     }
  
+
+    @Override
+    public List<Map<String, Object>> getZoneFlatCodeList() {
+        LambdaQueryWrapper<Zone> lambda = Wrappers.lambdaQuery();
+        lambda.select(Zone::getCode, Zone::getId, Zone::getName)
+                .eq(Zone::getZoneType, "平库")
+                .eq(Zone::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        return this.listMaps(lambda);
+    }
+
     @Override
     public Zone getZoneByArea(String area) {
         LambdaQueryWrapper<Zone> zoneLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -69,17 +99,163 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements Zo
  
     @Override
     public void dataValidation(Zone zone) throws Exception {
-        if (StringUtils.isEmpty(zone.getCode())){
+        if (StringUtils.isEmpty(zone.getCode())) {
             throw new Exception("库区编码不能为空值！");
         }
-        if (StringUtils.isEmpty(zone.getWarehouseCode())){
+        if (StringUtils.isEmpty(zone.getWarehouseCode())) {
             throw new Exception("仓库编码不能为空值!");
         }
         LambdaQueryWrapper<Zone> query = Wrappers.lambdaQuery();
         query.eq(Zone::getCode, zone.getCode()).
                 eq(Zone::getWarehouseCode, zone.getWarehouseCode());
-        if (this.getOne(query) != null){
+        if (this.getOne(query) != null) {
             throw new Exception("库区编码已存在！");
         }
     }
+
+    @Transactional
+    @Override
+    public int saveZone(Zone zone) {
+        zone.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        zone.setCreatedBy(ShiroUtils.getName());
+        zone.setLastUpdatedBy(ShiroUtils.getName());
+        zone.setZoneDescribe(zone.getZoneDescribe());
+        zone.setEnable("1");
+
+        if (StringUtils.isEmpty(zone.getCode())) {
+            throw new ServiceException(("库区编码不能为空值！"));
+        }
+        if (getOne(new LambdaQueryWrapper<Zone>().eq(Zone::getCode, zone.getCode()).eq(Zone::getWarehouseCode, zone.getWarehouseCode())) != null) {
+            throw new ServiceException(("库区编码已存在！"));
+        }
+        //如果新增平库库区，需要新增库位类型和库位，容器类型和容器
+
+        if (zone.getZoneType().equals(QuantityConstant.ZONE_TYPE_PK)) {
+            //新增库位类型
+            String locationTypeCode = addLocationType(zone);
+            zone.setLocationType(locationTypeCode);
+            //新增库位
+            addLocation(zone, locationTypeCode);
+            //新增容器类型
+            String containerTypeCode = addContainerType(zone, locationTypeCode);
+            //新增容器
+            addContainer(zone, containerTypeCode);
+        }
+
+        zone.setZoneType(zone.getZoneType());
+        return zoneMapper.insert(zone);
+    }
+
+
+    private void addContainer(Zone zone, String containerTypeCode) {
+        Container container = new Container();
+        container.setCode(zone.getCode() + "TP");
+        container.setWarehouseCode(zone.getWarehouseCode());
+        container.setContainerType(containerTypeCode);
+        container.setCreatedBy(zone.getCreatedBy());
+        container.setLastUpdatedBy(zone.getLastUpdatedBy());
+        container.setEnable(true);
+        container.setStatus("empty");
+        container.setFlat(1);
+        boolean save = containerService.save(container);
+        if (!save) {
+            throw new ServiceException("新增容器失败");
+        }
+    }
+
+    private String addContainerType(Zone zone, String locationTypeCode) {
+        ContainerType containerType = new ContainerType();
+        containerType.setCode(zone.getCode());
+        containerType.setName(zone.getName() + "托盘");
+        containerType.setWarehouseCode(zone.getWarehouseCode());
+        containerType.setCreatedBy(zone.getCreatedBy());
+        containerType.setLastUpdatedBy(zone.getLastUpdatedBy());
+        containerType.setLocationType(locationTypeCode);
+        containerType.setEnable(true);
+        containerType.setFillPercent(100);
+        boolean save = containerTypeService.save(containerType);
+        if (!save) {
+            throw new ServiceException("新增容器类型失败");
+        }
+        return containerType.getCode();
+    }
+
+    private void addLocation(Zone zone, String locationTypeCode) {
+        Location location = new Location();
+        location.setCode(zone.getCode() + "KW");
+        location.setWarehouseCode(zone.getWarehouseCode());
+        location.setLocationType(locationTypeCode);
+        location.setStatus("empty");
+        location.setCreatedBy(zone.getCreatedBy());
+        location.setZoneCode(zone.getCode());
+        location.setArea(zone.getArea());
+        location.setIColumn(1);
+        location.setIRow(1);
+        location.setILayer(1);
+        location.setIGrid(1);
+        location.setRowFlag(0);
+        location.setRoadway("1");
+        location.setZoneCode(zone.getCode());
+        boolean save = locationService.save(location);
+        if (!save) {
+            throw new ServiceException("新增库位失败");
+        }
+    }
+
+
+    private String addLocationType(Zone zone) {
+        LocationType locationType = new LocationType();
+        locationType.setCode(zone.getCode());
+        locationType.setName(zone.getName() + "库位");
+        locationType.setWarehouseCode(zone.getWarehouseCode());
+        locationType.setCreatedBy(zone.getCreatedBy());
+        locationType.setLastUpdatedBy(zone.getCreatedBy());
+        locationType.setHeight("1");
+        locationType.setLength("1");
+        locationType.setWidth("1");
+        locationType.setEnable(true);
+        locationType.setZoneCode(zone.getCode());
+        boolean save = locationTypeService.save(locationType);
+        if (!save) {
+            throw new ServiceException("新增库位类型失败");
+        }
+        return locationType.getCode();
+    }
+
+
+    @Override
+    @Transactional
+    public void removeZoneById(String id) {
+        boolean remove = false;
+        Zone zone = getById(id);
+        if (zone == null) {
+            throw new ServiceException("库区不存在");
+        }
+        if (zone.getZoneType().equals(QuantityConstant.ZONE_TYPE_PK)) {
+            //删除库位类型
+            remove = locationTypeService.remove(new LambdaQueryWrapper<LocationType>().eq(LocationType::getCode, zone.getCode()));
+            if (!remove) {
+                throw new ServiceException("删除库位类型失败");
+            }
+            //删除库位
+            remove = locationService.remove(new LambdaQueryWrapper<Location>().eq(Location::getLocationType, zone.getCode()));
+            if (!remove) {
+                throw new ServiceException("删除库位失败");
+            }
+            //删除容器类型
+            remove = containerTypeService.remove(new LambdaQueryWrapper<ContainerType>().eq(ContainerType::getCode, zone.getCode()));
+            if (!remove) {
+                throw new ServiceException("删除容器类型失败");
+            }
+            //删除容器
+            remove = containerService.remove(new LambdaQueryWrapper<Container>().eq(Container::getContainerType, zone.getCode()));
+            if (!remove) {
+                throw new ServiceException("删除容器失败");
+            }
+        }
+        if (!removeById(id)) {
+            throw new ServiceException("删除库区失败");
+        }
+    }
+
 }
@@ -75,7 +75,7 @@ public class ApiLogController extends BaseController {
         Date requestTime = new Date();
         try {
             requestTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD, endRequestTime);
-        }catch (Exception e){
+        } catch (Exception e) {
  
         }
         requestTime = DateUtils.addDays(requestTime, 1);
@@ -85,10 +85,11 @@ public class ApiLogController extends BaseController {
                 .eq(StringUtils.isNotEmpty(apiLog.getRequestFrom()), ApiLog::getRequestFrom, apiLog.getRequestFrom())
                 .eq(StringUtils.isNotEmpty(apiLog.getResponseBy()), ApiLog::getResponseBy, apiLog.getResponseBy())
                 .like(StringUtils.isNotEmpty(apiLog.getRequestBody()), ApiLog::getRequestBody, apiLog.getRequestBody())
+                .like(StringUtils.isNotEmpty(apiLog.getResponseBody()), ApiLog::getResponseBody, apiLog.getResponseBody())
                 .ge(StringUtils.isNotEmpty(beginRequestTime), ApiLog::getRequestTime, beginRequestTime)
                 .ge(NumberUtils.isDigits(paramDuration), ApiLog::getDuration, paramDuration)
-                .isNotNull("1".equals(hasException),ApiLog::getException)
-                .isNull("0".equals(hasException),ApiLog::getException)
+                .isNotNull("1".equals(hasException), ApiLog::getException)
+                .isNull("0".equals(hasException), ApiLog::getException)
                 .le(StringUtils.isNotEmpty(endRequestTime), ApiLog::getRequestTime, requestTime)
                 .eq(StringUtils.isNotEmpty(apiLog.getHttpCode()), ApiLog::getHttpCode, apiLog.getHttpCode())
                 .eq(StringUtils.isNotEmpty(apiLog.getRetCode()), ApiLog::getRetCode, apiLog.getRetCode()).orderByDesc(ApiLog::getId);
@@ -40,27 +40,27 @@ public class ReceiptContainerDetailController extends BaseController {
     @RequiresPermissions("receipt:receiptContainerDetail:view")
     @Log(title = "入库-入库详情列表", operating = "入库详情列表", action = BusinessType.GRANT)
     @GetMapping("/list/{id}")
-    public String list(@PathVariable("id")Integer id, ModelMap mmap) {
+    public String list(@PathVariable("id") Integer id, ModelMap mmap) {
         mmap.put("receiptId", id);
-        return prefix+"/receiptDetail";
+        return prefix + "/receiptDetail";
     }
  
     /**
      * 查询入库详情
      */
-    @ApiOperation(value="查看入库详情", notes="根据头表id获取入库单明细信息", httpMethod = "POST")
+    @ApiOperation(value = "查看入库详情", notes = "根据头表id获取入库单明细信息", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptDetail:list")
     @Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
     @PostMapping("/list/{id}")
     @ResponseBody
-    public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库详情") @PathVariable("id")Integer receiptDetailId) {
+    public TableDataInfo list(@ApiParam(name = "receiptDetail", value = "入库详情") @PathVariable("id") Integer receiptDetailId) {
         LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptDetailId);
  
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
             /*使用分页查询*/
             Page<ReceiptContainerDetail> page = new Page<>(pageNum, pageSize);
             IPage<ReceiptContainerDetail> iPage = receiptContainerDetailService.page(page, lambdaQueryWrapper);
@@ -76,11 +76,10 @@ public class ReceiptContainerDetailController extends BaseController {
     @PostMapping("remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        if (StringUtils.isEmpty(ids)){
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
-
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
-        return toAjax(receiptContainerDetailService.detailRemove(idList));
+        return handleMultiProcess(() -> toAjax(receiptContainerDetailService.detailRemove(idList)));
     }
 }
@@ -9,352 +9,356 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
  
-@ApiModel(value="com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail")
+@ApiModel(value = "com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail")
 @TableName(value = "receipt_container_detail")
 @Data
 public class ReceiptContainerDetail implements Serializable {
     /**
      * ID
      */
-     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "ID")
     private Integer id;
  
     /**
      * 主表标识
      */
     @TableField(value = "receiptContainerId")
-    @ApiModelProperty(value="主表标识")
+    @ApiModelProperty(value = "主表标识")
     private Integer receiptContainerId;
  
     /**
      * 仓库
      */
     @TableField(value = "warehouseCode")
-    @ApiModelProperty(value="仓库")
+    @ApiModelProperty(value = "仓库")
     private String warehouseCode;
  
     /**
      * 入库单内部号
      */
     @TableField(value = "receiptId")
-    @ApiModelProperty(value="入库单内部号")
+    @ApiModelProperty(value = "入库单内部号")
     private Integer receiptId;
  
     /**
      * 入库单明细行号
      */
     @TableField(value = "receiptDetailId")
-    @ApiModelProperty(value="入库单明细行号")
+    @ApiModelProperty(value = "入库单明细行号")
     private Integer receiptDetailId;
  
     /**
      * 入库单编码
      */
     @TableField(value = "receiptCode")
-    @ApiModelProperty(value="入库单编码")
+    @ApiModelProperty(value = "入库单编码")
     private String receiptCode;
  
     /**
      * 入库单类型
      */
     @TableField(value = "receiptType")
-    @ApiModelProperty(value="入库单类型")
+    @ApiModelProperty(value = "入库单类型")
     private String receiptType;
  
     /**
      * 库位编码
      */
     @TableField(value = "locationCode")
-    @ApiModelProperty(value="库位编码")
+    @ApiModelProperty(value = "库位编码")
     private String locationCode;
  
     /**
      * 货箱号
      */
     @TableField(value = "containerCode")
-    @ApiModelProperty(value="货箱号")
+    @ApiModelProperty(value = "货箱号")
     private String containerCode;
  
     /**
      * 货箱类型
      */
     @TableField(value = "containerType")
-    @ApiModelProperty(value="货箱类型")
+    @ApiModelProperty(value = "货箱类型")
     private String containerType;
  
     /**
      * 任务类型
      */
     @TableField(value = "taskType")
-    @ApiModelProperty(value="任务类型")
+    @ApiModelProperty(value = "任务类型")
     private Integer taskType;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
-    @ApiModelProperty(value="货主")
+    @ApiModelProperty(value = "货主")
     private String companyCode;
  
     /**
      * 物料
      */
     @TableField(value = "materialCode")
-    @ApiModelProperty(value="物料")
+    @ApiModelProperty(value = "物料")
     private String materialCode;
  
     /**
      * 物料名称
      */
     @TableField(value = "materialName")
-    @ApiModelProperty(value="物料名称")
+    @ApiModelProperty(value = "物料名称")
     private String materialName;
  
     /**
      * 物料规格
      */
     @TableField(value = "materialSpec")
-    @ApiModelProperty(value="物料规格")
+    @ApiModelProperty(value = "物料规格")
     private String materialSpec;
  
     /**
      * 物料单位
      */
     @TableField(value = "materialUnit")
-    @ApiModelProperty(value="物料单位")
+    @ApiModelProperty(value = "物料单位")
     private String materialUnit;
  
     /**
      * 数量
      */
     @TableField(value = "qty")
-    @ApiModelProperty(value="数量")
+    @ApiModelProperty(value = "数量")
     private BigDecimal qty;
  
     /**
      * 状态
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private Integer status;
  
     /**
      * 属性号
      */
     @TableField(value = "attributeId")
-    @ApiModelProperty(value="属性号")
+    @ApiModelProperty(value = "属性号")
     private Integer attributeId;
  
     /**
      * 属性1
      */
     @TableField(value = "attribute1")
-    @ApiModelProperty(value="属性1")
+    @ApiModelProperty(value = "属性1")
     private String attribute1;
  
     /**
      * 属性2
      */
     @TableField(value = "attribute2")
-    @ApiModelProperty(value="属性2")
+    @ApiModelProperty(value = "属性2")
     private String attribute2;
  
     /**
      * 属性3
      */
     @TableField(value = "attribute3")
-    @ApiModelProperty(value="属性3")
+    @ApiModelProperty(value = "属性3")
     private String attribute3;
  
     /**
      * 属性4
      */
     @TableField(value = "attribute4")
-    @ApiModelProperty(value="属性4")
+    @ApiModelProperty(value = "属性4")
     private String attribute4;
  
     /**
      * 供应商编码
      */
     @TableField(value = "supplierCode")
-    @ApiModelProperty(value="供应商编码")
+    @ApiModelProperty(value = "供应商编码")
     private String supplierCode;
  
     /**
      * 批次
      */
     @TableField(value = "batch")
-    @ApiModelProperty(value="批次")
+    @ApiModelProperty(value = "批次")
     private String batch;
  
     /**
      * 批号
      */
     @TableField(value = "lot")
-    @ApiModelProperty(value="批号")
+    @ApiModelProperty(value = "批号")
     private String lot;
  
     /**
      * 项目号
      */
     @TableField(value = "projectNo")
-    @ApiModelProperty(value="项目号")
+    @ApiModelProperty(value = "项目号")
     private String projectNo;
  
     /**
      * 重量
      */
     @TableField(value = "weight")
-    @ApiModelProperty(value="重量")
+    @ApiModelProperty(value = "重量")
     private String weight;
  
     /**
      * 生产日期
      */
     @TableField(value = "manufactureDate")
-    @ApiModelProperty(value="生产日期")
+    @ApiModelProperty(value = "生产日期")
     private Date manufactureDate;
  
     /**
      * 失效日期
      */
     @TableField(value = "expirationDate")
-    @ApiModelProperty(value="失效日期")
+    @ApiModelProperty(value = "失效日期")
     private Date expirationDate;
  
     /**
      * 入库日期
      */
     @TableField(value = "agingDate")
-    @ApiModelProperty(value="入库日期")
+    @ApiModelProperty(value = "入库日期")
     private Date agingDate;
  
     /**
      * 库存状态
      */
     @TableField(value = "inventorySts")
-    @ApiModelProperty(value="库存状态")
+    @ApiModelProperty(value = "库存状态")
     private String inventorySts;
  
     /**
      * 任务已创建
      */
     @TableField(value = "taskCreated")
-    @ApiModelProperty(value="任务已创建")
+    @ApiModelProperty(value = "任务已创建")
     private Integer taskCreated;
  
     /**
      * 换算数量
      */
     @TableField(value = "convertedQty")
-    @ApiModelProperty(value="换算数量")
+    @ApiModelProperty(value = "换算数量")
     private Integer convertedQty;
  
     /**
      * 换算单位
      */
     @TableField(value = "convertedQtyUnit")
-    @ApiModelProperty(value="换算单位")
+    @ApiModelProperty(value = "换算单位")
     private String convertedQtyUnit;
  
     /**
      * 创建时间
      */
     @TableField(value = "created", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建用户")
+    @ApiModelProperty(value = "创建用户")
     private String createdBy;
  
     /**
      * 创建时间
      */
     @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="更新用户")
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-    @ApiModelProperty(value="数据版本")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
-    @ApiModelProperty(value="自定义字段1")
+    @ApiModelProperty(value = "自定义字段1")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
-    @ApiModelProperty(value="自定义字段3")
+    @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
-    @ApiModelProperty(value="自定义字段4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
-    @ApiModelProperty(value="自定义字段5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
-    @ApiModelProperty(value="自定义字段6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
-    @ApiModelProperty(value="自定义字段7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
-    @ApiModelProperty(value="自定义字段8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
-    @ApiModelProperty(value="处理标记")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
+
+    @TableField(value = "flat")
+    @ApiModelProperty(value = "是否平库")
+    private Integer flat;
     private static final long serialVersionUID = 1L;
-}
 \ No newline at end of file
+}
@@ -9,6 +9,8 @@ import com.huaheng.common.utils.StringUtils;
 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.service.ContainerService;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
@@ -41,6 +43,9 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
     @Resource
     private LocationService locationService;
  
+    @Resource
+    private ContainerService containerService;
+
     /**
      * 根据入库单编码查询入库组盘明细
      *
@@ -73,11 +78,19 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
                 ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
                 receiptDetail.setTaskQty(receiptDetail.getTaskQty().subtract(receiptContainerDetail.getQty()));
  
-                //如果为临时容器，则删除
-                receiptContainerDetail.getContainerCode();
+                //如果是临时容器，取消组盘时删除容器表
+                //if (receiptContainerDetail.getContainerCode().length() > 6) {
+                //    Container one = containerService.getOne(new LambdaQueryWrapper<Container>().eq(Container::getCode, receiptContainerDetail.getContainerCode()));
+                //    if (one == null) {
+                //        throw new ServiceException("容器表没有该容器，容器号是" + receiptContainerDetail.getContainerCode());
+                //    }
+                //    if (!containerService.removeById(one)) {
+                //        throw new ServiceException("删除容器表失败，容器号是" + receiptContainerDetail.getContainerCode());
+                //    }
+                //}
  
                 if (!receiptDetailService.updateById(receiptDetail)) {
-                    throw new SecurityException("回滚入库单明细失败");
+                    throw new ServiceException("回滚入库单明细失败");
                 }
                 //删除组盘明细
                 if (!this.removeById(id)) {
@@ -103,7 +116,7 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
  
  
                 //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
-                if (containerDetailList.size() == 0) {
+                if (containerDetailList.isEmpty()) {
                     ReceiptHeader receiptHeader = new ReceiptHeader();
                     receiptHeader.setId(receiptContainerDetail.getReceiptId());
                     receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
@@ -40,6 +40,7 @@ import java.util.stream.Collectors;
  
 /**
  * 入库组盘头表控制
+ *
  * @author mahuaheng
  */
 @Controller
@@ -61,8 +62,7 @@ public class ReceiptContainerHeaderController extends BaseController {
  
     @RequiresPermissions("receipt:receiptContainer:view")
     @GetMapping()
-    public String containerCapacity()
-    {
+    public String containerCapacity() {
         return prefix + "/receiptContainerHeader";
     }
  
@@ -73,8 +73,8 @@ public class ReceiptContainerHeaderController extends BaseController {
     @Log(title = "入库-入库单组盘", operating = "查看入库组盘列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库组盘头表") ReceiptContainerHeader receiptContainerHeader,
-                              @ApiParam(name = "receiptCode",value = "入库单号")String receiptCode,
+    public TableDataInfo list(@ApiParam(name = "receiptDetail", value = "入库组盘头表") ReceiptContainerHeader receiptContainerHeader,
+                              @ApiParam(name = "receiptCode", value = "入库单号") String receiptCode,
                               @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
                               @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
         LambdaQueryWrapper<ReceiptContainerHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -83,24 +83,24 @@ public class ReceiptContainerHeaderController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         String sql = null;
         if (StringUtils.isNotEmpty(receiptCode)) {
-            sql = "select receiptContainerId from receipt_container_detail where receiptCode = \'"+receiptCode+"\'";
+            sql = "select receiptContainerId from receipt_container_detail where receiptCode = \'" + receiptCode + "\'";
         }
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptContainerHeader::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), ReceiptContainerHeader::getCreated, createdEnd)
                 .eq(ReceiptContainerHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
-                .like(StringUtils.isNotEmpty(receiptContainerHeader.getContainerCode()),ReceiptContainerHeader::getContainerCode, receiptContainerHeader.getContainerCode())
-                .eq(StringUtils.isNotEmpty(receiptContainerHeader.getToLocation()),ReceiptContainerHeader::getToLocation, receiptContainerHeader.getToLocation())
-                .eq(StringUtils.isNotNull(receiptContainerHeader.getTaskType()),ReceiptContainerHeader::getTaskType, receiptContainerHeader.getTaskType())
-                .eq(StringUtils.isNotNull(receiptContainerHeader.getStatus()),ReceiptContainerHeader::getStatus, receiptContainerHeader.getStatus())
-                .eq(StringUtils.isNotEmpty(receiptContainerHeader.getCreatedBy()),ReceiptContainerHeader::getCreatedBy, receiptContainerHeader.getCreatedBy())
+                .like(StringUtils.isNotEmpty(receiptContainerHeader.getContainerCode()), ReceiptContainerHeader::getContainerCode, receiptContainerHeader.getContainerCode())
+                .eq(StringUtils.isNotEmpty(receiptContainerHeader.getToLocation()), ReceiptContainerHeader::getToLocation, receiptContainerHeader.getToLocation())
+                .eq(StringUtils.isNotNull(receiptContainerHeader.getTaskType()), ReceiptContainerHeader::getTaskType, receiptContainerHeader.getTaskType())
+                .eq(StringUtils.isNotNull(receiptContainerHeader.getStatus()), ReceiptContainerHeader::getStatus, receiptContainerHeader.getStatus())
+                .eq(StringUtils.isNotEmpty(receiptContainerHeader.getCreatedBy()), ReceiptContainerHeader::getCreatedBy, receiptContainerHeader.getCreatedBy())
                 .inSql(StringUtils.isNotEmpty(receiptCode), ReceiptContainerHeader::getId, sql)
                 .orderByAsc(ReceiptContainerHeader::getStatus)
                 .orderByDesc(ReceiptContainerHeader::getId);
  
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
             Page<ReceiptContainerHeader> page = new Page<>(pageNum, pageSize);
             IPage<ReceiptContainerHeader> iPage = receiptContainerHeaderService.page(page, lambdaQueryWrapper);
-            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
         } else {
             List<ReceiptContainerHeader> list = receiptContainerHeaderService.list(lambdaQueryWrapper);
             return getDataTable(list);
@@ -110,13 +110,13 @@ public class ReceiptContainerHeaderController extends BaseController {
     /**
      * 删除入库组盘
      */
-    @ApiOperation(value="取消", notes="取消入库组盘", httpMethod = "POST")
+    @ApiOperation(value = "取消", notes = "取消入库组盘", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptContainer:remove")
-    @Log(title = "入库-入库单 ",operating = "取消入库组盘", action = BusinessType.UPDATE)
+    @Log(title = "入库-入库单 ", operating = "取消入库组盘", action = BusinessType.UPDATE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")String ids){
-        if (StringUtils.isNull(ids)){
+    public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串") String ids) {
+        if (StringUtils.isNull(ids)) {
             return AjaxResult.error("id为空");
         }
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
@@ -127,7 +127,7 @@ public class ReceiptContainerHeaderController extends BaseController {
      * 选择出库口
      */
     @GetMapping("/chooseStation/{ids}")
-    public String chooseStation(@PathVariable("ids")String ids, ModelMap mmap) {
+    public String chooseStation(@PathVariable("ids") String ids, ModelMap mmap) {
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList());
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(idsList.get(0));
@@ -135,10 +135,10 @@ public class ReceiptContainerHeaderController extends BaseController {
         mmap.put("containerCode", containerCode);
         mmap.put("id", ids);
         int taskType = receiptContainerHeader.getTaskType().intValue();
-        if(taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT ||
-                taskType == QuantityConstant.TASK_TYPE_EMPTYSHIPMENT)  {
+        if (taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT ||
+                taskType == QuantityConstant.TASK_TYPE_EMPTYSHIPMENT) {
             mmap.put("type", QuantityConstant.STATION_OUT);
-        } else if(taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT ||
+        } else if (taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT ||
                 taskType == QuantityConstant.TASK_TYPE_SORTINGSHIPMENT ||
                 taskType == QuantityConstant.TASK_TYPE_VIEW ||
                 taskType == QuantityConstant.TASK_TYPE_CYCLECOUNT) {
@@ -152,10 +152,10 @@ public class ReceiptContainerHeaderController extends BaseController {
     @Log(title = "设置站台", operating = "设置站台", action = BusinessType.GRANT)
     @PostMapping("/setStation")
     @ResponseBody
-    public AjaxResult setStation (String ids, String type, String containerCode, String port){
+    public AjaxResult setStation(String ids, String type, String containerCode, String port) {
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList());
-        for(Integer id : idsList) {
+        for (Integer id : idsList) {
             LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
             receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getId, id);
             ReceiptContainerHeader receiptContainerHeader1 = receiptContainerHeaderService.getOne(receiptContainerHeaderLambdaQueryWrapper);
@@ -170,15 +170,15 @@ public class ReceiptContainerHeaderController extends BaseController {
      */
     @RequiresPermissions("receipt:receiptContainer:createTask")
     @Log(title = "入库-任务生成", operating = "生成入库任务", action = BusinessType.INSERT)
-    @PostMapping( "/createTask")
+    @PostMapping("/createTask")
     @ResponseBody
     public AjaxResult addTask(String ids) {
-        if (StringUtils.isEmpty(ids)){
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList());
-        return receiptTaskService.createReceiptTask(idsList);
+        return handleMultiProcess(() -> receiptTaskService.createReceiptTask(idsList));
     }
  
     /**
@@ -186,24 +186,24 @@ public class ReceiptContainerHeaderController extends BaseController {
      */
     @RequiresPermissions("receipt:receiptContainer:position")
     @Log(title = "入库-定位", operating = "定位", action = BusinessType.INSERT)
-    @PostMapping( "/position")
+    @PostMapping("/position")
     @ResponseBody
-    public AjaxResult position(PositionBean positionBean){
-        if (StringUtils.isEmpty(positionBean.getIds())){
+    public AjaxResult position(PositionBean positionBean) {
+        if (StringUtils.isEmpty(positionBean.getIds())) {
             return AjaxResult.error("id不能为空");
         }
         boolean result = false;
         List<Integer> idList = Arrays.asList(Convert.toIntArray(positionBean.getIds()));
         List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList());
-        for (int i = 0; i<idsList.size(); i++) {
+        for (int i = 0; i < idsList.size(); i++) {
             LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
             lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idsList.get(i));
             List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
             for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails) {
-                result =  receivingService.position(receiptContainerDetail, positionBean.getArea());
+                result = receivingService.position(receiptContainerDetail, positionBean.getArea());
             }
         }
-        if(!result) {
+        if (!result) {
             return AjaxResult.error("定位失败");
         }
         return AjaxResult.success("定位成功");
@@ -214,14 +214,14 @@ public class ReceiptContainerHeaderController extends BaseController {
      */
     @RequiresPermissions("receipt:receiptContainer:canalPosition")
     @Log(title = "入库-取消定位", operating = "取消定位", action = BusinessType.OTHER)
-    @PostMapping( "/cancelPosition")
+    @PostMapping("/cancelPosition")
     @ResponseBody
-    public AjaxResult cancelPosition(String ids){
-        if (StringUtils.isEmpty(ids)){
+    public AjaxResult cancelPosition(String ids) {
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
-        for (int i = 0; i<idList.size(); i++){
+        for (int i = 0; i < idList.size(); i++) {
             LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
             lambda.eq(ReceiptContainerDetail::getReceiptContainerId, idList.get(i));
             List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
@@ -236,7 +236,7 @@ public class ReceiptContainerHeaderController extends BaseController {
      * 定位
      */
     @GetMapping("/positioning/{ids}")
-    public String positioning(@PathVariable("ids")String ids, ModelMap mmap){
+    public String positioning(@PathVariable("ids") String ids, ModelMap mmap) {
         mmap.put("ids", ids);
         return "receipt/receiving" + "/positioning";
     }
@@ -8,220 +8,225 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
  
-@ApiModel(value="com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader")
+@ApiModel(value = "com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader")
 @TableName(value = "receipt_container_header")
 @Data
 public class ReceiptContainerHeader implements Serializable {
     /**
      * ID
      */
-     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "ID")
     private Integer id;
  
     /**
      * 仓库
      */
     @TableField(value = "warehouseCode")
-    @ApiModelProperty(value="仓库")
+    @ApiModelProperty(value = "仓库")
     private String warehouseCode;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
-    @ApiModelProperty(value="货主")
+    @ApiModelProperty(value = "货主")
     private String companyCode;
  
     /**
      * 容器号
      */
     @TableField(value = "containerCode")
-    @ApiModelProperty(value="容器号")
+    @ApiModelProperty(value = "容器号")
     private String containerCode;
  
     /**
      * 容器类型
      */
     @TableField(value = "containerType")
-    @ApiModelProperty(value="容器类型")
+    @ApiModelProperty(value = "容器类型")
     private String containerType;
  
     /**
      * 任务类型
      */
     @TableField(value = "taskType")
-    @ApiModelProperty(value="任务类型")
+    @ApiModelProperty(value = "任务类型")
     private Integer taskType;
  
     /**
      * 重量
      */
     @TableField(value = "weight")
-    @ApiModelProperty(value="重量")
+    @ApiModelProperty(value = "重量")
     private String weight;
  
     /**
      * 项目号
      */
     @TableField(value = "projectNo")
-    @ApiModelProperty(value="项目号")
+    @ApiModelProperty(value = "项目号")
     private String projectNo;
  
     /**
      * 定位规则
      */
     @TableField(value = "locatingRule")
-    @ApiModelProperty(value="定位规则")
+    @ApiModelProperty(value = "定位规则")
     private String locatingRule;
  
     /**
      * 从库位
      */
     @TableField(value = "fromLocation")
-    @ApiModelProperty(value="从库位")
+    @ApiModelProperty(value = "从库位")
     private String fromLocation;
  
     /**
      * 目标库位
      */
     @TableField(value = "toLocation")
-    @ApiModelProperty(value="目标库位")
+    @ApiModelProperty(value = "目标库位")
     private String toLocation;
  
     /**
      * 出入口
      */
     @TableField(value = "port")
-    @ApiModelProperty(value="出入口")
+    @ApiModelProperty(value = "出入口")
     private String port;
  
     /**
      * 波次号
      */
     @TableField(value = "waveId")
-    @ApiModelProperty(value="波次号")
+    @ApiModelProperty(value = "波次号")
     private Integer waveId;
  
     /**
      * 任务已创建
      */
     @TableField(value = "taskCreated")
-    @ApiModelProperty(value="任务已创建")
+    @ApiModelProperty(value = "任务已创建")
     private Integer taskCreated;
  
     /**
      * 创建时间
      */
     @TableField(value = "created", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
     @TableField(value = "createdBy", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建用户")
+    @ApiModelProperty(value = "创建用户")
     private String createdBy;
  
     /**
      * 创建时间
      */
     @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
     @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="更新用户")
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-    @ApiModelProperty(value="数据版本")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * 自定义字段1
      */
     @TableField(value = "userDef1")
-    @ApiModelProperty(value="自定义字段1")
+    @ApiModelProperty(value = "自定义字段1")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 自定义字段3
      */
     @TableField(value = "userDef3")
-    @ApiModelProperty(value="自定义字段3")
+    @ApiModelProperty(value = "自定义字段3")
     private String userDef3;
  
     /**
      * 自定义字段4
      */
     @TableField(value = "userDef4")
-    @ApiModelProperty(value="自定义字段4")
+    @ApiModelProperty(value = "自定义字段4")
     private String userDef4;
  
     /**
      * 自定义字段5
      */
     @TableField(value = "userDef5")
-    @ApiModelProperty(value="自定义字段5")
+    @ApiModelProperty(value = "自定义字段5")
     private String userDef5;
  
     /**
      * 自定义字段6
      */
     @TableField(value = "userDef6")
-    @ApiModelProperty(value="自定义字段6")
+    @ApiModelProperty(value = "自定义字段6")
     private String userDef6;
  
     /**
      * 自定义字段7
      */
     @TableField(value = "userDef7")
-    @ApiModelProperty(value="自定义字段7")
+    @ApiModelProperty(value = "自定义字段7")
     private String userDef7;
  
     /**
      * 自定义字段8
      */
     @TableField(value = "userDef8")
-    @ApiModelProperty(value="自定义字段8")
+    @ApiModelProperty(value = "自定义字段8")
     private String userDef8;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
-    @ApiModelProperty(value="处理标记")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
     /**
      * 状态
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private Integer status;
  
     /**
      * 站台
      */
     @TableField(value = "recvDock")
-    @ApiModelProperty(value="站台")
+    @ApiModelProperty(value = "站台")
     private String recvDock;
  
+
+    @TableField(value = "flat")
+    @ApiModelProperty(value = "是否平库")
+    private Integer flat;
+
     private static final long serialVersionUID = 1L;
  
-}
 \ No newline at end of file
+}
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
  
-public interface ReceiptContainerHeaderService extends IService<ReceiptContainerHeader>{
+public interface ReceiptContainerHeaderService extends IService<ReceiptContainerHeader> {
  
     /**
      * 保存入库组盘
@@ -25,10 +25,16 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
      * @return 是否保存成功
      */
     AjaxResult saveContainer(String receiptCode, String containerCode, Integer receiptDetailId,
-                            String locationCode, BigDecimal qty, String locatingRule);
+                             String locationCode, BigDecimal qty, String locatingRule);
+
+    /**
+     * 平库组盘
+     */
+    AjaxResult flatSaveContainer(String receiptCode, Integer receiptDetailId, String locationCode, BigDecimal qty);
  
     /**
      * 取消组盘
+     *
      * @param id
      * @return
      */
@@ -36,6 +42,7 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
  
     /**
      * 检查容器状态
+     *
      * @param record
      * @return
      */
@@ -46,6 +53,7 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
  
     /**
      * 移动端校验库位
+     *
      * @param record
      * @return
      */
@@ -55,6 +63,7 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
  
     /**
      * 取消入库任务
+     *
      * @param id 入库组盘头id
      * @return
      */
@@ -41,6 +41,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -218,6 +220,130 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         return ajaxResult;
     }
  
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public AjaxResult flatSaveContainer(String receiptCode, Integer receiptDetailId, String locationType, BigDecimal qty) {
+        ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
+        BigDecimal receiptQty = detail.getQty().subtract(detail.getTaskQty());
+        if (receiptQty.compareTo(qty) < 0) {
+            return AjaxResult.error("不允许超收");
+        }
+        if (StringUtils.isEmpty(locationType)) {
+            throw new ServiceException("平库不能为空");
+        }
+        //创建临时容器
+        //String containerCode = createFlatContainer(locationType);
+
+        Container container = containerService.getOne(new LambdaQueryWrapper<Container>().eq(Container::getContainerType, locationType));
+        String containerCode = container.getCode();
+
+        //检查容器编码合法性
+        Integer taskType = checkContainer(containerCode, detail.getMaterialCode());
+        if (taskType == 1) {
+            throw new ServiceException("没有容器，material.getAutoGenSerialNum() == 0");
+        } else if (taskType == 2) {
+            throw new ServiceException("该物料不能放在这个容器上，请检查该物料是否可以混放");
+        } else {
+            if (taskType == 0) {
+                throw new ServiceException("容器状态未知");
+            }
+        }
+
+        String locationCode = "";
+        //补充入库
+        if (QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT == taskType.intValue()) {
+            if (StringUtils.isNotNull(container) && StringUtils.isNotEmpty(container.getLocationCode())) {
+                locationCode = container.getLocationCode();
+            }
+        }
+        //检查库位编码合法性
+        checkLocationCode(locationCode, containerCode, taskType);
+
+        int unCompleteCombineNumber = shipmentContainerHeaderService.getUnCompleteCombineNumber(containerCode);
+        if (unCompleteCombineNumber > 0) {
+            throw new ServiceException("该托盘已经用于出库组盘");
+        }
+        /* 新建保存组盘头表记录*/
+        //根据容器编码查询组盘表头记录
+        LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
+        lambda.eq(ReceiptContainerHeader::getContainerCode, containerCode)
+                .eq(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_BUILD);
+        List<ReceiptContainerHeader> list = list(lambda);
+
+        ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
+        //当size大于等于1表示容器已经有入库组盘了
+        if (list.isEmpty()) {
+            ReceiptDetail receiptDetail = receiptDetailService.getById(receiptDetailId);
+            receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            receiptContainerHeader.setCompanyCode(receiptDetail.getCompanyCode());
+            receiptContainerHeader.setContainerCode(containerCode);
+            receiptContainerHeader.setContainerType(container.getContainerType());
+            receiptContainerHeader.setFlat(1);
+            receiptContainerHeader.setTaskType(taskType);
+            if (taskType.equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
+                receiptContainerHeader.setFromLocation(container.getLocationCode());
+                String value = configService.getKey(QuantityConstant.RULE_TASK_LOCATION);
+                int taskLocationRule = Integer.parseInt(value);
+                if (taskLocationRule == QuantityConstant.RULE_TASK_SET_LOCATION) {
+                    receiptContainerHeader.setToLocation(container.getLocationCode());
+                }
+            } else {
+                receiptContainerHeader.setToLocation(locationCode);
+            }
+            receiptContainerHeader.setProjectNo(receiptDetail.getProjectNo());
+            receiptContainerHeader.setCreatedBy(ShiroUtils.getName());
+            receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getName());
+            receiptContainerHeader.setLocatingRule(null);
+            receiptContainerHeader.setCreatedBy("test");
+            if (!this.save(receiptContainerHeader)) {
+                throw new ServiceException("入库组盘头表保存失败");
+            }
+        } else {
+            receiptContainerHeader = list.get(0);
+            if (receiptContainerHeader.getStatus() >= QuantityConstant.RECEIPT_CONTAINER_TASK && receiptContainerHeader.getStatus() < QuantityConstant.RECEIPT_CONTAINER_FINISHED) {
+                throw new ServiceException("容器已经生成任务，不能放物料了！");
+            }
+        }
+        List<ReceiptContainerHeader> receiptContainerHeaders = this.list(lambda);
+        /* 更新入库单详情的收货数量*/
+        //根据入库单详情id查询入库详情
+        ReceiptDetail receiptDetail = receiptDetailService.getById(receiptDetailId);
+        receiptDetail.setId(receiptDetailId);
+        receiptDetail.setTaskQty(qty.add(receiptDetail.getTaskQty()));
+        //更新入库单详情的收货数量
+        if (!receiptDetailService.updateById(receiptDetail)) {
+            throw new ServiceException("更新入库单详情失败");
+        }
+
+        receiptDetail = receiptDetailService.getById(receiptDetailId);
+
+        receiptContainerDetailAdd(receiptContainerHeaders.get(0), receiptDetail, qty, containerCode, locationCode);
+        //如果单据数量等于已收数量，更新入库详情状态和入库单状态
+        if (receiptDetail.getQty().compareTo(receiptDetail.getTaskQty()) == 0) {
+            if (StringUtils.isNotEmpty(locationCode)) {
+                receiptDetail.setProcessStamp(QuantityConstant.RECEIPT_HEADER_POSITION.toString());
+            } else {
+                receiptDetail.setProcessStamp(QuantityConstant.RECEIPT_HEADER_RECEIVING.toString());
+            }
+            if (!receiptDetailService.updateById(receiptDetail)) {
+                throw new ServiceException("更新入库详情处理标记失败");
+            }
+
+            ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
+            if (!receiptDetailService.updateById(receiptDetail1)) {
+                throw new ServiceException("更新入库详情下一流程失败");
+            }
+        }
+        receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+        JSONObject json = new JSONObject();
+        json.put("id", receiptContainerHeader.getId());
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.setData(json);
+        ajaxResult.setMsg("组盘成功");
+        ajaxResult.setCode(200);
+        return ajaxResult;
+    }
+
     /**
      * 超收检查
      *
@@ -282,7 +408,16 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                     List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(containerDetailLambda);
  
                     //如果是临时容器，取消组盘时删除容器表
-                    containerService.removeContainer(receiptContainerDetail.getContainerType(), receiptContainerDetail.getContainerCode());
+                    //if (receiptContainerDetail.getContainerCode().length() > 6) {
+                    //    Container one = containerService.getOne(new LambdaQueryWrapper<Container>().eq(Container::getCode, receiptContainerDetail.getContainerCode()));
+                    //    if (one == null) {
+                    //        throw new ServiceException("容器表没有该容器，容器号是" + receiptContainerDetail.getContainerCode());
+                    //    }
+                    //    if (!containerService.removeById(one)) {
+                    //        throw new ServiceException("删除容器表失败，容器号是" + receiptContainerDetail.getContainerCode());
+                    //    }
+                    //}
+                    //containerService.removeContainer(receiptContainerDetail.getContainerType(), receiptContainerDetail.getContainerCode());
  
                     //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
                     if (containerDetailList == null) {
@@ -384,15 +519,13 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
          * 判断物料是否可以放在当前容器
          */
         if (!material.getIsMix()) {
-            LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
             /* 该容器已存物料数*/
-            int inventoryDetailCount = inventoryDetailService.count(queryWrapper);
-            LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode)
-                    .eq(InventoryDetail::getMaterialCode, materialCode);
+            int inventoryDetailCount = inventoryDetailService.count(new LambdaQueryWrapper<InventoryDetail>()
+                    .eq(InventoryDetail::getContainerCode, containerCode));
             /* 该容器存放该物料的记录数*/
-            int inventoryDetailMaterialCount = inventoryDetailService.count(lambdaQueryWrapper);
+            int inventoryDetailMaterialCount = inventoryDetailService.count(new LambdaQueryWrapper<InventoryDetail>()
+                    .eq(InventoryDetail::getContainerCode, containerCode)
+                    .eq(InventoryDetail::getMaterialCode, materialCode));
             /* 存放多种物料时返回*/
             if (inventoryDetailCount != inventoryDetailMaterialCount) {
                 return 2;
@@ -408,19 +541,20 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
  
  
         //检查该容器编码是否已存任务
-        LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode)
+        LambdaQueryWrapper<TaskHeader> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(TaskHeader::getContainerCode, containerCode)
                 .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
                 .eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
         //补充入库跳过校验
-        if (taskHeaderService.count(lambdaQueryWrapper) > 0 && taskHeaderService.getOne(lambdaQueryWrapper).getStatus() == QuantityConstant.TASK_STATUS_ARRIVED_STATION) {
+        if (taskHeaderService.count(wrapper) > 0 && taskHeaderService.getOne(wrapper).getStatus() ==
+                QuantityConstant.TASK_STATUS_ARRIVED_STATION) {
  
         } else {
             if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
                 throw new ServiceException("容器已经锁定，不能再组盘");
             }
         }
-        if (taskHeaderService.count(lambdaQueryWrapper) > 0 && taskHeaderService.getOne(lambdaQueryWrapper).getTaskType() != 200) {
+        if (taskHeaderService.count(wrapper) > 0 && taskHeaderService.getOne(wrapper).getTaskType() != 200) {
             throw new ServiceException("容器已经存在任务，请更换容器");
         }
         if (StringUtils.isEmpty(container.getLocationCode())) {
@@ -545,6 +679,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             receiptContainerDetail.setInventorySts(receiptDetail.getInventorySts());
             receiptContainerDetail.setCreatedBy(ShiroUtils.getName());
             receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getName());
+            if (receiptContainerHeader.getFlat() != null && receiptContainerHeader.getFlat() == 1) {
+                receiptContainerDetail.setFlat(1);
+            }
             if (!receiptContainerDetailService.save(receiptContainerDetail)) {
                 throw new ServiceException("保存入库组盘详情失败");
             }
@@ -584,6 +721,32 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         return code;
     }
  
+
+    /**
+     * 自动生成平库容器编码
+     */
+    @Transactional
+    public String createFlatContainer(String locationCode) {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS");
+        String timestamp = now.format(formatter);
+        String code = locationCode + timestamp;
+        Container container = new Container();
+        container.setCode(code);
+        container.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        container.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
+        container.setContainerType("PK");
+        container.setCreatedBy(ShiroUtils.getName());
+        container.setLastUpdated(new Date());
+        container.setLastUpdatedBy(ShiroUtils.getName());
+        container.setEnable(true);
+        container.setStatus(QuantityConstant.STATUS_CONTAINER_EMPTY);
+        if (!containerService.save(container)) {
+            throw new ServiceException("新增容器失败");
+        }
+        return code;
+    }
+
     @Override
     @Transactional
     public int insertTodayReceiptContainerHeader(ReceiptBill receiptBill, String receiptCode) {
@@ -86,10 +86,10 @@ public class ReceivingController extends BaseController {
     @ResponseBody
     @PostMapping("/scanBill")
     @RequiresPermissions("receipt:receiving:receiving")
-    @Log(title = "入库-获取订单明细", operating ="PC端扫描收货单号", action = BusinessType.OTHER)
-    public AjaxResult scanBill(String code)  {
+    @Log(title = "入库-获取订单明细", operating = "PC端扫描收货单号", action = BusinessType.OTHER)
+    public AjaxResult scanBill(String code) {
         ReceiptHeader receiptHeader = receiptHeaderService.getOne(new LambdaQueryWrapper<ReceiptHeader>().eq(ReceiptHeader::getCode, code));
-        if (receiptHeader == null || receiptHeader.getLastStatus()>= QuantityConstant.RECEIPT_HEADER_POSTING) {
+        if (receiptHeader == null || receiptHeader.getLastStatus() >= QuantityConstant.RECEIPT_HEADER_POSTING) {
             throw new ServiceException("单据已完结不能收货");
         }
         AjaxResult result = receivingService.scanReceiptCode(code);
@@ -102,8 +102,8 @@ public class ReceivingController extends BaseController {
     @ResponseBody
     @PostMapping("/getReceiptInfoByBill")
     @RequiresPermissions("receipt:receiving:receiving")
-    @Log(title = "入库-获取收货信息", operating ="获取收货信息", action = BusinessType.OTHER)
-    public AjaxResult getReceiptInfoByBill(String code)  {
+    @Log(title = "入库-获取收货信息", operating = "获取收货信息", action = BusinessType.OTHER)
+    public AjaxResult getReceiptInfoByBill(String code) {
         AjaxResult result = receiptContainerDetailService.getReceiptInfoByBill(code);
         return result;
     }
@@ -119,19 +119,19 @@ public class ReceivingController extends BaseController {
     /**
      * 保存收货
      */
-    @ApiOperation(value="保存收货 ", notes="保存收货 ", httpMethod = "POST")
+    @ApiOperation(value = "保存收货 ", notes = "保存收货 ", httpMethod = "POST")
     @ResponseBody
     @PostMapping("/save")
     @RequiresPermissions("receipt:receiving:receiving")
-    @Log(title = "入库-保存收货", operating ="PC端保存收货", action = BusinessType.OTHER)
+    @Log(title = "入库-保存收货", operating = "PC端保存收货", action = BusinessType.OTHER)
     public AjaxResult save(
-            @ApiParam(name="receiptCode",value="入库单编码") String receiptCode,
-            @ApiParam(name="containerCode",value="容器编码")String containerCode,
-            @ApiParam(name="receiptDetailId",value="入库单详情id")Integer receiptDetailId,
-            @ApiParam(name="locationCode",value="库位编码", required = false)String locationCode,
-            @ApiParam(name="qty",value="收货数量") BigDecimal qty,
-            @ApiParam(name="localtionRule",value="定位规则", required = false)String locatingRule){
-        if(qty.intValue() <= 0) {
+            @ApiParam(name = "receiptCode", value = "入库单编码") String receiptCode,
+            @ApiParam(name = "containerCode", value = "容器编码") String containerCode,
+            @ApiParam(name = "receiptDetailId", value = "入库单详情id") Integer receiptDetailId,
+            @ApiParam(name = "locationCode", value = "库位编码", required = false) String locationCode,
+            @ApiParam(name = "qty", value = "收货数量") BigDecimal qty,
+            @ApiParam(name = "localtionRule", value = "定位规则", required = false) String locatingRule) {
+        if (qty.intValue() <= 0) {
             return AjaxResult.error("配盘数量必须大于0");
         }
  
@@ -148,35 +148,62 @@ public class ReceivingController extends BaseController {
  
  
     /**
+     * 平库组盘
+     */
+    @ApiOperation(value = "保存收货 ", notes = "保存收货 ", httpMethod = "POST")
+    @ResponseBody
+    @PostMapping("/flatSave")
+    @RequiresPermissions("receipt:receiving:receiving")
+    @Log(title = "入库-保存收货", operating = "PC端保存收货", action = BusinessType.OTHER)
+    public AjaxResult flatSave(
+            @ApiParam(name = "receiptCode", value = "入库单编码") String receiptCode,
+            @ApiParam(name = "receiptDetailId", value = "入库单详情id") Integer receiptDetailId,
+            @ApiParam(name = "locationCode", value = "库位编码", required = false) String locationCode,
+            @ApiParam(name = "qty", value = "收货数量") BigDecimal qty) {
+        if (qty == null || qty.intValue() <= 0) {
+            return AjaxResult.error("配盘数量必须大于0");
+        }
+        AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
+            @Override
+            public AjaxResult doProcess() {
+                AjaxResult ajaxResult = receiptContainerHeaderService.flatSaveContainer(receiptCode, receiptDetailId, locationCode, qty);
+                return ajaxResult;
+            }
+        });
+        return ajaxResult;
+    }
+
+
+    /**
      * 保存收货
      */
-    @ApiOperation(value="保存收货 ", notes="保存收货 ", httpMethod = "POST")
+    @ApiOperation(value = "保存收货 ", notes = "保存收货 ", httpMethod = "POST")
     @ResponseBody
     @PostMapping("/saveBatch")
-    @Log(title = "入库-保存收货", operating ="PC端保存收货", action = BusinessType.OTHER)
-    public AjaxResult saveBatch(@RequestBody List<ReceiptSave>list){
-        String id="";
-        for (ReceiptSave receipt:list){
-            if (receipt.getReceiptDetailId()!=null){
-                if(receipt.getQty()==null){
-                    return AjaxResult.error("入库详情id:"+receipt.getReceiptDetailId()+",数量为空!!");
+    @Log(title = "入库-保存收货", operating = "PC端保存收货", action = BusinessType.OTHER)
+    public AjaxResult saveBatch(@RequestBody List<ReceiptSave> list) {
+        String id = "";
+        for (ReceiptSave receipt : list) {
+            if (receipt.getReceiptDetailId() != null) {
+                if (receipt.getQty() == null) {
+                    return AjaxResult.error("入库详情id:" + receipt.getReceiptDetailId() + ",数量为空!!");
                 }
-                if(receipt.getQty().intValue()<= 0) {
-                    return AjaxResult.error("入库详情id:"+receipt.getReceiptDetailId()+",配盘数量必须大于0");
+                if (receipt.getQty().intValue() <= 0) {
+                    return AjaxResult.error("入库详情id:" + receipt.getReceiptDetailId() + ",配盘数量必须大于0");
                 }
                 AjaxResult result = receiptContainerHeaderService.saveContainer(receipt.getReceiptCode(), receipt.getContainerCode(), receipt.getReceiptDetailId(),
                         receipt.getLocationCode(), receipt.getQty(), receipt.getLocaltionRule());
-                if (result.getCode()!=200){
-                    return AjaxResult.error("入库详情id:"+receipt.getReceiptDetailId()+",组盘失败!");
+                if (result.getCode() != 200) {
+                    return AjaxResult.error("入库详情id:" + receipt.getReceiptDetailId() + ",组盘失败!");
                 }
-                String str=result.getData().toString();
-                JSONObject obj= JSON.parseObject(str);
-                id=obj.getString("id");
+                String str = result.getData().toString();
+                JSONObject obj = JSON.parseObject(str);
+                id = obj.getString("id");
             }
         }
-        AjaxResult ajaxResult=new AjaxResult();
-        JSONObject json=new JSONObject();
-        json.put("id",id);
+        AjaxResult ajaxResult = new AjaxResult();
+        JSONObject json = new JSONObject();
+        json.put("id", id);
         ajaxResult.setData(json);
         ajaxResult.setMsg("组盘成功");
         ajaxResult.setCode(200);
@@ -190,24 +217,24 @@ public class ReceivingController extends BaseController {
     @ResponseBody
     @PostMapping("/getInventoryInfo")
     @RequiresPermissions("receipt:receiving:add")
-    @Log(title = "入库-入库单", operating ="获取库存信息", action = BusinessType.OTHER)
-    public AjaxResult getInventoryInfo(String code,Integer id) throws Exception {
+    @Log(title = "入库-入库单", operating = "获取库存信息", action = BusinessType.OTHER)
+    public AjaxResult getInventoryInfo(String code, Integer id) throws Exception {
         //找到主单的账套和仓库
-        LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper= Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(ReceiptHeader::getCode,code)
-        .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
-        ReceiptHeader receiptHeader=receiptHeaderService.getOne(lambdaQueryWrapper);
-        if(receiptHeader == null) {
+        LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptHeader::getCode, code)
+                .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        ReceiptHeader receiptHeader = receiptHeaderService.getOne(lambdaQueryWrapper);
+        if (receiptHeader == null) {
             throw new ServiceException("找不到主单");
         }
  
         //找到子单物料
-        LambdaQueryWrapper<ReceiptDetail> lambdaQuery=Wrappers.lambdaQuery();
-        lambdaQuery.eq(ReceiptDetail::getReceiptCode,code)
+        LambdaQueryWrapper<ReceiptDetail> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(ReceiptDetail::getReceiptCode, code)
                 .eq(ReceiptDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
-        .eq(ReceiptDetail::getId,id);
-        ReceiptDetail receiptDetail=receiptDetailService.getOne(lambdaQuery);
-        if(receiptDetail == null) {
+                .eq(ReceiptDetail::getId, id);
+        ReceiptDetail receiptDetail = receiptDetailService.getOne(lambdaQuery);
+        if (receiptDetail == null) {
             throw new ServiceException("找不到子单");
         }
  
@@ -216,18 +243,18 @@ public class ReceivingController extends BaseController {
         List<ShipmentContainerHeader> shipmentContainerHeaderList =
                 shipmentContainerHeaderService.getUnCompleteCombineList();
         List<String> containerList = new ArrayList<>();
-        if(unCompleteTaskList != null && unCompleteTaskList.size() > 0) {
-            for(TaskHeader taskHeader : unCompleteTaskList) {
+        if (unCompleteTaskList != null && unCompleteTaskList.size() > 0) {
+            for (TaskHeader taskHeader : unCompleteTaskList) {
                 String containerCode = taskHeader.getContainerCode();
                 containerList.add(containerCode);
             }
         }
  
         //排除有出库组盘的托盘
-        if(shipmentContainerHeaderList != null && shipmentContainerHeaderList.size() > 0) {
-            for(ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
+        if (shipmentContainerHeaderList != null && shipmentContainerHeaderList.size() > 0) {
+            for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
                 String containerCode = shipmentContainerHeader.getContainerCode();
-                if(!containerList.contains(containerCode)) {
+                if (!containerList.contains(containerCode)) {
                     containerList.add(containerCode);
                 }
             }
@@ -235,31 +262,31 @@ public class ReceivingController extends BaseController {
  
         //本物料库存
         LambdaQueryWrapper<InventoryDetail> inventoryDetailLambda = Wrappers.lambdaQuery();
-        inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
-                .eq(InventoryDetail::getCompanyCode,receiptHeader.getCompanyCode())
-                .eq(InventoryDetail::getMaterialCode,receiptDetail.getMaterialCode())
-                .eq((StringUtils.isNotEmpty(receiptDetail.getProjectNo())),InventoryDetail::getProjectNo,
-                    receiptDetail.getProjectNo());
+        inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(InventoryDetail::getCompanyCode, receiptHeader.getCompanyCode())
+                .eq(InventoryDetail::getMaterialCode, receiptDetail.getMaterialCode())
+                .eq((StringUtils.isNotEmpty(receiptDetail.getProjectNo())), InventoryDetail::getProjectNo,
+                        receiptDetail.getProjectNo());
         List<InventoryDetail> inventoryList = inventoryDetailService.list(inventoryDetailLambda);
         List<InventoryDetail> removeInventoryList = new ArrayList<>();
  
         //空容器
-        LambdaQueryWrapper<Container> container=Wrappers.lambdaQuery();
-        container.eq(Container::getWarehouseCode,ShiroUtils.getWarehouseCode())
-                .eq(Container::getCompanyCode,receiptHeader.getCompanyCode())
+        LambdaQueryWrapper<Container> container = Wrappers.lambdaQuery();
+        container.eq(Container::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(Container::getCompanyCode, receiptHeader.getCompanyCode())
                 .eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY);
-        List<Container> emptyContainerList=containerService.list(container);
+        List<Container> emptyContainerList = containerService.list(container);
         List<Container> removeEmptyContainerList = new ArrayList<>();
  
-        for(String containerCode : containerList) {
-            if(inventoryList != null && inventoryList.size() > 0) {
+        for (String containerCode : containerList) {
+            if (inventoryList != null && inventoryList.size() > 0) {
                 for (InventoryDetail inventoryDetail : inventoryList) {
                     if (inventoryDetail.getContainerCode().equals(containerCode)) {
                         removeInventoryList.add(inventoryDetail);
                     }
                 }
             }
-            if(emptyContainerList != null && emptyContainerList.size() > 0) {
+            if (emptyContainerList != null && emptyContainerList.size() > 0) {
                 for (Container container1 : emptyContainerList) {
                     if (container1.getCode().equals(containerCode)) {
                         removeEmptyContainerList.add(container1);
@@ -270,9 +297,9 @@ public class ReceivingController extends BaseController {
         inventoryList.removeAll(removeInventoryList);
         emptyContainerList.removeAll(removeEmptyContainerList);
  
-        Map map=new ModelMap();
-        map.put("inventoryList",inventoryList);
-        map.put("containerList",emptyContainerList);
+        Map map = new ModelMap();
+        map.put("inventoryList", inventoryList);
+        map.put("containerList", emptyContainerList);
         return AjaxResult.success(map);
     }
 }
@@ -29,88 +29,89 @@ import java.util.List;
  
 /**
  * 出库组盘明细 信息操作处理
- * 
+ *
  * @author huaheng
  * @date 2018-08-19
  */
 @Controller
 @RequestMapping("/shipment/shipmentContainerDetail")
-public class ShipmentContainerDetailController extends BaseController
-{
+public class ShipmentContainerDetailController extends BaseController {
     private String prefix = "shipment/shipmentContainerDetail";
-	
-	@Autowired
-	private ShipmentContainerDetailService shipmentContainerDetailService;
  
-	@Autowired
+    @Autowired
+    private ShipmentContainerDetailService shipmentContainerDetailService;
+
+    @Autowired
     ShipmentContainerHeaderServiceImpl shipmentContainerHeaderService;
-	@Autowired
+    @Autowired
     ShipmentHeaderServiceImpl shipmentHeaderService;
  
  
-	@RequiresPermissions("shipment:container:view")
+    @RequiresPermissions("shipment:container:view")
     @GetMapping("/{headerId}")
-	public String shipmentContainerDetail(@PathVariable("headerId") String headerId, ModelMap mmap)
-	{
-		mmap.put("headerId", headerId);
-		return prefix + "/shipmentContainerDetail";
-	}
-	
-	/**
-	 * 查询出库组盘明细列表
-	 */
-	@RequiresPermissions("shipment:container:list")
-	@Log(title ="出库-出库组盘", operating = "查看出库组盘明细", action = BusinessType.GRANT)
-	@PostMapping("/list")
-	@ResponseBody
-	public TableDataInfo list(ShipmentContainerDetail shipmentContainerDetail)
-	{
-		LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-		PageDomain pageDomain = TableSupport.buildPageRequest();
-		Integer pageNum = pageDomain.getPageNum();
-		Integer pageSize = pageDomain.getPageSize();
+    public String shipmentContainerDetail(@PathVariable("headerId") String headerId, ModelMap mmap) {
+        mmap.put("headerId", headerId);
+        return prefix + "/shipmentContainerDetail";
+    }
+
+    /**
+     * 查询出库组盘明细列表
+     */
+    @RequiresPermissions("shipment:container:list")
+    @Log(title = "出库-出库组盘", operating = "查看出库组盘明细", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ShipmentContainerDetail shipmentContainerDetail) {
+        LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper
+                .eq(ShipmentContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .in(ShipmentContainerDetail::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(shipmentContainerDetail.getShippingContainerId() != null, ShipmentContainerDetail::getShippingContainerId, shipmentContainerDetail.getShippingContainerId())
+                .orderByAsc(ShipmentContainerDetail::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            /**
+             * 使用分页查询
+             */
+            Page<ShipmentContainerDetail> page = new Page<>(pageNum, pageSize);
+            IPage<ShipmentContainerDetail> iPage = shipmentContainerDetailService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<ShipmentContainerDetail> list = shipmentContainerDetailService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
  
-		lambdaQueryWrapper
-				.eq(ShipmentContainerDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
-				.in(ShipmentContainerDetail::getCompanyCode,ShiroUtils.getCompanyCodeList())
-				.eq(shipmentContainerDetail.getShippingContainerId()!=null,ShipmentContainerDetail::getShippingContainerId,shipmentContainerDetail.getShippingContainerId())
-				.orderByAsc(ShipmentContainerDetail::getId);
+    /**
+     * 新增出库组盘明细
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
  
-		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
-			/**
-			 * 使用分页查询
-			 */
-			Page<ShipmentContainerDetail> page = new Page<>(pageNum, pageSize);
-			IPage<ShipmentContainerDetail> iPage = shipmentContainerDetailService.page(page, lambdaQueryWrapper);
-			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
-		} else {
-			List<ShipmentContainerDetail> list = shipmentContainerDetailService.list(lambdaQueryWrapper);
-			return getDataTable(list);
-		}
-	}
-	
-	/**
-	 * 新增出库组盘明细
-	 */
-	@GetMapping("/add")
-	public String add()
-	{
-	    return prefix + "/add";
-	}
  
-	
-	/**
-	 * 删除出库组盘明细
-	 */
-	@RequiresPermissions("shipment:container:remove")
-	@Log(title ="出库-出库组盘", operating = "删除出库组盘明细", action = BusinessType.DELETE)
-	@PostMapping( "/remove")
-	@ResponseBody
-	public AjaxResult remove(String ids)
-	{
-		if (StringUtils.isEmpty(ids)) {
+    /**
+     * 删除出库组盘明细
+     */
+    @RequiresPermissions("shipment:container:remove")
+    @Log(title = "出库-出库组盘", operating = "删除出库组盘明细", action = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
-		return shipmentContainerHeaderService.cancelCombinationDetail(Arrays.asList((Convert.toIntArray(ids))));
-	}
+        AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
+            @Override
+            public AjaxResult doProcess() {
+                return shipmentContainerHeaderService.cancelCombinationDetail(Arrays.asList((Convert.toIntArray(ids))));
+            }
+        });
+        return ajaxResult;
+    }
 }
@@ -290,7 +290,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         if (shipmentContainerDetail != null) {
             shipmentContainerDetail.setQty(shipmentContainerDetail.getQty().add(shipmentCombinationModel.getShipQty()));
             flag = shipmentContainerDetailService.saveOrUpdate(shipmentContainerDetail);
-            if (flag == false) {
+            if (!flag) {
                 throw new ServiceException("修改组盘明细失败,sql错误");
             }
         } else {
@@ -327,7 +327,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
             shipmentContainerDetaill.setProjectNo(shipmentDetail.getProjectNo());
             shipmentContainerDetaill.setCreatedBy(ShiroUtils.getName());
             flag = shipmentContainerDetailService.save(shipmentContainerDetaill);
-            if (flag == false) {
+            if (!flag) {
                 throw new ServiceException("新建组盘明细失败,sql错误");
             }
         }
@@ -395,7 +395,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                 taskDetail.setCreatedBy(ShiroUtils.getName());
                 taskDetail.setLastUpdatedBy(ShiroUtils.getName());
                 flag = taskDetailService.save(taskDetail);
-                if (flag == false) {
+                if (!flag) {
                     throw new ServiceException("新建任务明细失败,sql错误");
                 }
             }
@@ -411,6 +411,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
      * @return
      */
     @Override
+    @Transactional
     public AjaxResult cancelCombinationDetail(List<Integer> detailIds) {
         List<ShipmentContainerDetail> shipmentContainerDetails = new ArrayList<>();
         for (int detailId : detailIds) {
 package com.huaheng.pc.task.taskHeader.service;
  
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,6 +8,7 @@ import com.huaheng.api.mes.controller.MesReceiptController;
 import com.huaheng.api.mes.result.ReturnInfo;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.DateUtils;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.reflect.ReflectUtils;
@@ -21,6 +23,8 @@ import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
 import com.huaheng.pc.config.materialMultiple.service.MaterialMultipleServiceImpl;
 import com.huaheng.pc.config.materialWarnning.service.IMaterialWarningService;
+import com.huaheng.pc.config.zone.domain.Zone;
+import com.huaheng.pc.config.zone.service.ZoneService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
@@ -39,6 +43,7 @@ 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.mapper.TaskHeaderMapper;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -90,6 +95,8 @@ public class ReceiptTaskService {
     private IMaterialWarningService materialWarningService;
     @Resource
     private MesReceiptController mesReceiptController;
+    @Resource
+    private ZoneService zoneService;
  
     private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
  
@@ -102,6 +109,7 @@ public class ReceiptTaskService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult createReceiptTask(List<Integer> ids) {
         List<String> taskIds = new ArrayList<>();
+        List<String> taskFlatIds = new ArrayList<>();
         for (Integer id : ids) {
             ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id);
             if (receiptContainerHeader == null) {
@@ -114,21 +122,19 @@ public class ReceiptTaskService {
             if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
                 throw new ServiceException("托盘已经锁定，不能生成任务");
             }
+            String flatLocationCode = container.getContainerType() + "KW";
             //锁定容器
             containerService.updateStatus(receiptContainerHeader.getContainerCode(),
                     QuantityConstant.STATUS_CONTAINER_LOCK, container.getWarehouseCode());
             //查询入库组盘明细
-            LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
-            containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
-            List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
-
+            List<ReceiptContainerDetail> list = receiptContainerDetailService.list(new LambdaQueryWrapper<ReceiptContainerDetail>()
+                    .eq(ReceiptContainerDetail::getReceiptContainerId, id));
             if (list.isEmpty()) {
                 throw new ServiceException("id:" + id + "的入库组盘，没有组盘明细，请先组盘！");
             }
  
             if (StringUtils.isNotEmpty(receiptContainerHeader.getFromLocation())) {
-                locationService.updateStatus(receiptContainerHeader.getFromLocation(),
-                        QuantityConstant.STATUS_LOCATION_LOCK);
+                locationService.updateStatus(receiptContainerHeader.getFromLocation(), QuantityConstant.STATUS_LOCATION_LOCK);
             }
             String locationCode = receiptContainerHeader.getToLocation();
             if (StringUtils.isNotEmpty(locationCode)) {
@@ -153,13 +159,17 @@ public class ReceiptTaskService {
                         .eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
  
                 TaskHeader task = new TaskHeader();
+                //这个托盘有未完成的补充入库任务
                 if (taskHeaderService.count(lambdaQueryWrapper) > 0 && taskHeaderService.getOne(lambdaQueryWrapper).getTaskType() == 200) {
                     task = taskHeaderService.getOne(lambdaQueryWrapper);
+                    //入库组盘ID
                     task.setAllocationHeadId(receiptContainerHeader.getId());
                     taskHeaderService.updateById(task);
                 } else {
                     //添加任务主表
-
+                    if (container.getFlat() != null && container.getFlat() == 1) {
+                        task.setToLocation(flatLocationCode);
+                    }
                     task.setAllocationHeadId(receiptContainerHeader.getId());
                     task.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
                     task.setWarehouseCode(receiptContainerHeader.getWarehouseCode());
@@ -167,11 +177,10 @@ public class ReceiptTaskService {
                     task.setStatus(QuantityConstant.TASK_STATUS_BUILD);
                     task.setTaskType(receiptContainerHeader.getTaskType());
                     task.setFromLocation(receiptContainerHeader.getFromLocation());
-                    if (receiptContainerHeader.getToLocation() != null) {
+                    if (receiptContainerHeader.getToLocation() != null && !receiptContainerHeader.getToLocation().isEmpty()) {
                         task.setToLocation(receiptContainerHeader.getToLocation());
                     }
-                    Location location = locationService.getLocationByCode(
-                            task.getToLocation(), ShiroUtils.getWarehouseCode());
+                    Location location = locationService.getLocationByCode(task.getToLocation(), ShiroUtils.getWarehouseCode());
                     if (location != null) {
                         task.setZoneCode(location.getZoneCode());
                     }
@@ -180,58 +189,66 @@ public class ReceiptTaskService {
                     task.setPort(receiptContainerHeader.getPort());
                     taskHeaderService.save(task);
                 }
-                if (task != null) {
-                    //添加任务明细表
-                    for (ReceiptContainerDetail item : list) {
-                        TaskDetail taskDetail = new TaskDetail();
-                        taskDetail.setTaskId(task.getId());
-                        taskDetail.setTaskType(task.getTaskType());
-                        taskDetail.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
-                        taskDetail.setWarehouseCode(task.getWarehouseCode());
-                        taskDetail.setAllocationId(item.getId());
-                        taskDetail.setCompanyCode(task.getCompanyCode());
-                        taskDetail.setMaterialCode(item.getMaterialCode());
-                        taskDetail.setMaterialName(item.getMaterialName());
-                        taskDetail.setMaterialSpec(item.getMaterialSpec());
-                        taskDetail.setLastUpdated(item.getLastUpdated());
-                        taskDetail.setMaterialUnit(item.getMaterialUnit());
-                        taskDetail.setInventorySts(item.getInventorySts());
-                        taskDetail.setBillCode(item.getReceiptCode());
-                        taskDetail.setBillDetailId(item.getReceiptDetailId());
-                        taskDetail.setQty(item.getQty());
-                        taskDetail.setContainerCode(task.getContainerCode());
-                        taskDetail.setFromLocation(task.getFromLocation());
-                        if (task.getToLocation() != null) {
-                            taskDetail.setToLocation(task.getToLocation());
-                        }
-                        taskDetail.setBatch(item.getBatch());
-                        taskDetail.setProjectNo(item.getProjectNo());
-                        if (!taskDetailService.save(taskDetail)) {
-                            throw new ServiceException("生成任务明细失败");
-                        }
+                //添加任务明细表
+                for (ReceiptContainerDetail item : list) {
+                    TaskDetail taskDetail = new TaskDetail();
+                    taskDetail.setTaskId(task.getId());
+                    taskDetail.setTaskType(task.getTaskType());
+                    taskDetail.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
+                    taskDetail.setWarehouseCode(task.getWarehouseCode());
+                    taskDetail.setAllocationId(item.getId());
+                    taskDetail.setCompanyCode(task.getCompanyCode());
+                    taskDetail.setMaterialCode(item.getMaterialCode());
+                    taskDetail.setMaterialName(item.getMaterialName());
+                    taskDetail.setMaterialSpec(item.getMaterialSpec());
+                    taskDetail.setLastUpdated(item.getLastUpdated());
+                    taskDetail.setMaterialUnit(item.getMaterialUnit());
+                    taskDetail.setInventorySts(item.getInventorySts());
+                    taskDetail.setBillCode(item.getReceiptCode());
+                    taskDetail.setBillDetailId(item.getReceiptDetailId());
+                    taskDetail.setQty(item.getQty());
+                    taskDetail.setContainerCode(task.getContainerCode());
+                    taskDetail.setFromLocation(task.getFromLocation());
+                    if (task.getToLocation() != null) {
+                        taskDetail.setToLocation(task.getToLocation());
+                    }
+                    taskDetail.setBatch(item.getBatch());
+                    taskDetail.setProjectNo(item.getProjectNo());
+                    if (!taskDetailService.save(taskDetail)) {
+                        throw new ServiceException("生成任务明细失败");
+                    }
  
-                        //更新入库组盘明细状态
-                        item.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
-                        if (!receiptContainerDetailService.updateById(item)) {
-                            throw new ServiceException("更新入库组盘明细状态出错");
-                        }
+                    //更新入库组盘明细状态
+                    item.setStatus(QuantityConstant.RECEIPT_CONTAINER_TASK);
+                    if (!receiptContainerDetailService.updateById(item)) {
+                        throw new ServiceException("更新入库组盘明细状态出错");
+                    }
  
-                        /* 修改明细状态为上架*/
-                        ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
-                        receiptDetail.setProcessStamp(String.valueOf(QuantityConstant.RECEIPT_HEADER_SHELF));
-                        if (!receiptDetailService.updateById(receiptDetail)) {
-                            throw new ServiceException("更新入库单详情失败");
-                        }
-                        //更新头表状态
-                        receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+                    /* 修改明细状态为上架*/
+                    ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
+                    receiptDetail.setProcessStamp(String.valueOf(QuantityConstant.RECEIPT_HEADER_SHELF));
+                    if (!receiptDetailService.updateById(receiptDetail)) {
+                        throw new ServiceException("更新入库单详情失败");
                     }
-                    String taskId = String.valueOf(task.getId());
-                    taskIds.add(taskId);
-                } else {
-                    throw new ServiceException("任务生成失败");
+                    //更新头表状态
+                    receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+                }
+                String taskId = String.valueOf(task.getId());
+                taskIds.add(taskId);
+                //平库
+                if (container.getFlat() != null && container.getFlat() == 1) {
+                    taskFlatIds.add(taskId);
                 }
             }
         }
+        //任务完成
+        if (!taskFlatIds.isEmpty()) {
+            Integer[] taskFlatIdsArray = taskFlatIds.stream().map(Integer::valueOf).toArray(Integer[]::new);
+            AjaxResult ajaxResult = taskHeaderService.completeTaskByWMS(taskFlatIdsArray, null);
+            if (ajaxResult.getCode() != 200) {
+                throw new ServiceException("任务完成失败" + ajaxResult.getMsg());
+            }
+        }
         return AjaxResult.success("生成上架任务成功").setData(taskIds);
     }
  
@@ -377,7 +377,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
             //如果已完成则不管
             if (task.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
-                return AjaxResult.success("任务(" + taskIds[i] + ")任务已经是完成的！");
+                return AjaxResult.error("任务(" + taskIds[i] + ")任务已经是完成的！");
             }
             //整盘入库,空托入库库位自动分配
             //整盘入库手动完成分配库位，已分配则略过
@@ -29,12 +29,12 @@
                 <input id="name" name="name" 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="locationType" name="locationType" 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="locationType" name="locationType" class="form-control" type="text">-->
+        <!--            </div>-->
+        <!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">区域：</label>
             <div class="col-sm-8">
@@ -32,7 +32,7 @@
         </div>
  
         <div class="form-group">
-            <label class="col-sm-3 control-label">编码：</label>
+            <label class="col-sm-3 control-label">区域：</label>
             <div class="col-sm-8">
                 <input id="area" name="area" th:field="*{area}" class="form-control" type="text">
             </div>
@@ -52,30 +52,6 @@
                 <input id="zoneDescribe" name="zoneDescribe" 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="created" name="created" th:field="*{created}" 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="createdBy" name="createdBy" th:field="*{createdBy}" 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="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" 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="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">是否有效：</label>
             <div class="col-sm-8">
@@ -90,42 +66,6 @@
                 </div>
             </div>
         </div>
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">是否删除：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="userDef4" name="userDef4" th:field="*{userDef4}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="form-group">	-->
-        <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="userDef5" name="userDef5" th:field="*{userDef5}" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
         <div class="form-group">
             <div class="form-control-static col-sm-offset-9">
                 <button type="submit" class="btn btn-primary">提交</button>
@@ -44,10 +44,10 @@
                shiro:hasPermission="config:zone:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
-               shiro:hasPermission="config:zone:remove">
-                <i class="fa fa-trash-o"></i> 删除
-            </a>
+            <!--            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"-->
+            <!--               shiro:hasPermission="config:zone:remove">-->
+            <!--                <i class="fa fa-trash-o"></i> 删除-->
+            <!--            </a>-->
         </div>
  
         <div class="col-sm-12 select-info">
@@ -13,35 +13,40 @@
                             <label>接口名称：</label>
                             <select name="apiName">
                                 <option value=""></option>
-                                <option th:each="item:${@apiLogService.getApiNameList()}" th:value="${item}" th:text="${item}"></option>
+                                <option th:each="item:${@apiLogService.getApiNameList()}" th:value="${item}"
+                                        th:text="${item}"></option>
                             </select>
                         </li>
                         <li>
                             <label>请求方：</label>
                             <select name="requestFrom">
                                 <option value=""></option>
-                                <option th:each="item:${@apiLogService.getRequestFromList()}" th:value="${item}" th:text="${item}"></option>
+                                <option th:each="item:${@apiLogService.getRequestFromList()}" th:value="${item}"
+                                        th:text="${item}"></option>
                             </select>
                         </li>
                         <li>
                             <label>响应方：</label>
                             <select name="responseBy">
                                 <option value=""></option>
-                                <option th:each="item:${@apiLogService.getResponseByList()}" th:value="${item}" th:text="${item}"></option>
+                                <option th:each="item:${@apiLogService.getResponseByList()}" th:value="${item}"
+                                        th:text="${item}"></option>
                             </select>
                         </li>
                         <li>
                             <label>httpCode：</label>
                             <select name="httpCode">
                                 <option value=""></option>
-                                <option th:each="item:${@apiLogService.getHttpCodeList()}" th:value="${item}" th:text="${item}"></option>
+                                <option th:each="item:${@apiLogService.getHttpCodeList()}" th:value="${item}"
+                                        th:text="${item}"></option>
                             </select>
                         </li>
                         <li>
                             <label>retCode：</label>
                             <select name="retCode">
                                 <option value=""></option>
-                                <option th:each="item:${@apiLogService.getRetCodeList()}" th:value="${item}" th:text="${item}"></option>
+                                <option th:each="item:${@apiLogService.getRetCodeList()}" th:value="${item}"
+                                        th:text="${item}"></option>
                             </select>
                         </li>
                         <li>
@@ -58,13 +63,19 @@
                         </li>
                         <li>
                             <label>请求内容： </label>
-                            <input type="text" name="requestBody" />
+                            <input type="text" name="requestBody"/>
+                        </li>
+                        <li>
+                            <label>响应内容： </label>
+                            <input type="text" name="responseBody"/>
                         </li>
                         <li class="time">
                             <label>请求时间：</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginRequestTime"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="beginRequestTime"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endRequestTime"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="endRequestTime"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -110,7 +121,7 @@
             // updateUrl: prefix + "/edit/{id}",
             // removeUrl: prefix + "/remove",
             modalName: "接口调用日志",
-            height:610,
+            height: 610,
             pageSize: 30,
             columns: [
                 {
@@ -136,10 +147,10 @@
                     title: '接口名称'
                 },
                 /**
-                {
-                    field: 'ip',
-                    title: 'IP'
-                },
+                 {
+                 field: 'ip',
+                 title: 'IP'
+                 },
                  **/
  
                 {
@@ -147,36 +158,36 @@
                     title: 'to'
                 },
                 /**
-                {
-                    field: 'url',
-                    title: '请求地址'
-                },
+                 {
+                 field: 'url',
+                 title: '请求地址'
+                 },
                  **/
                 {
                     field: 'httpCode',
                     title: 'http',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         var style = "style='color:green'"
-                        if(value>200)
+                        if (value > 200)
                             style = " style='color:red'";
-                        if(value == undefined)
+                        if (value == undefined)
                             value = " "
-                        actions.push('<span '+ style + '>'+value+ '</span>')
+                        actions.push('<span ' + style + '>' + value + '</span>')
                         return actions.join(" ")
                     }
                 },
                 {
                     field: 'retCode',
                     title: 'ret',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         var style = "style='color:green'"
-                        if(value>200)
+                        if (value > 200)
                             style = " style='color:red'";
-                        if(value == undefined)
+                        if (value == undefined)
                             value = " "
-                        actions.push('<span '+ style + '>'+value+ '</span>')
+                        actions.push('<span ' + style + '>' + value + '</span>')
                         return actions.join(" ")
                     }
                 },
@@ -193,51 +204,51 @@
                 {
                     field: 'duration',
                     title: '耗时',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         var style = ""
-                        if(value>1000)
+                        if (value > 1000)
                             style = " style='color:red'";
-                        if(value == undefined)
+                        if (value == undefined)
                             value = " "
-                        actions.push('<span '+ style + ' title="毫秒">'+value+ '</span>')
+                        actions.push('<span ' + style + ' title="毫秒">' + value + '</span>')
                         return actions.join(" ")
                     }
                 },
                 /**
-                {
-                    field: 'requestHeader',
-                    title: '请求头'
-                },
+                 {
+                 field: 'requestHeader',
+                 title: '请求头'
+                 },
                  **/
  
                 {
                     field: 'requestBody',
                     title: '请求内容',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        if(value == undefined || value == '')
+                        if (value == undefined || value == '')
                             value = " "
                         else
-                            actions.push('<pre style="max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
+                            actions.push('<pre style="max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">' + value + '</pre>')
                         return actions.join(" ")
                     }
                 },
                 /**
-                {
-                    field: 'responseHeader',
-                    title: '响应头'
-                },
+                 {
+                 field: 'responseHeader',
+                 title: '响应头'
+                 },
                  **/
                 {
                     field: 'responseBody',
                     title: '响应内容',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        if(value == undefined)
+                        if (value == undefined)
                             value = " "
                         else
-                            actions.push('<pre style="vertical-align: top; max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">'+value+ '</pre>')
+                            actions.push('<pre style="vertical-align: top; max-height:100px; white-space: pre-wrap; width:350px" ondblclick="copy(this)" title="双击复制">' + value + '</pre>')
                         return actions.join(" ")
                     }
                 },
@@ -245,38 +256,38 @@
                 {
                     field: 'exceptionMsg',
                     title: '异常信息',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        if(value == undefined)
+                        if (value == undefined)
                             value = " "
                         else
-                            actions.push('<span style="color:red">'+value+ '</span>')
+                            actions.push('<span style="color:red">' + value + '</span>')
                         return actions.join(" ")
                     }
                 }
-                ]
+            ]
         };
         $.table.init(options);
     });
  
     /**
-    function parseJson(obj){
-        var str = obj.innerHTML
-        try {
-            str = JSON.parse(str);
-            obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="unParse(this)">' + JSON.stringify(str, null, 2) + '</pre>';
-        }catch (e) {
-            str = str.split("&amp;").join("&#10;")
-            obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="unParse(this)">' + str + '</pre>';
-        }
-    }
+     function parseJson(obj){
+     var str = obj.innerHTML
+     try {
+     str = JSON.parse(str);
+     obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="unParse(this)">' + JSON.stringify(str, null, 2) + '</pre>';
+     }catch (e) {
+     str = str.split("&amp;").join("&#10;")
+     obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="unParse(this)">' + str + '</pre>';
+     }
+     }
  
-    function unParse(obj) {
-        var str = obj.innerHTML;
+     function unParse(obj) {
+     var str = obj.innerHTML;
  
-        obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="parseJson(this)" title="双击格式化">'+str.replaceAll("\n","")+ '</pre>'
-    }
-    **/
+     obj.outerHTML = '<pre style="white-space: pre-wrap; width:350px" ondblclick="parseJson(this)" title="双击格式化">'+str.replaceAll("\n","")+ '</pre>'
+     }
+     **/
  
     function copy(obj) {
         let transfer = document.createElement('textarea');
@@ -3,222 +3,231 @@
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="gray-bg">
-    <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-info">
-			<ul id="myTab" class="nav nav-tabs">
-				<li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
-				<li><a href="#tabDetail" data-toggle="tab">明细</a></li>
-			</ul>
-			<div id="myTabContent" class="tab-content">
-				<div class="tab-pane fade in active" id="tabHeader">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 select-info">
+            <ul id="myTab" class="nav nav-tabs">
+                <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
+                <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
+            </ul>
+            <div id="myTabContent" class="tab-content">
+                <div class="tab-pane fade in active" id="tabHeader">
  
-					   <div class="col-sm-12 select-info">
-						   <form id="receiptContainerHeader-form">
-							   <div class="select-list">
-								   <ul>
-									   <li>
-									   入库单号：<input type="text" name="receiptCode"/>
-									   </li>
-									   <li>
-										   容器编号：<input type="text" name="containerCode"/>
-									   </li>
-									   <li>
-										   库位编号：<input type="text" name="toLocation"/>
-									   </li>
-									   <li>
-										   <!--入库类型：<input type="text" name="sourceCode"/>
-										   -->
-										   任务类型：<select name="taskType" th:with="type=${@dict.getType('receiptTaskType')}">
-										   <option value="">所有</option>
-										   <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
-									   </li>
-									   <li>
-										   <!--头 状 态：<input type="text" name="firstStatus"/>-->
-										   容器任务状态：<select name="Status" th:with="firstStatus=${@dict.getType('receiptContainerHeaderStatus')}">
-										   <option value="">所有</option>
-										   <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
-									   </li>
-									   <li>
-										   创 建 人：<input type="text" name="createdBy"/>
-									   </li>
-									   <li class="time">
-										   <label>创建时间： </label>
-										   <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin" autocomplete="off"/>
-										   <span>-</span>
-										   <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"  autocomplete="off"/>
-									   </li>
-									   <li>
-										   <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-										   <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptContainerHeader-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-										   <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
-									   </li>
-								   </ul>
-							   </div>
-						   </form>
-					   </div>
-                        <div class="btn-group hidden-xs" id="toolbar" role="group">
-                            <a class="btn btn-outline btn-success btn-rounded" onclick="batchCreateTask()" shiro:hasPermission="receipt:receiptContainer:add">
-                                <i class="fa fa-edit"></i> 批量生成任务
-                            </a>
-                            <a class="btn btn-outline btn-danger btn-rounded" onclick="batchRemoveHead()" shiro:hasPermission="receipt:receiptContainer:remove">
-                                <i class="fa fa-remove"></i> 批量撤销组盘
-                            </a>
-                        </div>
-					   <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+                    <div class="col-sm-12 select-info">
+                        <form id="receiptContainerHeader-form">
+                            <div class="select-list">
+                                <ul>
+                                    <li>
+                                        入库单号：<input type="text" name="receiptCode"/>
+                                    </li>
+                                    <li>
+                                        容器编号：<input type="text" name="containerCode"/>
+                                    </li>
+                                    <li>
+                                        库位编号：<input type="text" name="toLocation"/>
+                                    </li>
+                                    <li>
+                                        <!--入库类型：<input type="text" name="sourceCode"/>
+                                        -->
+                                        任务类型：<select name="taskType"
+                                                         th:with="type=${@dict.getType('receiptTaskType')}">
+                                        <option value="">所有</option>
+                                        <option th:each="e : ${type}" th:text="${e['dictLabel']}"
+                                                th:value="${e['dictValue']}"></option>
+                                    </select>
+                                    </li>
+                                    <li>
+                                        <!--头 状 态：<input type="text" name="firstStatus"/>-->
+                                        容器任务状态：<select name="Status"
+                                                             th:with="firstStatus=${@dict.getType('receiptContainerHeaderStatus')}">
+                                        <option value="">所有</option>
+                                        <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
+                                                th:value="${e['dictValue']}"></option>
+                                    </select>
+                                    </li>
+                                    <li>
+                                        创 建 人：<input type="text" name="createdBy"/>
+                                    </li>
+                                    <li class="time">
+                                        <label>创建时间： </label>
+                                        <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                               name="createdBegin" autocomplete="off"/>
+                                        <span>-</span>
+                                        <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                               name="createdEnd" autocomplete="off"/>
+                                    </li>
+                                    <li>
+                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                                class="fa fa-search"></i>&nbsp;搜索</a>
+                                        <a class="btn btn-warning btn-rounded btn-sm"
+                                           onclick="$.form.reset('receiptContainerHeader-form')"><i
+                                                class="fa fa-refresh"></i>&nbsp;重置</a>
+                                        <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
+                                    </li>
+                                </ul>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="btn-group hidden-xs" id="toolbar" role="group">
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="batchCreateTask()"
+                           shiro:hasPermission="receipt:receiptContainer:add">
+                            <i class="fa fa-edit"></i> 批量生成任务
+                        </a>
+                        <a class="btn btn-outline btn-danger btn-rounded" onclick="batchRemoveHead()"
+                           shiro:hasPermission="receipt:receiptContainer:remove">
+                            <i class="fa fa-remove"></i> 批量撤销组盘
+                        </a>
+                    </div>
+                    <table id="bootstrap-table" data-mobile-responsive="true"
+                           class="table table-bordered table-hover"></table>
  
-				</div>
-				<div class="tab-pane fade" id="tabDetail">
-					<table id="bootstrap-table1" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
-				</div>
-			</div>
-			</div>
-		</div>
+                </div>
+                <div class="tab-pane fade" id="tabDetail">
+                    <table id="bootstrap-table1" data-mobile-responsive="true"
+                           class="table table-bordered table-hover"></table>
+                </div>
+            </div>
+        </div>
     </div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var createTaskFlag = [[${@permission.hasPermi('receipt:receiptContainer:add')}]];
-        var removeFlag = [[${@permission.hasPermi('receipt:receiptContainer:remove')}]];
-        var prefix = ctx + "receipt/receiptContainerHeader";
-        var detailPrefix = ctx + "receipt/receiptContainerDetail";
-        var taskType=[[${@dict.getType('taskType')}]];
-        // var taskStatus=[[${@dict.getType('taskStatus')}]]; //任务状态
-        var receiptContainerHeaderStatus = [[${@dict.getType('receiptContainerHeaderStatus')}]]  //容器状态
-		var S_headerId;
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                sortName: "created",
-				// height:610,
-                sortOrder: "desc",
-                modalName: "入库组盘头",
-                search: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'id',
-					title : '组盘头id' ,
-                    sortable:true
-				},
-				{
-					field : 'containerCode',
-					title : '容器编号' ,
-					sortable:true
-				},
-				{
-					field : 'toLocation',
-					title : '库位编号'  ,
-                    sortable:true
-				},
-				{
-					field : 'taskType',
-					title : '任务类型',
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+    var createTaskFlag = [[${@permission.hasPermi('receipt:receiptContainer:add')}]];
+    var removeFlag = [[${@permission.hasPermi('receipt:receiptContainer:remove')}]];
+    var prefix = ctx + "receipt/receiptContainerHeader";
+    var detailPrefix = ctx + "receipt/receiptContainerDetail";
+    var taskType = [[${@dict.getType('taskType')}]];
+    // var taskStatus=[[${@dict.getType('taskStatus')}]]; //任务状态
+    var receiptContainerHeaderStatus = [[${@dict.getType('receiptContainerHeaderStatus')}]]  //容器状态
+    var S_headerId;
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            sortName: "created",
+            // height:610,
+            sortOrder: "desc",
+            modalName: "入库组盘头",
+            search: false,
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: '组盘头id',
+                },
+                {
+                    field: 'containerCode',
+                    title: '容器编号',
+                },
+                {
+                    field: 'toLocation',
+                    title: '库位编号',
+                },
+                {
+                    field: 'taskType',
+                    title: '任务类型',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(taskType, value);
-                    },sortable:true
-				},
-				{
-					field : 'status',
-					title : '容器任务状态',
-                    formatter: function(value, row, index) {
+                    },
+                },
+                {
+                    field: 'status',
+                    title: '容器任务状态',
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(receiptContainerHeaderStatus, value);
-                    }  ,
-                    sortable:true
-				},
-				{
-					field : 'created',
-					title : '创建时间'  ,
-                    sortable:true
-				},
-				{
-					field : 'createdBy',
-					title : '创建人' ,
-                    sortable:true
-				},
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
+                    },
+                },
+                {
+                    field: 'created',
+                    title: '创建时间',
+                },
+                {
+                    field: 'createdBy',
+                    title: '创建人',
+                },
+                {
+                    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){
-							if(row.taskType == 200) {
-								actions.push('<a class="btn btn-success btn-xs ' + createTaskFlag + '" href="#" onclick="chooseStation(\'' + row.id + '\')"><i class="fa fa-edit"></i>生成任务</a> ');
-							} else {
-								actions.push('<a class="btn btn-success btn-xs ' + createTaskFlag + '" href="#" onclick="createTask(\'' + row.id + '\')"><i class="fa fa-edit"></i>生成任务</a> ');
-							}
-						}
-						if (row.status == 0) {
+                        if (row.status < 10) {
+                            if (row.taskType == 200 && row.flat != 1) {
+                                actions.push('<a class="btn btn-success btn-xs ' + createTaskFlag + '" href="#" onclick="chooseStation(\'' + row.id + '\')"><i class="fa fa-edit"></i>生成任务</a> ');
+                            } else {
+                                actions.push('<a class="btn btn-success btn-xs ' + createTaskFlag + '" href="#" onclick="createTask(\'' + row.id + '\')"><i class="fa fa-edit"></i>生成任务</a> ');
+                            }
+                        }
+                        if (row.status == 0) {
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消配盘</a>');
-		            	}
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
+                        }
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
  
-        $("#bootstrap-table1").bootstrapTable({
-            // url: detailPrefix + "/headerId",
-            // createUrl: detailPrefix + "/add",
-            // updateUrl: detailPrefix + "/edit/{id}",
-            // removeUrl: detailPrefix + "/remove",
-            // search: true, //搜索
-            sortable: true, //排序
-            showRefresh: true, //刷新
-            showToggle:true, //视图切换
-            clickToSelect: true,
-            showColumns:true, //列选择
-            // detailView:true,
-            showExport: true, //导出
-            exportDataType: "all",  //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
-            modalName: "入库明细",
-            iconSize: "outline",
-            toolbar: "#toolbar1",
-            contentType: "application/x-www-form-urlencoded",
-            columns: [
+    $("#bootstrap-table1").bootstrapTable({
+        // url: detailPrefix + "/headerId",
+        // createUrl: detailPrefix + "/add",
+        // updateUrl: detailPrefix + "/edit/{id}",
+        // removeUrl: detailPrefix + "/remove",
+        // search: true, //搜索
+        sortable: true, //排序
+        showRefresh: true, //刷新
+        showToggle: true, //视图切换
+        clickToSelect: true,
+        showColumns: true, //列选择
+        // detailView:true,
+        showExport: true, //导出
+        exportDataType: "all",  //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
+        modalName: "入库明细",
+        iconSize: "outline",
+        toolbar: "#toolbar1",
+        contentType: "application/x-www-form-urlencoded",
+        columns: [
             // {
             //     checkbox: true
             // },
             {
-                field : 'id',
-                title : '明细id'
+                field: 'id',
+                title: '明细id'
             },
             {
-                field : 'headerId',
-                title : '组盘头标识',
-				visible:false
+                field: 'headerId',
+                title: '组盘头标识',
+                visible: false
             },
             {
-                field : 'receiptDetailId',
-                title : '入库单明细标识',
-				visible:false
+                field: 'receiptDetailId',
+                title: '入库单明细标识',
+                visible: false
             },
-			{
-				field : 'receiptCode',
-				title : '入库单号' ,
-				sortable:true
-			},
             {
-                field : 'materialCode',
-                title : '物料编码',
-                sortable:true
+                field: 'receiptCode',
+                title: '入库单号',
+                sortable: true
+            },
+            {
+                field: 'materialCode',
+                title: '物料编码',
+                sortable: true
+            },
+            {
+                field: 'materialName',
+                title: '物料名称',
+                sortable: true
+            },
+            {
+                field: 'materialSpec',
+                title: '物料规格',
+                sortable: true
             },
-			{
-				field : 'materialName',
-				title : '物料名称',
-				sortable:true
-			},
-			{
-				field : 'materialSpec',
-				title : '物料规格',
-				sortable:true
-			},
             /*{
                 field : 'batch',
                 title : '批次',
@@ -229,23 +238,23 @@
                 title : '批号',
                 sortable:true
             },*/
-                {
-                    field : 'project',
-                    title : '项目号'
-                },
             {
-                field : 'qty',
-                title : '组盘数量'
+                field: 'project',
+                title: '项目号'
             },
             {
-                field : 'created',
-                title : '创建时间',
-                sortable:true
+                field: 'qty',
+                title: '组盘数量'
             },
             {
-                field : 'createdBy',
-                title : '创建用户',
-                sortable:true
+                field: 'created',
+                title: '创建时间',
+                sortable: true
+            },
+            {
+                field: 'createdBy',
+                title: '创建用户',
+                sortable: true
             },
             // {
             //     title: '操作',
@@ -256,105 +265,104 @@
             //         return actions.join('');
             //     }
             // }
-            ]
-        });
+        ]
+    });
  
-        function createtable(url,headerId) {
-            // $("#tabDetail").children().remove();
-            $("#myTab li").removeClass("active");
-            $(".tab-pane").removeClass("in active");
-            $("#myTab li:eq(1)").addClass("active");
-            $("#tabDetail").addClass("in active");
-            $.ajax({
-                url:url,
-                type: 'post',
-                data:{
-                    headerId:headerId
-                },
-                success : function (value) {
-                    $("#bootstrap-table1").bootstrapTable('load',value.data);
-                }
-            })
-        }
+    function createtable(url, headerId) {
+        // $("#tabDetail").children().remove();
+        $("#myTab li").removeClass("active");
+        $(".tab-pane").removeClass("in active");
+        $("#myTab li:eq(1)").addClass("active");
+        $("#tabDetail").addClass("in active");
+        $.ajax({
+            url: url,
+            type: 'post',
+            data: {
+                headerId: headerId
+            },
+            success: function (value) {
+                $("#bootstrap-table1").bootstrapTable('load', value.data);
+            }
+        })
+    }
  
-        /*入库单列表-详细*/
-        function detail(headerId) {
-            var url = detailPrefix + "/list/"+headerId;
-            // createMenuItem(url, "入库组盘明细");
-			S_headerId=headerId;
-			createtable(url, S_headerId);
-        }
+    /*入库单列表-详细*/
+    function detail(headerId) {
+        var url = detailPrefix + "/list/" + headerId;
+        // createMenuItem(url, "入库组盘明细");
+        S_headerId = headerId;
+        createtable(url, S_headerId);
+    }
  
-        /* 单个删除组盘明细 */
-        function remove(id) {
-            $.modal.confirm("确定删除该条明细信息吗？", function() {
-                var url = detailPrefix + "/remove";
-                var data = { "id": id };
-                $.operate.post(url, data);
-                createtable(url, S_headerId);
-            });
-        }
+    /* 单个删除组盘明细 */
+    function remove(id) {
+        $.modal.confirm("确定删除该条明细信息吗？", function () {
+            var url = detailPrefix + "/remove";
+            var data = {"id": id};
+            $.operate.post(url, data);
+            createtable(url, S_headerId);
+        });
+    }
  
-        /* 批量删除组盘 */
-        function batchRemoveHead() {
-            var rows=$("#bootstrap-table").bootstrapTable('getSelections');
-            if (rows.length == 0) {
-                $.modal.alertWarning("请至少选择一条记录");
-                return;
+    /* 批量删除组盘 */
+    function batchRemoveHead() {
+        var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        $.modal.confirm("确认要撤销选中的" + rows.length + "条组盘吗?", function () {
+            var url = prefix + "/remove";
+            var ids = "";
+            for (var i = 0; i < rows.length; i++) {
+                ids = ids + rows[i].id + ","
             }
-            $.modal.confirm("确认要撤销选中的" + rows.length + "条组盘吗?", function() {
-                var url = prefix + "/remove";
-                var ids = "";
-                for(var i=0; i<rows.length; i++) {
-                    ids = ids + rows[i].id + ","
-                }
-                var data = { "ids": ids.substring(0, ids.length-1) };
-                $.operate.post(url, data);
-                // submit(url, "post", "json", data);
-            });
-		}
+            var data = {"ids": ids.substring(0, ids.length - 1)};
+            $.operate.post(url, data);
+            // submit(url, "post", "json", data);
+        });
+    }
  
-		function chooseStation(id) {
-			var url = ctx + "receipt/receiptContainerHeader/chooseStation" + "/" +  id;
-			$.modal.open("选择站台", url);
-		}
+    function chooseStation(id) {
+        var url = ctx + "receipt/receiptContainerHeader/chooseStation" + "/" + id;
+        $.modal.open("选择站台", url);
+    }
  
  
+    /* 单个生成任务 */
+    function createTask(id) {
+        var url = prefix + "/createTask";
+        var data = {"ids": id};
+        $.operate.post(url, data);
+    }
  
-		/* 单个生成任务 */
-        function createTask(id) {
-            var url = prefix + "/createTask";
-			var data = { "ids" : id };
-			$.operate.post(url, data);
+    /* 批量生成任务 */
+    function batchCreateTask() {
+        var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
         }
-
-        /* 批量生成任务 */
-        function batchCreateTask() {
-            var rows=$("#bootstrap-table").bootstrapTable('getSelections');
-            if (rows.length == 0) {
-                $.modal.alertWarning("请至少选择一条记录");
-                return;
-            }
-			var ids = "";
-			for (var i = 0; i < rows.length; i++) {
-				ids = ids + rows[i].id + ","
-			}
-			var data = {"ids": ids.substring(0, ids.length - 1)};
-			// debugger
-			chooseStation(ids);
-
+        var ids = "";
+        for (var i = 0; i < rows.length; i++) {
+            ids = ids + rows[i].id + ","
         }
+        var data = {"ids": ids.substring(0, ids.length - 1)};
+        // debugger
+        chooseStation(ids);
+
+    }
  
-		function chooseStation(id) {
-			var url = ctx + "receipt/receiptContainerHeader/chooseStation" + "/" +  id;
-			$.modal.open("选择站台", url);
-		}
+    function chooseStation(id) {
+        var url = ctx + "receipt/receiptContainerHeader/chooseStation" + "/" + id;
+        $.modal.open("选择站台", url);
+    }
  
-		function position(id){
-			var url = prefix + "/position/";
-			var data = { "ids" : id };
-			$.operate.post(url, data);
-		}
-    </script>
+    function position(id) {
+        var url = prefix + "/position/";
+        var data = {"ids": id};
+        $.operate.post(url, data);
+    }
+</script>
 </body>
 </html>
@@ -113,10 +113,10 @@
                         </form>
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar" role="group">
-                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"-->
-                        <!--                           shiro:hasPermission="receipt:receiptHeader:add">-->
-                        <!--                            <i class="fa fa-plus"></i> 新增-->
-                        <!--                        </a>-->
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+                           shiro:hasPermission="receipt:receiptHeader:add">
+                            <i class="fa fa-plus"></i> 新增
+                        </a>
                         <!--                        <a class="btn btn-outline btn-default btn-rounded" onclick="submitReview()" shiro:hasPermission="receipt:receiptHeader:approval">-->
                         <!--                            <i class="fa fa-fighter-jet"></i> 提交审核-->
                         <!--                        </a>-->
@@ -240,10 +240,10 @@
                         </form>
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar1" role="group" style="position:relative;">
-                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="add()"-->
-                        <!--                           shiro:hasPermission="receipt:receiptDetail:add">-->
-                        <!--                            <i class="fa fa-plus"></i> 新增-->
-                        <!--                        </a>-->
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="add()"
+                           shiro:hasPermission="receipt:receiptDetail:add">
+                            <i class="fa fa-plus"></i> 新增
+                        </a>
                         <!--                        <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"-->
                         <!--                           shiro:hasPermission="receipt:receiptDetail:remove">-->
                         <!--                            <i class="fa fa-trash-o"></i> 删除-->