futian.liu
2023-12-12 03941ed4fa0fcf582e4aa8d118366231bee1870a
api文档
14个文件已修改
61 ■■■■ 已修改文件
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinFileController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -8,6 +8,7 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,6 +22,7 @@
 * @Author 卢庆阳
 * @Date 2023/10/25
 */
@Api(value = "规格型号", tags = "规格型号")
@RestController
@RequestMapping("/pc/base/goods/models")
public class BaseGoodsModelsController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -45,6 +45,7 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -54,6 +55,7 @@
 * @Author 卢庆阳
 * @Date 2023/10/24
 */
@Api(value = "物品模板", tags = "物品模板")
@RestController
@RequestMapping("/pc/base/goods/template")
public class BaseGoodsTemplateController extends BaseController {
@@ -361,6 +363,6 @@
                }
            }).sheet(0).doRead();
        return ResponseValue.success("导入成功!", 1);
        return ResponseValue.success("导入成功!");
    }
}
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,5 +1,6 @@
package com.consum.base.controller;
import io.swagger.annotations.Api;
import java.util.ArrayList;
import java.util.List;
@@ -31,6 +32,7 @@
 * @Author 卢庆阳
 * @Date 2023/10/26
 */
@Api(value = "仓库管理", tags = "仓库管理")
@RestController
@RequestMapping("/pc/base/warehouse")
public class BaseWarehouseController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -41,7 +41,7 @@
 * @Description
 * @Version 1.0
 **/
@Api(value = "库管员", tags = "库管员")
@Api(value = "部门报废", tags = "部门报废")
@RestController
@RequestMapping("/pc/l/wh/form/scrapped")
public class DepFormScrappedController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
@@ -10,6 +10,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.core.io.ClassPathResource;
@@ -28,6 +29,7 @@
/**
 * 部门台账
 */
@Api(value = "部门台账", tags = "部门台账")
@RestController
@RequestMapping("/pc/fin/warehouse/departLedger")
public class FinDepartLedgerController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/FinFileController.java
@@ -7,6 +7,7 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,7 @@
 * @Author wh
 * @Date 2023/8/1 10:33
 */
@Api(value = "文件上传", tags = "文件上传")
@RestController
@RequestMapping("/pc/fin/file")
public class FinFileController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,5 +1,15 @@
package com.consum.base.controller;
import io.swagger.annotations.Api;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysServerSearchParam;
@@ -10,14 +20,7 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.web.ResponseValue;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@Api(value = "系统服务信息", tags = "系统服务信息")
@RestController
@RequestMapping("/pc/fin/sys/server")
public class FinSysServerController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -46,15 +46,17 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
 * @Description 区划
 * @Description 机构
 * @Author wh
 * @Date 2023/7/13 19:51
 */
@Api(value = "机构管理", tags = "机构管理")
@RestController
@RequestMapping("/pc/fin/sys/tenant")
public class FinSysTenantController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -310,7 +310,7 @@
    public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file)
        throws IOException {
        String originalFilename = file.getOriginalFilename();
        if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
        if (!originalFilename.endsWith("xls")) {
            return ResponseValue.error("文件格式有误!");
        }
        S_user_core currentUser = this.getCurrentUser();
consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
@@ -10,6 +10,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.core.io.ClassPathResource;
@@ -33,6 +34,7 @@
 * @Description 仓库台账
 * @Version 1.0
 **/
@Api(value = "仓库台账", tags = "仓库台账")
@RestController
@RequestMapping("/pc/fin/warehouse/ledger")
public class FinWarehouseLedgerController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
@@ -4,6 +4,7 @@
import com.consum.base.service.LOrgSupplierServiceImpl;
import com.iplatform.model.po.S_user_core;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +18,7 @@
 * @Description
 * @Version 1.0
 **/
@Api(value = "供应商", tags = "供应商")
@RestController
@RequestMapping("/pc/orgSupplier")
public class LOrgSupplierController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -11,6 +11,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@
 * @Description
 * @Version 1.0
 **/
@Api(value = "仓库流水", tags = "仓库流水")
@RestController
@RequestMapping("/pc/warehouse/flow")
public class LWarehouseFlowController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
@@ -7,6 +7,7 @@
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +21,7 @@
 * @Description 物品统计
 * @Version 1.0
 **/
@Api(value = "物品统计", tags = "物品统计")
@RestController
@RequestMapping("/pc/warehouse/goodsStatistics")
public class LWhGoodsStatisticsController extends BaseController {
consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
@@ -17,6 +17,9 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
@Api(value = "物品型号", tags = "物品型号")
@RestController
@RequestMapping("/pc/warehouse/procureModel")
public class LWhProcureModelController extends BaseController {
@@ -32,7 +35,8 @@
        LWhProcureModelQry param2 = new LWhProcureModelQry();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
        List<Map<String, Object>> ffOrderByGoodsIdAndDept =
            lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
        if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
            return ResponseValue.success();
        }
@@ -48,14 +52,14 @@
        LWhProcureModelQry param2 = new LWhProcureModelQry();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService
            .getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
        if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
            return ResponseValue.success();
        }
        // 按型号分组返回
        return ResponseValue.success(ffOrderByGoodsIdAndDept.stream()
                .collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
        return ResponseValue.success(
            ffOrderByGoodsIdAndDept.stream().collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
    }
}