呼叫料盒成功后响应任务实体

周峰
1 parent 7d53076b
Showing 4 changed files with 8 additions and 5 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java
@@ -11,6 +11,7 @@ import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.framework.controller.BaseController;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -32,7 +33,7 @@ public class ReceiptController extends BaseController {
     @PostMapping("/callbox")
     @ResponseBody
     @ApiLogger(apiName = "PDA入库-呼叫料盒", from="PDA")
-    public Result<Integer> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
+    public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
        //补充入库类型
@@ -11,6 +11,7 @@ import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.framework.controller.BaseController;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -32,7 +33,7 @@ public class ShipmentController extends BaseController {
     @PostMapping("/callbox")
     @ResponseBody
     @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
-    public Result<Integer> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
+    public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
         String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
         //补充入库类型
@@ -5,8 +5,9 @@ import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
 import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
 import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 public interface IMobileService {
-    Result callBox(CallBoxBean bean, String warehouseCode);
+    Result<TaskHeader> callBox(CallBoxBean bean, String warehouseCode);
 }
@@ -34,7 +34,7 @@ public class MobileService implements IMobileService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<Integer> callBox(CallBoxBean bean, String warehouseCode) {
+    public Result<TaskHeader> callBox(CallBoxBean bean, String warehouseCode) {
         if(StringUtils.isEmpty(bean.getContainerCode())){
             return Result.error("托盘号containerCode不能为空");
         }
@@ -97,6 +97,6 @@ public class MobileService implements IMobileService {
             throw new ServiceException("补充入库主表生成失败！");
         }
-        return Result.OK("呼叫料盒成功", taskHeader.getId());
+        return Result.OK("呼叫料盒成功", taskHeader);
     }
 }