2024-11-06

src/main/java/com/spring/modules/part/controller/PartInformationController.java

@@ -717,4 +717,16 @@ public class PartInformationController {
     public void downLoadFile(@RequestParam("id") Integer id, HttpServletResponse response) throws UnsupportedEncodingException {
         partInformationService.downLoadObjectFile(id,response);
     }
+
+    /**
+     * 获取下一个物料revision
+     * @param inData
+     * @return
+     */
+    @PostMapping("/getPartRevisionEngChgLevel")
+    @ResponseBody
+    public R getPartRevisionEngChgLevel(@RequestBody PartRevisionVo inData){
+        Map<String, Object> map = partInformationService.getPartRevisionEngChgLevel(inData);
+        return R.ok().put("rows", map);
+    }
 }

src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java

@@ -271,4 +271,6 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
     String getNextPartNo2(PartInformationVo data);
 
     void delProjectPartByPartNo(@Param("site") String site, @Param("partNo") String partNo);
+
+    List<PartRevisionVo> getMaxPartRevision(@Param("site") String site, @Param("partNo") String partNo);
 }

src/main/java/com/spring/modules/part/service/PartInformationService.java

@@ -141,4 +141,6 @@ public interface PartInformationService {
     void downLoadObjectFile(Integer id, HttpServletResponse response) throws UnsupportedEncodingException;
 
     List<ChangeRequestVo> getChangeRecordByPartNo2(PlmProjectPartData data);
+
+    Map<String, Object> getPartRevisionEngChgLevel(PartRevisionVo inData);
 }

src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java

@@ -340,6 +340,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partRevision.setProductStatus("Not In Effect");
         partRevision.setRepairStatus("Not In Effect");
         partRevision.setCreateBy(data.getCreateBy());
+        partRevision.setEngRevision("1");
         partInformationMapper.saveRevision(partRevision);
         // 创建该物料的bom默认版本
         if (!"Purchased (raw)".equals(data.getPartType())) { // 该类型不创建BOM
@@ -437,6 +438,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partRevision.setProductStatus("Not In Effect");
         partRevision.setRepairStatus("Not In Effect");
         partRevision.setCreateBy(data.getCreateBy());
+        partRevision.setEngRevision("1");
         partInformationMapper.saveRevision(partRevision);
         // 创建该物料的bom默认版本
         if (!"Purchased (raw)".equals(data.getPartType())) {
@@ -2555,6 +2557,27 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         }
     }
 
+    /**
+     * 获取下一个物料revision
+     * @param inData
+     * @return
+     */
+    @Override
+    public Map<String, Object> getPartRevisionEngChgLevel(PartRevisionVo inData) {
+        HashMap<String, Object> map = new HashMap<>();
+        // 获取最大的partRevision
+        List<PartRevisionVo> revisionList = partInformationMapper.getMaxPartRevision(inData.getSite(), inData.getPartNo());
+
+        if (revisionList.isEmpty()) {
+            map.put("engChgLevel", 1);
+            map.put("engRevision", 1);
+        } else {
+            map.put("engChgLevel", revisionList.get(0).getEngChgLevel() + 1);
+            map.put("engRevision", revisionList.get(0).getEngChgLevel() + 1);
+        }
+        return map;
+    }
+
 }
 
 

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -1924,4 +1924,20 @@
         delete from plm_project_part
         where site = #{site} and test_part_no = #{partNo}
     </delete>
+
+    <select id="getMaxPartRevision" resultType="com.spring.modules.part.vo.PartRevisionVo">
+        SELECT
+            site,
+            part_no,
+            eng_chg_level,
+            eff_phase_in_date,
+            eff_phase_out_date,
+            revision_text,
+            product_status,
+            repair_status,
+            eng_revision
+        FROM part_revision
+        WHERE part_no = #{partNo} and site = #{site}
+        order by eng_chg_level desc
+    </select>
 </mapper>

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -437,9 +437,9 @@
             routing_type,
             alternative_no,
             status,
-            offical_flag
+            official_flag
         FROM plm_routing_detail
-        WHERE site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and offical_flag = 'Y'
+        WHERE site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and official_flag = 'Y'
     </select>
 
     <!-- 判断 routing 是否存在子料 -->