优化bom树查询接口

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<List<BomTreeInfoVO>> queryBomTree(@RequestParam(name = "materialNumber", required = false) String materialNumber, @RequestParam(name = "versionNumber", required = false) String versionNumber) {
         List<BomTreeInfoVO> bomTreeInfoVOS = bomTreeService.getBomTreeByMaterialNumber(materialNumber, versionNumber);
         return Result.OK(bomTreeInfoVOS);
     }

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<CostCenter, ICostCente
     * @param costCenter
     */
     //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:cost_center:exportXls")
-    @RequestMapping(value = "/exportXls")
+    @PostMapping(value = "/exportXls")
+	@ApiOperation(value="cost_center-导出excel", notes="cost_center-导出excel")
     public ModelAndView exportXls(HttpServletRequest request, CostCenter costCenter) {
         return super.exportXls(request, costCenter, CostCenter.class, "cost_center");
     }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java

@@ -1,51 +1,27 @@
 package com.zzsmart.qomo.kn.cost.manage.controller;
 
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
 import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
 
  /**
  * @Description: 标准成本

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java

@@ -3,20 +3,19 @@ package com.zzsmart.qomo.kn.cost.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
 import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
+import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -28,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
  * @author cost_purchase_price
  * @since 2024-06-19
  */
-@Api(tags="标准成本单行查询")
+@Api(tags = "标准成本单行查询")
 @RestController
 @RequestMapping("//costStandardDetail")
 @Slf4j
-public class CostStandardDetailController {
+public class CostStandardDetailController extends JeecgController<CostStandardDetail, CostStandardDetailService> {
     @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<IPage<CostStandardDetailVO>> queryPageList(CostStandardDetailVO costStandard,
-                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                                                HttpServletRequest req) {
+    public Result<IPage<CostStandardDetailVO>> queryPageList(CostStandardDetailVO costStandard, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 
         Page<CostStandardDetailVO> page = new Page<CostStandardDetailVO>(pageNo, pageSize);
         IPage<CostStandardDetailVO> 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, "单行查询");
+    }
 }

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;
     /**
      * 数量
      */