From b10ac059071d0a78436b9171359a27568e596b6d Mon Sep 17 00:00:00 2001 From: wangqiong <1322446236@qq.com> Date: Fri, 21 Jun 2024 17:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ebom=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/BomTreeController.java | 2 +- .../controller/BudgetPriceController.java | 2 +- .../controller/C7525costController.java | 2 +- .../controller/CostCenterController.java | 2 +- .../controller/CostMaterialBomController.java | 58 +++++++++++++++++-- .../CostPartMissingInfoController.java | 2 +- .../controller/CostStandardController.java | 2 +- .../CostStandardDetailController.java | 2 +- .../CostStandardVersionController.java | 17 +++++- .../manage/controller/HourRateController.java | 2 +- .../LatestPurchasePriceController.java | 2 +- .../controller/ProduceBatchController.java | 2 +- .../controller/SapSubfactoryController.java | 2 +- .../cost/manage/entity/CostMaterialBom.java | 52 ++--------------- .../manage/mapper/CostMaterialBomMapper.java | 2 +- .../service/CostMaterialBomService.java | 13 ++++- .../service/ICostStandardVersionService.java | 9 ++- .../impl/CostMaterialBomServiceImpl.java | 27 ++++++++- .../impl/CostStandardVersionServiceImpl.java | 19 +++++- .../qomo/kn/cost/manage/ApplicationTests.java | 12 ++-- 20 files changed, 152 insertions(+), 79 deletions(-) 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 3183c75..aa69f80 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 @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "结构树查询") +@Api(tags = "cost-结构树查询") @RestController @RequestMapping("//bomTree") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java index f2b62b8..2727cea 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java @@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-11 * @Version: V1.0 */ -@Api(tags="预算价格") +@Api(tags="cost-预算价格") @RestController @RequestMapping("//budgetPrice") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java index 6fe285c..c78b56e 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java @@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-06 * @Version: V1.0 */ -@Api(tags="7525单价") +@Api(tags="cost-7525单价") @RestController @RequestMapping("//c7525cost") @Slf4j 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 d5761a2..86cdde3 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 @@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-11 * @Version: V1.0 */ -@Api(tags="成本中心") +@Api(tags="cost-成本中心") @RestController @RequestMapping("/com.zzsmart.qomo.kn.cost.manage/costCenter") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java index aded9ae..ea91f98 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java @@ -1,20 +1,70 @@ package com.zzsmart.qomo.kn.cost.manage.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom; +import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; +import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +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 javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 物料bom 前端控制器 *

* - * @author - * @since 2024-06-19 + * @author + * @since 2024-06-21 */ +@RequestMapping("//cost-material-bom") +@Api(tags="cost-标准成本-bom信息") @RestController -@RequestMapping("/cost-material-bom") public class CostMaterialBomController { - + @Autowired + CostMaterialBomService costMaterialBomService; + /** + * 分页列表查询 + * + * @param costMaterialBom + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "cost_standard_version-分页列表查询") + @ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询") + @GetMapping(value = "/pageList") + public Result> queryPageList(CostMaterialBom costMaterialBom, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(costMaterialBom, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = costMaterialBomService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value="物料bom列表查询", notes="物料bom列表查询") + @GetMapping(value = "/list") + public Result< List> queryList(@RequestParam(name = "materialNumber",required = false) String materialNumber) { + List list = costMaterialBomService.queryListResult(materialNumber); + return Result.OK(list); + } } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java index bb6720b..d8c7d27 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java @@ -44,7 +44,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-13 * @Version: V1.0 */ -@Api(tags="标准成本-部件缺失信息") +@Api(tags="cost-标准成本-部件缺失信息") @RestController @RequestMapping("//costPartMissingInfo") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java index 167f919..268f23d 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java @@ -29,7 +29,7 @@ import java.util.Arrays; * @Date: 2024-06-13 * @Version: V1.0 */ -@Api(tags="标准成本计算") +@Api(tags="cost-标准成本计算") @RestController @RequestMapping("//costStandard") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java index 79901c4..9d5afd6 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; * @author cost_purchase_price * @since 2024-06-19 */ -@Api(tags = "标准成本单行查询") +@Api(tags = "cost-标准成本单行查询") @RestController @RequestMapping("//costStandardDetail") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java index 1c45c9e..2a3b4a1 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java @@ -10,6 +10,7 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService; @@ -46,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-13 * @Version: V1.0 */ -@Api(tags="标准成本-版本号") +@Api(tags="cost-标准成本-版本号") @RestController @RequestMapping("//costStandardVersion") @Slf4j @@ -65,7 +66,7 @@ public class CostStandardVersionController extends JeecgController> queryPageList(CostStandardVersion costStandardVersion, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -75,7 +76,17 @@ public class CostStandardVersionController extends JeecgController pageList = costStandardVersionService.page(page, queryWrapper); return Result.OK(pageList); } - + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value="版本号列表查询", notes="版本号列表查询") + @GetMapping(value = "/list") + public Result< List> queryList(@RequestParam(name = "versionNumber",required = false) String versionNumber) { + List list = costStandardVersionService.queryListResult(versionNumber); + return Result.OK(list); + } /** * 添加 * diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java index abc6508..bc449eb 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java @@ -27,7 +27,7 @@ import java.util.Arrays; * @Date: 2024-06-06 * @Version: V1.0 */ -@Api(tags="小时费率") +@Api(tags="cost-小时费率") @RestController @RequestMapping("//hourRate") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java index b73ea7d..3ef3344 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java @@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-11 * @Version: V1.0 */ -@Api(tags="最新采购价") +@Api(tags="cost-最新采购价") @RestController @RequestMapping("//latestPurchasePrice") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java index 3844db9..7f80709 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java @@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-11 * @Version: V1.0 */ -@Api(tags="生产批量设置") +@Api(tags="cost-生产批量设置") @RestController @RequestMapping("//produceBatch") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java index c4b5a80..887bcea 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java @@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; * @Date: 2024-06-11 * @Version: V1.0 */ -@Api(tags="工厂信息") +@Api(tags="cost-工厂信息") @RestController @RequestMapping("/com.zzsmart.qomo.kn.cost.manage/sapSubfactory") @Slf4j diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java index 9f4511b..b6a806e 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java @@ -4,14 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -21,14 +16,13 @@ import lombok.experimental.Accessors; * 物料bom *

