Merge remote-tracking branch 'origin/master'

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

@@ -2654,9 +2654,16 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         TransNoControlData noData = partInformationMapper.getTranNoData(inData.getSite(), "project_part_no");
         int a = noData.getTransNo().length() + noData.getLength();
 
+        // 判断要复制的物料是不是PF开头的 不是则生成新的PF开头料号  版本是A01
+        if (!inData.getTestPartNo().substring(0, 2).equals(noData.getTransNo())) {
+            PartInformationVo part = getNewProjectPart(inData);
+            return part;
+        }
+
         // 根据配置截取物料编码
         String partNo = inData.getTestPartNo().substring(0, a);
         PartInformationVo part =  partInformationMapper.getProjectPartRow(inData.getSite(), partNo);
+        part.setStatus("N");
 
         if (0 < (Integer.parseInt(part.getPartNo().substring(a + 1)) + 1) && (Integer.parseInt(part.getPartNo().substring(a + 1)) + 1) < 10) {
             part.setPartNo(part.getPartNo().substring(0, a + 1) + "0" +(Integer.parseInt(part.getPartNo().substring(a + 1)) + 1));
@@ -2666,6 +2673,18 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         return part;
     }
 
+    /**
+     *
+     * @return
+     */
+    public PartInformationVo getNewProjectPart(PlmProjectPartData inData) {
+        String partNo = getProjectPartNo(inData);
+        PartInformationVo part =  partInformationMapper.getProjectPartRow(inData.getSite(), inData.getTestPartNo());
+        part.setPartNo(partNo);
+        part.setStatus("N");
+        return part;
+    }
+
     /**
      * 获取当前行项目物料对象
      * @param inData