1127

src/main/java/com/spring/modules/part/vo/BomDetailVo.java

@@ -1,8 +1,12 @@
 package com.spring.modules.part.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.BomHeaderEntity;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class BomDetailVo extends BomDetailEntity {
@@ -15,4 +19,11 @@ public class BomDetailVo extends BomDetailEntity {
      * 上一个版本对象
      */
     private BomDetailEntity previousVersion;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date effPhaseInDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date effPhaseOutDate;
 }

src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@@ -9,6 +9,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueData;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
 import com.spring.modules.part.vo.BomComponentVo;
+import com.spring.modules.part.vo.BomDetailVo;
 import com.spring.modules.part.vo.PartInformationVo;
 import com.spring.modules.part.vo.RoutingComponentVo;
 import com.spring.modules.project.data.PlmProjectPartData;
@@ -285,7 +286,7 @@ public class TechnicalSpecificationController {
     @PostMapping(value="/searchBMBomDetail")
     @ResponseBody
     public R searchBMBomDetail(@RequestBody BomDetailEntity data){
-        List<BomDetailEntity> rows= technicalSpecificationService.searchBMBomDetail(data);
+        List<BomDetailVo> rows= technicalSpecificationService.searchBMBomDetail(data);
         return R.ok().put("rows", rows);
     }
     /**

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -9,6 +9,7 @@ import com.spring.modules.part.entity.BomHeaderEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
 import com.spring.modules.part.entity.RoutingHeaderEntity;
 import com.spring.modules.part.vo.BomComponentVo;
+import com.spring.modules.part.vo.BomDetailVo;
 import com.spring.modules.part.vo.PartInformationVo;
 import com.spring.modules.part.vo.RoutingComponentVo;
 import com.spring.modules.project.data.PlmProjectInfoData;
@@ -280,7 +281,7 @@ public interface TechnicalSpecificationMapper {
      * @return List<BomDetailEntity>
      * @throw
      */
-    List<BomDetailEntity> searchBMBomDetail(BomDetailEntity data);
+    List<BomDetailVo> searchBMBomDetail(BomDetailEntity data);
     /**
      * @Description TODO
      * @Title saveBMRoutingDetail

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -19,6 +19,7 @@ import com.spring.modules.part.mapper.BomManagementMapper;
 import com.spring.modules.part.mapper.MasterPartInformationMapper;
 import com.spring.modules.part.mapper.PartInformationMapper;
 import com.spring.modules.part.vo.BomComponentVo;
+import com.spring.modules.part.vo.BomDetailVo;
 import com.spring.modules.part.vo.PartInformationVo;
 import com.spring.modules.part.vo.RoutingComponentVo;
 import com.spring.modules.project.data.*;
@@ -293,7 +294,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         return technicalSpecificationMapper.searchBMRoutingDetail(data);
     }
     @Override
-    public List<BomDetailEntity> searchBMBomDetail(BomDetailEntity data){
+    public List<BomDetailVo> searchBMBomDetail(BomDetailEntity data){
         return technicalSpecificationMapper.searchBMBomDetail(data);
     }
 

src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@@ -7,6 +7,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData;
 import com.spring.modules.part.entity.BomDetailEntity;
 import com.spring.modules.part.entity.RoutingDetailEntity;
 import com.spring.modules.part.vo.BomComponentVo;
+import com.spring.modules.part.vo.BomDetailVo;
 import com.spring.modules.part.vo.PartInformationVo;
 import com.spring.modules.part.vo.RoutingComponentVo;
 import com.spring.modules.project.data.PlmProjectInfoData;
@@ -216,7 +217,7 @@ public interface TechnicalSpecificationService {
      * @return List<BomDetailEntity>
      * @throw
      */
-    List<BomDetailEntity> searchBMBomDetail(BomDetailEntity data);
+    List<BomDetailVo> searchBMBomDetail(BomDetailEntity data);
 
     /**
      * @Description 删除bom

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -793,11 +793,11 @@ a.routing_alternative_no alternativeNo,b.final_part_no  partNo
 </select>
 
 
-<select id="searchBMBomDetail" resultType="com.spring.modules.part.entity.BomDetailEntity">
+<select id="searchBMBomDetail" resultType="com.spring.modules.part.vo.BomDetailVo">
     select a.site,a.part_no,a.alternative_no,a.alternative_description,a.bom_type,a.eng_chg_level,a.min_lot_qty,a.default_flag,
-    a.note_text,a.create_date,a.create_by,a.update_date,a.update_by,a.status,a.official_flag
-    from plm_bom_detail a
-    where part_no=#{partNo} and site=#{site}
+    a.note_text,a.create_date,a.create_by,a.update_date,a.update_by,a.status,a.official_flag,B.eff_phase_in_date,B.eff_phase_out_date
+    from plm_bom_detail a left join plm_bom_header b on a.site=b.site and a.part_no=b.part_NO AND A.eng_chg_level=B.eng_chg_level
+    where a.part_no=#{partNo} and a.site=#{site} and a.bom_type!='Repair'
 </select>
 <update id="updateBMBomRev">
     update plm_technical_specification_sheet set bom_type=#{bomType},eng_chg_level=#{engChgLevel,jdbcType=INTEGER},