* - * @author - * @since 2024-06-19 + * @author + * @since 2024-06-21 */ @Getter @Setter @Accessors(chain = true) @TableName("cost_material_bom") -@ApiModel(value = "cost_material_bom对象", description = "cost_material_bom") public class CostMaterialBom implements Serializable { private static final long serialVersionUID = 1L; @@ -36,233 +30,198 @@ public class CostMaterialBom implements Serializable { /** * id */ - @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.AUTO) private String id; /** * 物料编码 */ - @ApiModelProperty(value = "物料编码") @TableField("material_code") private String materialCode; /** * 物料名称 */ - @ApiModelProperty(value = "物料名称") @TableField("material_name") private String materialName; /** * 父级物料编码 */ - @ApiModelProperty(value = "父级物料编码") @TableField("parent_material_code") private String parentMaterialCode; /** * 级别 */ - @ApiModelProperty(value = "级别") @TableField("level") private String level; /** * 排序 */ - @ApiModelProperty(value = "排序") @TableField("sort") private Integer sort; /** * 计量单位 */ - @ApiModelProperty(value = "计量单位") @TableField("unit") private String unit; /** * 数量 */ - @ApiModelProperty(value = "id") - @TableField("数量") + @TableField("number") private Integer number; /** * 人工工时（分钟） */ - @ApiModelProperty(value = "人工工时（分钟）") @TableField("labor_hours") private BigDecimal laborHours; /** * 设备工时 */ - @ApiModelProperty(value = "设备工时") @TableField("device_hours") private BigDecimal deviceHours; /** * 借用物料编码 */ - @ApiModelProperty(value = "借用物料编码") @TableField("borrow_material_code") private String borrowMaterialCode; /** * 参考物料编码 */ - @ApiModelProperty(value = "参考物料编码") @TableField("refer_material_code") private String referMaterialCode; /** * 采购类型 */ - - @ApiModelProperty(value = "采购类型") @TableField("purchase_type") private String purchaseType; /** * 特殊采购类型 */ - - @ApiModelProperty(value = "特殊采购类型") @TableField("special_purchase_type") private String specialPurchaseType; /** * 说明 */ - @ApiModelProperty(value = "说明") @TableField("explanation") private String explanation; /** * 单位数量 */ - @ApiModelProperty(value = "单位数量") @TableField("quantity") private BigDecimal quantity; /** * 重量（g） */ - @ApiModelProperty(value = "重量（g）") @TableField("weight") private String weight; /** * 材料/牌号 */ - @ApiModelProperty(value = "材料/牌号") @TableField("material_and_brand") private String materialAndBrand; /** * 表面处理，材料 */ - @ApiModelProperty(value = "表面处理，材料") @TableField("surface_material") private String surfaceMaterial; /** * 厚度（mm） */ - @ApiModelProperty(value = "厚度（mm）") @TableField("surface_thickness") private String surfaceThickness; /** * 表面积（mm²） */ - @ApiModelProperty(value = "表面积（mm²）") @TableField("surface_area") private String surfaceArea; /** * 长（mm） */ - @ApiModelProperty(value = "长（mm）") @TableField("length") private String length; /** * 宽（mm） */ - @ApiModelProperty(value = "宽（mm）") @TableField("width") private String width; /** * 高（mm） */ - @ApiModelProperty(value = "高（mm）") @TableField("height") private String height; /** * 图示/图档/文档 文件ID */ - @ApiModelProperty(value = "图示/图档/文档 文件ID") @TableField("figure_file_id") private Long figureFileId; /** - * 是否新模具（0否 1是） + * 是否新摸具（0否 1是） */ - @ApiModelProperty(value = "是否新模具（0否 1是）") @TableField("new_tooling") private Boolean newTooling; /** * 成型方式（枚举） */ - @ApiModelProperty(value = "成型方式（枚举）") @TableField("shaping_method") private String shapingMethod; /** * 作业内容 */ - @ApiModelProperty(value = "作业内容") @TableField("work_content") private String workContent; /** * 加工地点 */ - @ApiModelProperty(value = "加工地点") @TableField("process_location") private String processLocation; /** * 成本中心 */ - @ApiModelProperty(value = "成本中心") @TableField("cost_center") private String costCenter; /** * 单价（未税） */ - @ApiModelProperty(value = "单价（未税）") @TableField("unit_price") private BigDecimal unitPrice; /** * 总价（未税） */ - @ApiModelProperty(value = "总价（未税）") @TableField("total_price") private BigDecimal totalPrice; /** - * 模具费（未税） + * 摸具费（未税） */ - @ApiModelProperty(value = "模具费（未税）") @TableField("mould_price") private BigDecimal mouldPrice; @@ -293,7 +252,6 @@ public class CostMaterialBom implements Serializable { /** * 备注（特殊技术信息） */ - @ApiModelProperty(value = "备注（特殊技术信息）") @TableField("remark") private String remark; diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java index 081e812..712b28d 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; *

* * @author - * @since 2024-06-19 + * @since 2024-06-21 */ @Mapper public interface CostMaterialBomMapper extends BaseMapper { diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java index 1b752bc..e30861b 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java @@ -3,14 +3,21 @@ package com.zzsmart.qomo.kn.cost.manage.service; import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 物料bom 服务类 *

* - * @author - * @since 2024-06-19 + * @author + * @since 2024-06-21 */ public interface CostMaterialBomService extends IService { - + /** + * 分页查询 + * @param + * @return + */ + List queryListResult(String materialNumber); } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java index f4e69c4..9086cbd 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java @@ -2,11 +2,13 @@ package com.zzsmart.qomo.kn.cost.manage.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; import org.jeecg.common.api.vo.Result; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** @@ -24,5 +26,10 @@ public interface ICostStandardVersionService extends IService importExcel(HttpServletRequest request, HttpServletResponse response, Class costStandardVersionClass); - + /** + * 分页查询 + * @param + * @return + */ + List queryListResult(String versionNumber); } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java index 91a29ff..114392a 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java @@ -1,20 +1,43 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom; import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper; import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 物料bom 服务实现类 *

* - * @author - * @since 2024-06-19 + * @author + * @since 2024-06-21 */ @Service public class CostMaterialBomServiceImpl extends ServiceImpl implements CostMaterialBomService { + @Autowired + CostMaterialBomMapper costMaterialBomMapper; + /** + * 分页查询 + * + * @param materialNumber + * @return + */ + @Override + public List queryListResult(String materialNumber) { + QueryWrapper queryWrapper = new QueryWrapper(); + if (StrUtil.isNotEmpty(materialNumber)) { + // 物料号 + queryWrapper.like("material_code", materialNumber); + } + List list = costMaterialBomMapper.selectList(queryWrapper); + return list; + } } diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java index db76eaa..fd6aa64 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java @@ -3,6 +3,7 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zzsmart.qomo.kn.cost.manage.constants.Constants; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; @@ -48,7 +49,7 @@ import java.util.Map; @Service public class CostStandardVersionServiceImpl extends ServiceImpl implements ICostStandardVersionService { @Autowired - private CostStandardMapper costStandardMapper; + private CostStandardVersionMapper costStandardVersionMapper; private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class); @Transactional(rollbackFor = Exception.class) @@ -209,4 +210,20 @@ public class CostStandardVersionServiceImpl extends ServiceImpl queryListResult(String versionNumber) { + QueryWrapper queryWrapper = new QueryWrapper(); + if (StrUtil.isNotEmpty(versionNumber)) { + // 物料号 + queryWrapper.like("version_number", versionNumber); + } + List list = costStandardVersionMapper.selectList(queryWrapper); + return list; + } } diff --git a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java index 55265ec..8be40ab 100644 --- a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java +++ b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java @@ -42,7 +42,7 @@ public class ApplicationTests { .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml")); }) .strategyConfig(builder -> { - builder.addInclude("cost_standard_detail")// todo 设置需要生成的表名 + builder.addInclude("cost_material_bom")// todo 设置需要生成的表名 //.addTablePrefix("sys_")//设置表前缀过滤 .entityBuilder() .enableLombok() @@ -66,11 +66,11 @@ public class ApplicationTests { .enableRestStyle(); }) // 使用Freemarker引擎模板，默认的是Velocity引擎模板 - .templateConfig(builder -> { - builder.disable(TemplateType.CONTROLLER) - .disable(TemplateType.SERVICE) - .disable(TemplateType.SERVICEIMPL); - }) +// .templateConfig(builder -> { +// builder.disable(TemplateType.CONTROLLER) +// .disable(TemplateType.SERVICE) +// .disable(TemplateType.SERVICEIMPL); +// }) .templateEngine(new FreemarkerTemplateEngine()) .execute();