EBOM-物料和图号搜索

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java

@@ -61,7 +61,7 @@ public class PBomApi extends BaseApi {
     @PostMapping("releaseListByPage")
     @ApiOperation("PBom已发布工作列表")
     public ResultVO<IPage<BomNewPbomParentVO>> releaseListByPage(@RequestBody BomNewPbomParentQuery query) {
-        return ResultVO.success();
+        return ResultVO.success(bomNewPbomParentService.releaseListByPage(query));
     }
 
     @GetMapping("getChild")

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java

@@ -21,6 +21,12 @@ public interface BomNewPbomParentMapper extends BaseMapper<BomNewPbomParentEntit
 
     Page<BomNewPbomParentVO> workDetailsListByPage(Page<BomNewPbomParentQuery> page, @Param("query") BomNewPbomParentQuery query , @Param("userFac") String userFac);
 
+    /**
+    *  已发布列表
+    * @author 大米
+    * @date 2024/1/6 17:26
+    */
+    Page<BomNewPbomParentVO>  releaseListByPage(Page<BomNewPbomParentQuery> page, @Param("query") BomNewPbomParentQuery query);
     List<BomNewPbomParentVO> getParentChild(@Param("parentRowId") Long parentRowId);
 
     void  bomRelease(@Param("releaseUserName")String releaseUserName, @Param("rowIds") List<Long> rowIds );

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java

@@ -92,6 +92,17 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         return result;
     }
 
+    /**
+     * 已
+     * @param query
+     * @return
+     */
+    public IPage<BomNewPbomParentVO> releaseListByPage(BomNewPbomParentQuery query) {
+        Page<BomNewPbomParentVO> result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query);
+        materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
+        return result;
+    }
+
     public List<BomNewPbomParentVO> getChild(Long rowId) {
 
         List<BomNewPbomParentVO> parentChild = this.getBaseMapper().getParentChild(rowId);

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml

@@ -74,7 +74,7 @@
     <!--获取工作列表-->
     <select id="workDetailsListByPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
         select * , row_id as bomRowId
-        from t_bom_new_pbom_parent where root_is=1
+        from t_bom_new_pbom_parent where root_is=1  and status &lt; 4
         <if test="userFac!=null and userFac!=''">
             and fac_code=#{userFac}
         </if>
@@ -82,6 +82,25 @@
         order by created_time desc
     </select>
 
+    <!--获取已发布列表-->
+    <select id="releaseListByPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
+        select * , row_id as bomRowId
+        from t_bom_new_pbom_parent where root_is=1  and status = 4
+        <if test="query.startDate== null">
+            and release_time  > DATE_SUB(release_time, INTERVAL 3 DAY)
+        </if>
+        <if test="query.facCode!= null and query.facCode!=''">
+            and fac_code = #{query.facCode}
+        </if>
+        <if test="query.materialNo!= null and query.materialNo!=''">
+            and material_no = #{query.materialNo}
+        </if>
+        <if test="query.drawingNo!= null and query.drawingNo!=''">
+            and drawing_no = #{query.drawingNo}
+        </if>
+        order by release_time desc
+    </select>
+
     <select id="getParentChild" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
         select * from t_bom_new_pbom_child where parent_row_id=#{parentRowId}
     </select>