1127

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

@@ -596,4 +596,20 @@ public class TechnicalSpecificationController {
         technicalSpecificationService.updateBMModal(data);
         return R.ok();
     }
+
+    /**
+     * @Description 查下BM页面是哪个模板的
+     * @Title searchBMPropertiesHeaderForBM
+      * @param data
+     * @author rq
+     * @date 2023/12/20 10:38
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchBMPropertiesHeaderForBM")
+    @ResponseBody
+    public R searchBMPropertiesHeaderForBM(@RequestBody SearchBMData data){
+        PlmBmModelHeaderData row= technicalSpecificationService.searchBMPropertiesHeaderForBM(data);
+        return R.ok().put("row", row);
+    }
 }

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

@@ -619,4 +619,17 @@ public interface TechnicalSpecificationMapper {
      * @throw
      */
     void updateBMModal(PlmBmModelHeaderData data);
+
+    List<PlmBmModelHeaderData> checkBMModelHeader(SearchBMData data);
+
+    /**
+     * @Description 查下BM页面是哪个模板的
+     * @Title searchBMPropertiesHeaderForBM
+      * @param data
+     * @author rq
+     * @date 2023/12/20 10:40
+     * @return PlmBmModelHeaderData
+     * @throw
+     */
+    PlmBmModelHeaderData searchBMPropertiesHeaderForBM(SearchBMData data);
 }

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

@@ -8,6 +8,7 @@ import com.spring.modules.base.data.PlmBmModelHeaderData;
 import com.spring.modules.base.data.PlmBmPropertiesValueData;
 import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData;
 import com.spring.modules.base.data.PlmPropertiesItemAvailableData;
+import com.spring.modules.base.entity.PlmBmModelHeader;
 import com.spring.modules.base.entity.PlmBmPageBaseData;
 import com.spring.modules.base.entity.PlmBmPropertiesValueHeader;
 import com.spring.modules.base.entity.PlmPropertiesItemAvailable;
@@ -292,9 +293,14 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     public List<PlmBmPropertiesValueData> searchBMPropertiesValue(SearchBMData data){
         List<PlmBmPropertiesValueHeaderData> check=technicalSpecificationMapper.checkPlmBmPropertiesValueHeaderData(data);
         if(check.size()==0){
+            List<PlmBmModelHeaderData> checkHeader=technicalSpecificationMapper.checkBMModelHeader(data);
+            if(checkHeader.size()>0){
+                if(checkHeader.get(0).getPropertiesCodeDesc()!=null&&!"".equals(checkHeader.get(0).getPropertiesCodeDesc())){
                     technicalSpecificationMapper.savePlmBmPropertiesValueHeaderData(data);
                     technicalSpecificationMapper.savePlmBmPropertiesValueData(data);
                 }
+            }
+        }
         List<PlmBmPropertiesValueData> result= technicalSpecificationMapper.searchBMPropertiesValue(data);
         for (int i = 0; i <result.size() ; i++) {
             if("Y".equals(result.get(i).getValueChooseFlag())){
@@ -530,4 +536,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     public void updateBMModal(PlmBmModelHeaderData data){
         technicalSpecificationMapper.updateBMModal( data);
     }
+
+    @Override
+    public PlmBmModelHeaderData searchBMPropertiesHeaderForBM(SearchBMData data){
+        return  technicalSpecificationMapper.searchBMPropertiesHeaderForBM(data);
+    }
 }

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

@@ -516,4 +516,15 @@ public interface TechnicalSpecificationService {
      * @throw
      */
     void updateBMModal(PlmBmModelHeaderData data);
+
+    /**
+     * @Description 查下BM页面是哪个模板的
+     * @Title searchBMPropertiesHeaderForBM
+      * @param data
+     * @author rq
+     * @date 2023/12/20 10:39
+     * @return PlmBmModelHeaderData
+     * @throw
+     */
+    PlmBmModelHeaderData searchBMPropertiesHeaderForBM(SearchBMData data);
 }

src/main/resources/mapper/base/PropertiesMapper.xml

@@ -383,7 +383,7 @@
      FROM plm_bm_model_header a
      left join plm_properties_model_detail pd on a.site=pd.site and pd.function_type='BM' and a.properties_code_no=pd.code_no
      left join plm_properties_item b on pd.function_type = b.itemType and pd.properties_item_no = b.itemNo and pd.site = b.site
-     where a.function_type = #{functionType} and a.code_no = #{codeNo} and a.site = #{site} and a.bu_No = #{buNo}
+     where a.function_type = #{functionType} and a.code_no = #{codeNo} and a.site = #{site} and a.bu_No = #{buNo} and pd.properties_item_no is not null
      order by order_id
 </select>
 

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

@@ -245,7 +245,7 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction,
     insert into plm_bm_propertiesValue(Site,bu_no,PartNo,CodeNo,SubCodeSeqNo,SubCodeDesc,ItemNo,PropertiesItemNo,TextValue,NumValue,RecordType,order_id)
     select #{site},#{buNo},#{codeNo},#{type},1,b.code_desc,a.seq_no,a.properties_item_no,null,null,'BM',a.order_id
     from plm_bm_model_header b left join plm_properties_model_detail a on a.site=${site}  and a.function_type='BM' and a.code_no=b.properties_code_no
-    where  b.site=${site} and b.bu_no=#{buNo}  and b.function_type='BM' and b.code_no=#{type}
+    where  b.site=${site} and b.bu_no=#{buNo}  and b.function_type='BM' and b.code_no=#{type} and a.code_no is not null
 </insert>
 
 <select id="searchBMPropertiesValue" resultType="PlmBmPropertiesValueData">
@@ -438,4 +438,14 @@ update_by)
      and bu_no=#{buNo} and code_no=#{codeNo}
 </update>
 
+<select id="checkBMModelHeader" resultType="PlmBmModelHeaderData">
+    select  properties_code_no from plm_bm_model_header where site=#{site}
+     and bu_no=#{buNo} and code_no=#{codeNo}
+</select>
+
+<select id="searchBMPropertiesHeaderForBM" resultType="PlmBmModelHeaderData">
+    select properties_code_no from plm_bm_model_header where site=#{site}
+     and bu_no=#{buNo} and code_no=#{type}
+</select>
+
 </mapper>