创建任务成功后都返回任务实体给前端

周峰
1 parent df7b4518
Showing 6 changed files with 18 additions and 16 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/IShipmentCombinationService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -31,6 +31,7 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.web.bind.annotation.*;
@@ -121,7 +122,7 @@ public class ShipmentCombinationController {
     @ApiOperation(value="出库组盘-创建出库任务", notes="出库组盘-创建出库任务")
     @PostMapping("/createShipmentTask")
     @ResponseBody
-    public Result createShipmentTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
+    public Result<TaskHeader> createShipmentTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
         String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
         return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode);
     }
@@ -7,6 +7,7 @@ import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContai
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import java.util.List;
@@ -23,7 +24,7 @@ public interface IShipmentCombinationService {
     public Result combination(CombinationModel combinationModel);
-    public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode);
+    public Result<TaskHeader> createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode);
     public Result getInventoryFromShipmentDetail(Integer shipmentDetailId);
 }
@@ -414,7 +414,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     @Override
     @Transactional(rollbackFor = ServiceException.class)
-    public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode) {
+    public Result<TaskHeader> createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode) {
         Integer preTaskNo = 0;
         if (shipmentContainerHeader == null) {
             return Result.error("生成出库任务时, 出库组盘头"  + "未找到,操作中止");
@@ -555,7 +555,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
                 throw new ServiceException("生成出库任务时, 更新库存头失败");
             }
         }
-        return Result.OK("生成出库任务成功");
+        return Result.OK("生成出库任务成功", taskHeader);
     }
    @Override
@@ -425,7 +425,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
 	 @ApiOperation(value="任务表-创建空托出库任务", notes="任务表-创建空托出库任务")
 	 @RequiresPermissions("taskHeader:emptyOut")
 	 @PostMapping( "/createEmptyOut")
-	 public Result createEmptyOut(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
+	 public Result<TaskHeader> createEmptyOut(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
 		 String contaienrCode = taskHeader.getContainerCode();
 		 String toPortCode = taskHeader.getToPortCode();
 		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
@@ -447,7 +447,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
 	 @ApiOperation(value="任务表-创建移库任务", notes="任务表-创建移库任务")
 	 @RequiresPermissions("taskHeader:transfer")
 	 @PostMapping( "/createTransferTask")
-	 public Result createTransferTask(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
+	 public Result<TaskHeader> createTransferTask(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
 		 String fromLocationCode = taskHeader.getFromLocationCode();
 		 String toLocationCode = taskHeader.getToLocationCode();
 		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
@@ -469,7 +469,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
 	 @ApiOperation(value="任务表-创建出库查看任务", notes="任务表-创建出库查看任务")
 	 @PostMapping( "/createCheckOutTask")
 	 @RequiresPermissions("taskHeader:checkOut")
-	 public Result createCheckOutTask(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
+	 public Result<TaskHeader> createCheckOutTask(@RequestBody  TaskHeader taskHeader, HttpServletRequest req) {
 		 String containerCode = taskHeader.getContainerCode();
 		 String toPortCode = taskHeader.getToPortCode();
 		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
@@ -111,7 +111,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
 	 * @param warehouseCode
 	 * @return
 	 */
-	Result createEmptyOut(String containerCode, String toPortCode, String warehouseCode);
+	Result<TaskHeader> createEmptyOut(String containerCode, String toPortCode, String warehouseCode);
 	/**
 	 * 创建移库任务
@@ -120,7 +120,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
 	 * @param warehouseCode
 	 * @return
 	 */
-	Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
+	Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
 	/**
 	 * 创建出库查看任务
@@ -129,7 +129,7 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
 	 * @param warehouseCode
 	 * @return
 	 */
-	Result createCheckOutTask(String containerCode, String toPortCode, String warehouseCode);
+	Result<TaskHeader> createCheckOutTask(String containerCode, String toPortCode, String warehouseCode);
 	/**
 	 * 创建跨站任务任务
@@ -153,7 +153,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
+	public Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
 		if(StringUtils.isEmpty(fromLocationCode)) {
 			return Result.error("创建移库任务时，起始库位为空");
 		}
@@ -276,12 +276,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 		if(!success) {
 			throw new ServiceException("创建移库任务时，容器" + fromLocation.getContainerCode() + "更新失败");
 		}
-		return Result.OK("创建移库任务成功");
+		return Result.OK("创建移库任务成功", taskHeader);
 	}
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result createCheckOutTask(String containerCode, String toPortCode, String warehouseCode) {
+	public Result<TaskHeader> createCheckOutTask(String containerCode, String toPortCode, String warehouseCode) {
 		if(StringUtils.isEmpty(containerCode)) {
 			return Result.error("创建出库查看任务时，容器编码为空");
 		}
@@ -351,7 +351,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 		if(!success) {
 			throw new ServiceException("创建出库查看任务时, 创建任务失败");
 		}
-		return Result.OK("创建出库查看任务成功");
+		return Result.OK("创建出库查看任务成功", taskHeader);
 	}
 	@Override
@@ -870,7 +870,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result createEmptyOut(String containerCode, String toPortCode, String warehouseCode) {
+	public Result<TaskHeader> createEmptyOut(String containerCode, String toPortCode, String warehouseCode) {
 		if(StringUtils.isEmpty(containerCode)) {
 			return Result.error("创建空托盘出库时, 托盘号为空");
 		}
@@ -926,7 +926,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
 		if(!success) {
 			throw new ServiceException("创建空托盘出库时，保存任务失败");
 		}
-		return Result.OK("创建空托盘出库任务成功");
+		return Result.OK("创建空托盘出库任务成功", taskHeader);
 	}
 	/**