init2

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<Page<ReverseReportVO>> reverseReport(@RequestBody ReverseReportQuery query) {
         return ResultVO.success();
     }
+
+
+
+    @PostMapping("forwardReport")
+    @ApiOperation("bom-正查")
+    public ResultVO<List<ReverseReportVO>> forwardReport(@RequestBody ReverseReportQuery query) {
+        return ResultVO.success();
+    }
+
+
 }

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 表数据库访问层
+ * t_bom_new_ebom_child_formal 表数据库访问层
- * 
+
- *
- * @author makejava
- * @since 2023-11-17 16:55:16
  */
-public interface BomNewEbomChildMapper extends BaseMapper<BomNewEbomChildEntity> {
+public interface BomNewEbomChildFormalMapper extends BaseMapper<BomNewEbomChildFormalEntity> {
 
-    List<BomNewEbomChildEntity> getChildByMaterialNo(@Param("materialNo") String materialNo);
-
-    /**
-     * 全量更新-EBOM物料use
-     */
-    void updateEBomMaterialUse();
-
-    List<ChildMaxExceptionStateVO> getChildMaxExceptionState(@Param("bomRowIds") List<Long> bomRowIds);
 }

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<BomNewEbomParentEntity> {
+public interface BomNewEbomParentFormalMapper extends BaseMapper<BomNewEbomParentFormalEntity > {
-
-    /**
-     * 获取EBom列表
-     * @param page
-     * @param query
-     * @return
-     */
-    Page<BomNewEbomParentVO> getEBomListPage(Page<BomNewEbomParentVO> page, @Param("query") BomNewEbomParentQuery query ,@Param("job") Integer job, @Param("createdBy") String createdBy);
 
 
-    /**
-     * 正式工作表
-     * @param page
-     * @param query
-     * @return
-     */
-    Page<BomNewEbomParentVO> formalWorksheet(Page<BomNewEbomParentVO> page, @Param("query") BomNewEbomParentQuery query);
-
-    Page<BomNewEbomUpgradeChangeVO> getUpgradeChangeList(Page<BomNewEbomUpgradeChangeVO> page, @Param("query") BomNewEbomParentQuery query);
-    /**
-     * 获取子级
-     * @param rowId
-     * @return
-     */
-    List<BomNewEbomParentVO> getParentChild(@Param("rowId") Long rowId);
-
-    List<BomNewEbomParentVO> getParentChildBatch(@Param("rowIds") List<Long> rowIds);
-
-    MaterialHistoryProjectTypeVO getMaterialHistoryProjectType(@Param("materialNo")String materialNo);
-
-    Set<String> getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set<String> list);
-
-    List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList);
-
-    List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("materialNo") String materialNo);
-
-    void  updateRootState();
-
-    void delBatch(@Param("rowIds") List<Long> rowIds);
-
-    void  updateStateBatchByRowIds(@Param("status") Integer status, @Param("list") List<Long> list );
 }

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 com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
-
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+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")
+@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomChildFormalEntity")
-@TableName(value = "t_bom_new_ebom_child")
+@TableName(value = "t_bom_new_ebom_child_formal")
-public class BomNewEbomChildEntity implements Serializable {
+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;
+
 
 }

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 com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
-
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+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
+ * t_bom_new_ebom_parent_formal
- *
+
- * @author makejava
- * @since 2023-12-29 14:00:31
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomParentEntity")
+@ApiModel(value = "com-nflg-product-bomnew-pojo-new-entity-BomNewEbomParentFormalEntity")
-@TableName(value = "t_bom_new_ebom_parent")
+@TableName(value = "t_bom_new_ebom_parent_formal")
-public class BomNewEbomParentEntity implements Serializable {
+public class BomNewEbomParentFormalEntity implements Serializable {
 
     /**
      * 主键行ID-雪花

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<BomNewEbomChildMapper, BomNewEbomChildEntity> {
+public class BomNewEbomChildFormalService extends ServiceImpl<BomNewEbomChildFormalMapper, BomNewEbomChildFormalEntity> {
 
 }