diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/controller/AndroidInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/controller/AndroidInventoryController.java index b65706b0..1dd7a2c1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/controller/AndroidInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/controller/AndroidInventoryController.java @@ -5,6 +5,8 @@ import com.bonus.canteen.core.drp.dto.AndroidSearchMaterialDTO; import com.bonus.canteen.core.drp.service.AndroidInventoryService; import com.bonus.canteen.core.drp.vo.AndroidSearchMaterialVO; import com.bonus.canteen.core.drp.vo.DrpListSupplierVO; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.houqin.utils.LeRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javax.validation.Valid; @@ -35,19 +37,20 @@ public class AndroidInventoryController { @PostMapping({"/search/material"}) @ApiOperation("电子秤/手持机-根据原料名称模糊查询原料配置信息") - public List searchMaterial(@RequestBody @Valid AndroidSearchMaterialDTO dto, @RequestHeader Map headers) { + public AjaxResult searchMaterial(@RequestBody @Valid LeRequest leRequest, @RequestHeader Map headers) { log.info("***[电子秤/手持机]_根据原料名称模糊查询原料配置信息**************"); + AndroidSearchMaterialDTO dto = (AndroidSearchMaterialDTO)leRequest.getContent(); dto.setAreaId(this.drpAuthorityApi.getAreaIdByDeviceSn(headers)); - return this.androidInventoryService.searchMaterial(dto); + return new AjaxResult(10000, "成功", this.androidInventoryService.searchMaterial(dto)); } @PostMapping({"/list/supplier"}) @ApiOperation("电子秤/手持机-供应商列表") - public List androidListSupplier(@RequestHeader Map headers) { + public AjaxResult androidListSupplier(@RequestHeader Map headers) { log.info("***[电子秤/手持机]_供应商列表**************"); Long areaId = this.drpAuthorityApi.getAreaIdByDeviceSn(headers); - return this.androidInventoryService.androidListSupplier(areaId); + return new AjaxResult(10000, "成功", this.androidInventoryService.androidListSupplier(areaId)); } }