diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java index 1a392ef..3183c75 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java @@ -24,7 +24,7 @@ public class BomTreeController { @ApiOperation(value = "结构树查询", notes = "结构树查询") @GetMapping(value = "/queryBomTree") - public Result queryBomTree(@RequestParam(name = "materialNumber", required = false) String materialNumber, @RequestParam(name = "versionNumber", required = false) String versionNumber) { + public Result> queryBomTree(@RequestParam(name = "materialNumber", required = false) String materialNumber, @RequestParam(name = "versionNumber", required = false) String versionNumber) { List bomTreeInfoVOS = bomTreeService.getBomTreeByMaterialNumber(materialNumber, versionNumber); return Result.OK(bomTreeInfoVOS); } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java index 8e69565..d5761a2 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.checkerframework.checker.units.qual.A; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -157,7 +159,8 @@ public class CostCenterController extends JeecgController { @Autowired private CostStandardDetailService costStandardDetailService; @@ -45,16 +44,25 @@ public class CostStandardDetailController { * @param req * @return */ - //@AutoLog(value = "cost_standard-分页列表查询") - @ApiOperation(value="cost_standard_detail-分页列表查询", notes="cost_standard_detail-分页列表查询") + //@AutoLog(value = "标准成本单行列表查询") + @ApiOperation(value = "标准成本单行列表查询", notes = "标准成本单行列表查询") @GetMapping(value = "/list") - public Result> queryPageList(CostStandardDetailVO costStandard, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(CostStandardDetailVO costStandard, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { Page page = new Page(pageNo, pageSize); IPage pageList = costStandardDetailService.pageList(page, costStandard); return Result.OK(pageList); } + + /** + * 导出excel + * + * @param request + * @param costStandardDetail + */ + @RequestMapping(value = "/exportXls", method = RequestMethod.GET) + @ApiOperation(value = "单行查询导出", notes = "单行查询导出") + public ModelAndView exportXls(HttpServletRequest request, CostStandardDetail costStandardDetail) { + return super.exportXls(request, costStandardDetail, CostStandardDetail.class, "单行查询"); + } } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java index 9165bbb..56d8741 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/BomTreeInfoVO.java @@ -1,14 +1,20 @@ package com.zzsmart.qomo.kn.cost.manage.vo; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="bom结构树", description="bom结构树") public class BomTreeInfoVO { /** * 物料号 @@ -25,6 +31,11 @@ public class BomTreeInfoVO { */ @ApiModelProperty(value = "物料名称") private String materialName; + /** + * 版本号 + */ + @ApiModelProperty(value = "版本号") + private String versionNumber; /** * 数量 */