diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index d6df90d0..dadf2e1b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -2,6 +2,7 @@ package com.nflg.product.bomnew.api.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.bomnew.pojo.query.ReverseReportQuery; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.ReverseReportVO; @@ -20,7 +21,7 @@ import java.util.List; @Api(tags = "BOM-报表接口") @RestController @RequestMapping("bom/new/report") -public class BomReportApi { +public class BomReportApi extends BaseApi { @Resource ReverseReportService reverseReportService; @@ -30,4 +31,14 @@ public class BomReportApi { public ResultVO> reverseReport(@RequestBody ReverseReportQuery query) { return ResultVO.success(); } + + + + @PostMapping("forwardReport") + @ApiOperation("bom-正查") + public ResultVO> forwardReport(@RequestBody ReverseReportQuery query) { + return ResultVO.success(); + } + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java index a723b7d6..aa73ec6b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildFormalMapper.java @@ -2,26 +2,16 @@ package com.nflg.product.bomnew.mapper.master; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildFormalEntity; import com.nflg.product.bomnew.pojo.vo.ChildMaxExceptionStateVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * t_bom_new_ebom_child 表数据库访问层 - * - * - * @author makejava - * @since 2023-11-17 16:55:16 + * t_bom_new_ebom_child_formal 表数据库访问层 + */ -public interface BomNewEbomChildMapper extends BaseMapper { +public interface BomNewEbomChildFormalMapper extends BaseMapper { - List getChildByMaterialNo(@Param("materialNo") String materialNo); - - /** - * 全量更新-EBOM物料use - */ - void updateEBomMaterialUse(); - - List getChildMaxExceptionState(@Param("bomRowIds") List bomRowIds); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java index ae6a654d..9f33c4e9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentFormalMapper.java @@ -3,11 +3,10 @@ package com.nflg.product.bomnew.mapper.master; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; -import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomUpgradeChangeVO; -import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; import com.nflg.product.bomnew.pojo.vo.MaterialHistoryProjectTypeVO; import org.apache.ibatis.annotations.Param; @@ -15,52 +14,11 @@ import java.util.List; import java.util.Set; /** - * t_bom_new_ebom_parent 表数据库访问层 + * t_bom_new_ebom_parent_formal 表数据库访问层 * - * - * @author makejava - * @since 2023-11-17 16:55:11 + */ -public interface BomNewEbomParentMapper extends BaseMapper { - - /** - * 获取EBom列表 - * @param page - * @param query - * @return - */ - Page getEBomListPage(Page page, @Param("query") BomNewEbomParentQuery query ,@Param("job") Integer job, @Param("createdBy") String createdBy); +public interface BomNewEbomParentFormalMapper extends BaseMapper { - /** - * 正式工作表 - * @param page - * @param query - * @return - */ - Page formalWorksheet(Page page, @Param("query") BomNewEbomParentQuery query); - - Page getUpgradeChangeList(Page page, @Param("query") BomNewEbomParentQuery query); - /** - * 获取子级 - * @param rowId - * @return - */ - List getParentChild(@Param("rowId") Long rowId); - - List getParentChildBatch(@Param("rowIds") List rowIds); - - MaterialHistoryProjectTypeVO getMaterialHistoryProjectType(@Param("materialNo")String materialNo); - - Set getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set list); - - List getParentForMaterialNoSeach(@Param("materialNoList") List materialNoList); - - List getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList,@Param("materialNo") String materialNo); - - void updateRootState(); - - void delBatch(@Param("rowIds") List rowIds); - - void updateStateBatchByRowIds(@Param("status") Integer status, @Param("list") List list ); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java index f8c0588e..b8fa1ba9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomChildFormalEntity.java @@ -1,31 +1,28 @@ package com.nflg.product.bomnew.pojo.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDate; /** - * t_bom_new_ebom_child + * t_bom_new_ebom_child_formal * - * @author makejava - * @since 2023-12-29 14:01:47 + */ @Data @Accessors(chain = true) -@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomChildEntity") -@TableName(value = "t_bom_new_ebom_child") -public class BomNewEbomChildEntity implements Serializable { +@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomChildFormalEntity") +@TableName(value = "t_bom_new_ebom_child_formal") +public class BomNewEbomChildFormalEntity implements Serializable { /** * 主键-雪花 @@ -214,6 +211,6 @@ public class BomNewEbomChildEntity implements Serializable { @ApiModelProperty("BOM-版本Row_id(parent表row_id 关联)") private Long bomRowId; - private static final long serialVersionUID = -14147430944632372L; + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java index 27d56f3e..f9410a3d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentFormalEntity.java @@ -1,31 +1,27 @@ package com.nflg.product.bomnew.pojo.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDate; /** - * t_bom_new_ebom_parent - * - * @author makejava - * @since 2023-12-29 14:00:31 + * t_bom_new_ebom_parent_formal + */ @Data @Accessors(chain = true) -@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomParentEntity") -@TableName(value = "t_bom_new_ebom_parent") -public class BomNewEbomParentEntity implements Serializable { +@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomParentFormalEntity") +@TableName(value = "t_bom_new_ebom_parent_formal") +public class BomNewEbomParentFormalEntity implements Serializable { /** * 主键行ID-雪花 diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java index 4e6741ee..25695a04 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomChildFormalService.java @@ -1,19 +1,15 @@ package com.nflg.product.bomnew.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.product.bomnew.mapper.master.BomNewEbomChildFormalMapper; import com.nflg.product.bomnew.mapper.master.BomNewEbomChildMapper; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildFormalEntity; import org.springframework.stereotype.Service; -/** - * t_bom_new_ebom_child 表服务实现类 - * - * - * @author makejava - * @since 2023-11-17 16:55:16 - */ + @Service -public class BomNewEbomChildService extends ServiceImpl { +public class BomNewEbomChildFormalService extends ServiceImpl { }