diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java index db81fad..cfc11ef 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.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); //补充入库类型 diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java index 05f98fc..bd10bdd 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.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 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); //补充入库类型 diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java index a4b2e69..393c5dd 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java @@ -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); } diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java index 1d6b3d0..46d81e6 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java @@ -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); } }