组盘头和主任务关联，组盘明细和子任务关联

pengcheng
1 parent e403ffd1
Showing 3 changed files with 10 additions and 1 deletions
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -257,7 +257,8 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         if(shipmentContainerHeader.getStatus()<=10){
             LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper=Wrappers.lambdaQuery();
             taskHeaderLambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,shipmentContainerHeader.getWarehouseCode())
-                    .eq(TaskHeader::getInternalTaskType,200);
+                    .eq(TaskHeader::getInternalTaskType,200)
+                    .eq(TaskHeader::getAllocationHeadId,shipmentContainerHeader.getId());
             TaskHeader taskHeader=taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
             if(taskHeader==null){
                 throw new ServiceException("找不到相应的任务头");
@@ -43,6 +43,13 @@ public class TaskHeader implements Serializable {
     private Integer taskType;
  
     /**
+     * 入库或出库组盘头ID
+     */
+    @TableField(value = "allocationHeadId")
+    @ApiModelProperty(value="入库或出库组盘头ID")
+    private Integer allocationHeadId;
+
+    /**
      * 内部类型
      */
     @TableField(value = "internalTaskType")
@@ -156,6 +156,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 task.setToLocation("");
             }
         }
+        task.setAllocationHeadId(shipmentContainerHeader.getId());
         task.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
         task.setCompanyCode(shipmentContainerHeader.getCompanyCode());
         task.setInternalTaskType(null);