2024.11.12 文档收集更新

src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java

@@ -32,14 +32,14 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
     private String materialNumber;
     private String remark;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
 
     private String createBy;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateDate;
 
     private String updateBy;
@@ -99,6 +99,9 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
     @TableField(exist = false)
     private Date massProductionStartDate;
 
+    @TableField(exist = false)
+    private String status2;
+
     @Override
     public String getcQualityEngineer1() {
         return cQualityEngineer1;

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

@@ -254,7 +254,7 @@ public class EamProjectServiceImpl implements EamProjectService {
     }
 
     @Override
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void eamProjectPartInfoEdit(EamProjectPartInfoData inData) throws MessagingException, UnsupportedEncodingException {
         List<EamProjectPartInfoData> checkProjectPartNo = EamProjectMapper.checkProjectPartNo(inData);
         if (!checkProjectPartNo.isEmpty()) {
@@ -262,27 +262,11 @@ public class EamProjectServiceImpl implements EamProjectService {
         } else {
             EamProjectMapper.eamProjectPartInfoEdit(inData);
         }
-    }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void eamProjectPartInfoSave(EamProjectPartInfoData inData){
-        inData.setBuNo(inData.getBu().split("_")[1]);
-        List<EamProjectPartInfoData> checkProjectPartNo = EamProjectMapper.checkProjectPartNo(inData);
-        Integer projectPartId = null;
-        if (!checkProjectPartNo.isEmpty()) {
-            throw new RuntimeException("当前项目下已存在相同的项目料号!");
-        } else {
-            try {
-                EamProjectMapper.saveNewProjectPart(inData);
-                projectPartId = inData.getProjectPartId();
-            } catch (Exception e) {
-                throw new RuntimeException("保存项目物料失败!" + e.getMessage());
-            }
-        }
+        if(inData.getStatus2() == "进行中") {
             try {
                 EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData();
-            eamProjectPartInfoData.setProjectPartId(projectPartId);
+                eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId());
                 eamProjectPartInfoData.setLimit(-1);
                 eamProjectPartInfoData.setPage(1);
                 PageUtils pageUtils = this.eamProjectPartSearch(eamProjectPartInfoData);
@@ -306,7 +290,25 @@ public class EamProjectServiceImpl implements EamProjectService {
             } catch (Exception e) {
                 throw new RuntimeException("保存转量产文档失败!" + e.getMessage());
             }
+        }
+    }
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public void eamProjectPartInfoSave(EamProjectPartInfoData inData){
+        inData.setBuNo(inData.getBu().split("_")[1]);
+        List<EamProjectPartInfoData> checkProjectPartNo = EamProjectMapper.checkProjectPartNo(inData);
+        Integer projectPartId = null;
+        if (!checkProjectPartNo.isEmpty()) {
+            throw new RuntimeException("当前项目下已存在相同的项目料号!");
+        } else {
+            try {
+                EamProjectMapper.saveNewProjectPart(inData);
+                projectPartId = inData.getProjectPartId();
+            } catch (Exception e) {
+                throw new RuntimeException("保存项目物料失败!" + e.getMessage());
+            }
+        }
     }
 
     @Override
@@ -504,6 +506,8 @@ public class EamProjectServiceImpl implements EamProjectService {
                 }
             } else if (Objects.equals(inData.getStatus(), "已量产")) {
                 emailAddress = EamProjectMapper.getSendMassProductionMailAddress(inData);
+                // 排除inData.uploaedFlag为Y的数据
+                emailAddress.removeIf(e -> Objects.equals(e.getUploadedFlag(), "Y"));
                 if (!emailAddress.isEmpty()) {
                     type = "项目物料转量产";
                     s.append("<li>你有一个新的项目物料转量产，需要上传转量产文件 - 项目编码：" + emailAddress.get(0).getProjectNo() + "  名称:" +