wms / wms4_andelichi · Commits

Commit b8f8c22cb9b66788730244e71e909c65eca8619b

Authored by 周峰
1 parent 7d53076b

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

Inline Side-by-side
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
  View file @b8f8c22
... ... @@ -11,6 +11,7 @@ import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
11 11 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
12 12 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
13 13 import org.jeecg.modules.wms.framework.controller.BaseController;
  14 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
14 15 import org.jeecg.utils.constant.QuantityConstant;
15 16 import org.springframework.web.bind.annotation.*;
16 17 import javax.annotation.Resource;
... ... @@ -32,7 +33,7 @@ public class ReceiptController extends BaseController {
32 33 @PostMapping("/callbox")
33 34 @ResponseBody
34 35 @ApiLogger(apiName = "PDA入库-呼叫料盒", from="PDA")
35   - public Result<Integer> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
  36 + public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
36 37 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
37 38  
38 39 //补充入库类型
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
  View file @b8f8c22
... ... @@ -11,6 +11,7 @@ import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
11 11 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
12 12 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
13 13 import org.jeecg.modules.wms.framework.controller.BaseController;
  14 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
14 15 import org.jeecg.utils.constant.QuantityConstant;
15 16 import org.springframework.web.bind.annotation.*;
16 17 import javax.annotation.Resource;
... ... @@ -32,7 +33,7 @@ public class ShipmentController extends BaseController {
32 33 @PostMapping("/callbox")
33 34 @ResponseBody
34 35 @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
35   - public Result<Integer> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
  36 + public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
36 37 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
37 38  
38 39 //补充入库类型
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/IMobileService.java
  View file @b8f8c22
... ... @@ -5,8 +5,9 @@ import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
5 5 import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
6 6 import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
7 7 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
  8 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
8 9  
9 10 public interface IMobileService {
10 11  
11   - Result callBox(CallBoxBean bean, String warehouseCode);
  12 + Result<TaskHeader> callBox(CallBoxBean bean, String warehouseCode);
12 13 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java
  View file @b8f8c22
... ... @@ -34,7 +34,7 @@ public class MobileService implements IMobileService {
34 34  
35 35 @Override
36 36 @Transactional(rollbackFor = Exception.class)
37   - public Result<Integer> callBox(CallBoxBean bean, String warehouseCode) {
  37 + public Result<TaskHeader> callBox(CallBoxBean bean, String warehouseCode) {
38 38 if(StringUtils.isEmpty(bean.getContainerCode())){
39 39 return Result.error("托盘号containerCode不能为空");
40 40 }
... ... @@ -97,6 +97,6 @@ public class MobileService implements IMobileService {
97 97 throw new ServiceException("补充入库主表生成失败！");
98 98 }
99 99  
100   - return Result.OK("呼叫料盒成功", taskHeader.getId());
  100 + return Result.OK("呼叫料盒成功", taskHeader);
101 101 }
102 102 }
... ...