From 5e7b2ce518796995fabc5fd369b952da97b6d3c0 Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 26 May 2023 17:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/entity/BasicMaterialEntity.java | 131 ++++++++++++++ .../basic/feign/IBasicMaterialClient.java | 49 ++++++ .../com/logpm/basic/vo/BasicMaterialVO.java | 35 ++++ .../controller/BasicMaterialController.java | 150 ++++++++++++++++ .../com/logpm/basic/dto/BasicMaterialDTO.java | 34 ++++ .../logpm/basic/excel/BasicMaterialExcel.java | 166 ++++++++++++++++++ .../basic/feign/BasicMaterialClient.java | 53 ++++++ .../basic/mapper/BasicMaterialMapper.java | 54 ++++++ .../basic/mapper/BasicMaterialMapper.xml | 46 +++++ .../basic/service/IBasicMaterialService.java | 52 ++++++ .../impl/BasicMaterialServiceImpl.java | 54 ++++++ doc/dpm/物流租户系统.pdma.json | 8 +- 12 files changed, 828 insertions(+), 4 deletions(-) create mode 100644 blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java create mode 100644 blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java create mode 100644 blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicMaterialVO.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicMaterialDTO.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java create mode 100644 blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java new file mode 100644 index 000000000..84828e315 --- /dev/null +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 物料基础信息 实体类 + * + * @author tjj + * @since 2023-05-26 + */ +@Data +@TableName("logpm_basicdata_material") +@ApiModel(value = "BasicMaterial对象", description = "物料基础信息") +@EqualsAndHashCode(callSuper = true) +public class BasicMaterialEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 产品编码 + */ + @ApiModelProperty(value = "产品编码") + private String productCode; + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + /** + * 品牌 + */ + @ApiModelProperty(value = "品牌") + private String brandId; + /** + * 属性 + */ + @ApiModelProperty(value = "属性") + private String property; + /** + * 规格 + */ + @ApiModelProperty(value = "规格") + private String specification; + /** + * 包装规格 + */ + @ApiModelProperty(value = "包装规格") + private String packingSpecification; + /** + * 包装材质 + */ + @ApiModelProperty(value = "包装材质") + private String packagingMaterial; + /** + * 长 + */ + @ApiModelProperty(value = "长") + private BigDecimal extent; + /** + * 宽 + */ + @ApiModelProperty(value = "宽") + private BigDecimal breadth; + /** + * 高度 + */ + @ApiModelProperty(value = "高度") + private BigDecimal altitude; + /** + * 体积 + */ + @ApiModelProperty(value = "体积") + private BigDecimal volume; + /** + * 总量 + */ + @ApiModelProperty(value = "总量") + private BigDecimal weight; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java new file mode 100644 index 000000000..37c7d79d4 --- /dev/null +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basic.entity.BasicMaterialEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 物料基础信息 Feign接口类 + * + * @author tjj + * @since 2023-05-26 + */ +@FeignClient( + value = "blade-basicMaterial" +) +public interface IBasicMaterialClient { + + String API_PREFIX = "material/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取物料基础信息列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage materialTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicMaterialVO.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicMaterialVO.java new file mode 100644 index 000000000..1715efbd2 --- /dev/null +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicMaterialVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.vo; + +import com.logpm.basic.entity.BasicMaterialEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 物料基础信息 视图实体类 + * + * @author tjj + * @since 2023-05-26 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicMaterialVO extends BasicMaterialEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java new file mode 100644 index 000000000..ba33d5120 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.vo.BasicMaterialVO; +import com.logpm.basic.excel.BasicMaterialExcel; +import com.logpm.basic.service.IBasicMaterialService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 物料基础信息 控制器 + * + * @author tjj + * @since 2023-05-26 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/material") +@Api(value = "物料基础信息", tags = "物料基础信息接口") +public class BasicMaterialController extends BladeController { + + private final IBasicMaterialService basicMaterialService; + + /** + * 物料基础信息 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicMaterial") + public R detail(BasicMaterialEntity basicMaterial) { + BasicMaterialEntity detail = basicMaterialService.getOne(Condition.getQueryWrapper(basicMaterial)); + return R.data(detail); + } + /** + * 物料基础信息 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicMaterial") + public R> list(@ApiIgnore @RequestParam Map basicMaterial, Query query) { + IPage pages = basicMaterialService.page(Condition.getPage(query), Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class)); + return R.data(pages); + } + + /** + * 物料基础信息 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicMaterial") + public R> page(BasicMaterialVO basicMaterial, Query query) { + IPage pages = basicMaterialService.selectBasicMaterialPage(Condition.getPage(query), basicMaterial); + return R.data(pages); + } + + /** + * 物料基础信息 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicMaterial") + public R save(@Valid @RequestBody BasicMaterialEntity basicMaterial) { + return R.status(basicMaterialService.save(basicMaterial)); + } + + /** + * 物料基础信息 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicMaterial") + public R update(@Valid @RequestBody BasicMaterialEntity basicMaterial) { + return R.status(basicMaterialService.updateById(basicMaterial)); + } + + /** + * 物料基础信息 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicMaterial") + public R submit(@Valid @RequestBody BasicMaterialEntity basicMaterial) { + return R.status(basicMaterialService.saveOrUpdate(basicMaterial)); + } + + /** + * 物料基础信息 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicMaterialService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicMaterial") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicMaterial") + public void exportBasicMaterial(@ApiIgnore @RequestParam Map basicMaterial, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicMaterial::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicMaterialEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicMaterialService.exportBasicMaterial(queryWrapper); + ExcelUtil.export(response, "物料基础信息数据" + DateUtil.time(), "物料基础信息数据表", list, BasicMaterialExcel.class); + } + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicMaterialDTO.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicMaterialDTO.java new file mode 100644 index 000000000..712fd55d3 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicMaterialDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.dto; + +import com.logpm.basic.entity.BasicMaterialEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 物料基础信息 数据传输对象实体类 + * + * @author tjj + * @since 2023-05-26 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicMaterialDTO extends BasicMaterialEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java new file mode 100644 index 000000000..02ecb2cbc --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 物料基础信息 Excel实体类 + * + * @author tjj + * @since 2023-05-26 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicMaterialExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 产品编码 + */ + @ColumnWidth(20) + @ExcelProperty("产品编码") + private String productCode; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 品牌 + */ + @ColumnWidth(20) + @ExcelProperty("品牌") + private String brand; + /** + * 属性 + */ + @ColumnWidth(20) + @ExcelProperty("属性") + private String property; + /** + * 规格 + */ + @ColumnWidth(20) + @ExcelProperty("规格") + private String specification; + /** + * 包装规格 + */ + @ColumnWidth(20) + @ExcelProperty("包装规格") + private String packingSpecification; + /** + * 包装材质 + */ + @ColumnWidth(20) + @ExcelProperty("包装材质") + private String packagingMaterial; + /** + * 长 + */ + @ColumnWidth(20) + @ExcelProperty("长") + private BigDecimal extent; + /** + * 宽 + */ + @ColumnWidth(20) + @ExcelProperty("宽") + private BigDecimal breadth; + /** + * 高度 + */ + @ColumnWidth(20) + @ExcelProperty("高度") + private BigDecimal altitude; + /** + * 体积 + */ + @ColumnWidth(20) + @ExcelProperty("体积") + private BigDecimal volume; + /** + * 总量 + */ + @ColumnWidth(20) + @ExcelProperty("总量") + private BigDecimal weight; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java new file mode 100644 index 000000000..dd8bcb69c --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.service.IBasicMaterialService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 物料基础信息 Feign实现类 + * + * @author tjj + * @since 2023-05-26 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicMaterialClient implements IBasicMaterialClient { + + private final IBasicMaterialService basicMaterialService; + + @Override + @GetMapping(TOP) + public BladePage materialTop(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicMaterialService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.java new file mode 100644 index 000000000..55c060f25 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.mapper; + +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.vo.BasicMaterialVO; +import com.logpm.basic.excel.BasicMaterialExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 物料基础信息 Mapper 接口 + * + * @author tjj + * @since 2023-05-26 + */ +public interface BasicMaterialMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicMaterial + * @return + */ + List selectBasicMaterialPage(IPage page, BasicMaterialVO basicMaterial); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicMaterial(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml new file mode 100644 index 000000000..c8a2bae74 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java new file mode 100644 index 000000000..dbc23afb4 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.vo.BasicMaterialVO; +import com.logpm.basic.excel.BasicMaterialExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 物料基础信息 服务类 + * + * @author tjj + * @since 2023-05-26 + */ +public interface IBasicMaterialService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicMaterial + * @return + */ + IPage selectBasicMaterialPage(IPage page, BasicMaterialVO basicMaterial); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicMaterial(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java new file mode 100644 index 000000000..f473c6ce6 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.service.impl; + +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.vo.BasicMaterialVO; +import com.logpm.basic.excel.BasicMaterialExcel; +import com.logpm.basic.mapper.BasicMaterialMapper; +import com.logpm.basic.service.IBasicMaterialService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 物料基础信息 服务实现类 + * + * @author tjj + * @since 2023-05-26 + */ +@Service +public class BasicMaterialServiceImpl extends BaseServiceImpl implements IBasicMaterialService { + + @Override + public IPage selectBasicMaterialPage(IPage page, BasicMaterialVO basicMaterial) { + return page.setRecords(baseMapper.selectBasicMaterialPage(page, basicMaterial)); + } + + + @Override + public List exportBasicMaterial(Wrapper queryWrapper) { + List basicMaterialList = baseMapper.exportBasicMaterial(queryWrapper); + //basicMaterialList.forEach(basicMaterial -> { + // basicMaterial.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicMaterial.getType())); + //}); + return basicMaterialList; + } + +} diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 491a5a424..6a7e423a0 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-5-26 14:16:18", + "updatedTime": "2023-5-26 17:18:03", "dbConns": [], "profile": { "default": { @@ -7304,8 +7304,8 @@ "id": "A7DCBA41-3F16-46B8-B005-B9672E8C9B21" }, { - "defKey": "brand", - "defName": "品牌", + "defKey": "brand_id", + "defName": "品牌编号", "comment": "", "type": "VARCHAR", "len": 200, @@ -32685,4 +32685,4 @@ } ], "dbConn": [] -} +} \ No newline at end of file