Merge branch 'dev-plm' into test

src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java

@@ -1,14 +1,19 @@
 package com.yem.em.task;
 
 import com.yem.em.utils.AtlasUtils;
+import com.yem.wm.utils.AttachmentUtil;
 import com.yem.wm.utils.YEM;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.exception.KDException;
+import kd.bos.fileservice.FileServiceFactory;
+import kd.bos.orm.query.QFilter;
 import kd.bos.schedule.executor.AbstractTask;
+import kd.bos.servicehelper.AttachmentServiceHelper;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,22 +50,27 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
             for (DynamicObject plm : collection) {
                 String enablesta = plm.getString("yem_enablesta");//替换件停用启用状态
                 String enablestatus_before = plm.getString("yem_enablestatus_before");//停用启用状态
-                String invokstatus = plm.getString("yem_invokstatus");
+                String isgenfnish = plm.getString("yem_isgenfnish");
                 String exchangetype = plm.getString("yem_exchangetype");
+                String invokstatus = plm.getString("yem_invokstatus");//执行状态
+                String invoktime = plm.getString("yem_invoktime");//执行时间
+                if ("B".equals(invokstatus) && YEM.isNotEmpty(invoktime) && YEM.isNotEmpty(exchangetype)) {
 
-                //【替换关系】=【相互替换】【新替换旧】【互不替换】 && 【启用停用状态】=‘停用’ && 【替换件启用停用状态】=‘启用’ && 执行状态 != 已完成
+                    //【替换关系】=【相互替换】【新替换旧】【互不替换】 && 【启用停用状态】=‘停用’ && 【替换件启用停用状态】=‘启用’ && 执行状态 != 已完成
-                if ("A-B-C".contains(exchangetype) && "A".equals(enablesta) && "B".equals(enablestatus_before) && !"B".equals(invokstatus)) {
+                    if ("A-B-C".contains(exchangetype) && "A".equals(enablesta) && "B".equals(enablestatus_before) && !"B".equals(isgenfnish)) {
-                    situation_replace.add(plm);
+                        situation_replace.add(plm);
+                    }
+
+                    // 【替换关系】=【新增】 && 【替换件启用停用状态】=‘启用’
+                    if ("D".equals(exchangetype) && "A".equals(enablesta) && !"B".equals(isgenfnish)) {
+                        situation_add.add(plm);
+                    }
+                    // 【替换关系】=【删除】 && 分录【启用停用状态】=‘停用’
+                    if ("E".equals(exchangetype) && "B".equals(enablestatus_before) && !"B".equals(isgenfnish)) {
+                        situation_delete.add(plm);
+                    }
                 }
 
-                // 【替换关系】=【新增】 && 【替换件启用停用状态】=‘启用’
-                if ("D".equals(exchangetype) && "A".equals(enablesta) && !"B".equals(invokstatus)) {
-                    situation_add.add(plm);
-                }
-                // 【替换关系】=【删除】 && 分录【启用停用状态】=‘停用’
-                if ("E".equals(exchangetype) && "B".equals(enablestatus_before) && !"B".equals(invokstatus)) {
-                    situation_delete.add(plm);
-                }
             }
             generateReplaceRelation(plmObj, situation_replace);
             generateReplaceRelation(plmObj, situation_add);
@@ -77,7 +87,7 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
     private void generateReplaceRelation(DynamicObject plmObj, DynamicObjectCollection enabled) {
         DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail");
         // 更新是否资源、是否总成
-        for (DynamicObject plm : collection) {
+        for (DynamicObject plm : enabled) {
 
             String exchangetype = plm.getString("yem_exchangetype");
             String parentno;
@@ -98,6 +108,10 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
                 plm.set("yem_isresource", true);
             }
             logger.info("是否资源：{}，{}", parentno, basemodelib != null);
+
+            if (!plm.getBoolean("yem_isassy") && !plm.getBoolean("yem_isresource")) {
+                enabled.remove(plm);
+            }
         }
         // 替换关系生成成功之后更新完成时间、状态
         Map<Long, DynamicObject> successMap = new HashMap<>();
@@ -122,29 +136,37 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
                 successMap.put(entryObject.getLong("id"), bomChange);
             }
         }
-
+        List<Long> list = new ArrayList<>();
         for (Map.Entry<Long, DynamicObject> mapEntry : successMap.entrySet()) {
             Long bomChangeEntryId = mapEntry.getKey();
-            DynamicObject bomChangeObj = mapEntry.getValue();
+//            DynamicObject bomChangeObj = mapEntry.getValue();
-            DynamicObjectCollection bomChangeEntry = bomChangeObj.getDynamicObjectCollection("yem_entryentity");
+//            DynamicObjectCollection bomChangeEntry = bomChangeObj.getDynamicObjectCollection("yem_entryentity");
-            int idx = 0;
+//            int idx = 0;
-            for (DynamicObject bom : bomChangeEntry) {
+//            for (DynamicObject bom : bomChangeEntry) {
-                if (bomChangeEntryId == bom.getLong("id")) {
+//                if (bomChangeEntryId == bom.getLong("id")) {
-                    idx = bomChangeEntry.indexOf(bom);
+//                    idx = bomChangeEntry.indexOf(bom);
-                }
+//                }
-            }
+//            }
-            DynamicObject currentEntry = bomChangeEntry.get(idx);
+//            DynamicObject currentEntry = bomChangeEntry.get(idx);
-            Date completetime = currentEntry.getDate("yem_completetime");//完成时间
+//            Date completetime = currentEntry.getDate("yem_completetime");//完成时间
             for (DynamicObject d : collection) {
                 long id = d.getLong("id");
                 if (bomChangeEntryId == id) {
-                    d.set("yem_invokstatus", "B");
+                    d.set("yem_isgenfnish", "B");
-                    d.set("yem_invoktime", completetime);
+                }
+            }
+
+            for (DynamicObject d : collection) {
+                long entryId = d.getLong("id");
+                String isgenfnish = d.getString("yem_isgenfnish");
+                if ("B".equals(isgenfnish)) {
+                    list.add(entryId);
                 }
             }
         }
 
         SaveServiceHelper.save(new DynamicObject[]{plmObj});
+        syncImage(plmObj, list);
     }
 
     /**
@@ -196,11 +218,141 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
             addNew.set("yem_replace", exchangetype);//替换关系
             addNew.set("yem_enableddate", entry.getDate("yem_starttime"));//启用时间
             addNew.set("yem_downdate", entry.getDate("yem_stoptime"));//停用时间
-            addNew.set("yem_completetime", entry.getDate("yem_completetime"));//执行时间
+            addNew.set("yem_completetime", entry.getDate("yem_invoktime"));//执行时间
             addNew.set("yem_remark", "");//备注
             addNew.set("yem_isass", entry.getBoolean("yem_isassy"));//是否总成
             addNew.set("yem_isresource", entry.getBoolean("yem_isresource"));//是否资源
         }
         return bomchange;
     }
+
+    /**
+     * 同步图片 总成图册明细
+     *
+     * @param plmObj
+     * @param list
+     */
+    private void syncImage(DynamicObject plmObj, List<Long> list) {
+        plmObj = BusinessDataServiceHelper.loadSingle(plmObj.getPkValue(), plmObj.getDynamicObjectType().getName());
+        DynamicObjectCollection detail = plmObj.getDynamicObjectCollection("yem_change_detail");
+        DynamicObjectCollection pictureentry = plmObj.getDynamicObjectCollection("yem_pictureentry");
+        for (Long entryId : list) {
+            for (DynamicObject d : detail) {
+                long id = d.getLong("id");
+                if (id == entryId) {
+                    String exchangetype = d.getString("yem_exchangetype");
+                    String imageName;
+                    if ("D".equals(exchangetype)) {
+                        imageName = d.getString("yem_parent_now");
+                    } else {
+                        imageName = d.getString("yem_textfield");
+                    }
+
+                    DynamicObject assAtlas = queryMatchAssemblyAtlasDetails(plmObj, d);
+                    if (assAtlas == null) continue;
+                    List<DynamicObject> imageInfo = getImageInfo(pictureentry, imageName);
+                    List<String> successMap = new ArrayList<>();
+                    for (DynamicObject image : imageInfo) {
+                        String suyntype = image.getString("yem_suyntype");
+                        if ("B".equals(suyntype)) continue;
+                        String picturename = image.getString("yem_picturename");
+                        int idx = picturename.lastIndexOf(".");
+                        String partno = picturename.substring(0, idx);
+                        String pictureid = image.getString("yem_pictureid");
+                        Date breakpointtime = getBreakPointTime(detail, partno);
+
+                        DynamicObject attachment = AttachmentServiceHelper.getAttCreatorByUID(pictureid);
+                        String url = attachment.getString("ffileid");
+                        String fattachmentsize = attachment.getString("fattachmentsize");
+                        if (YEM.isEmpty(fattachmentsize) || Long.parseLong(fattachmentsize) == 0) {
+                            logger.error("错误的文件！！");
+                            continue;
+                        }
+                        DynamicObject afterUpload = AttachmentUtil.uploadAttachmentPanel(assAtlas.getDataEntityType().getName(), assAtlas.getPkValue(), "yem_attachmentpanelap", picturename, url);
+                        if (afterUpload != null) {
+                            // 更新分录
+                            afterUpload.set("fattachmentsize", fattachmentsize);
+                            SaveServiceHelper.save(new DynamicObject[]{afterUpload});
+                            DynamicObjectCollection attach_detail = assAtlas.getDynamicObjectCollection("yem_attdetail");
+                            DynamicObject aNew = attach_detail.addNew();
+                            String fileaddress = FileServiceFactory.getAttachmentFileService().getFileServiceExt().getRealPath(afterUpload.getString("ffileid"));
+                            aNew.set("yem_attname", afterUpload.getString("fattachmentname"));
+                            aNew.set("yem_attid", afterUpload.getString("fnumber"));
+                            aNew.set("yem_attaddress", fileaddress);
+                            aNew.set("yem_breakpointime", breakpointtime);
+                            // 更新文件物理地址
+                            String imageurl = assAtlas.getString("yem_imageurl");
+                            imageurl = imageurl + fileaddress + ";";
+                            assAtlas.set("yem_imageurl", imageurl);
+                            successMap.add(picturename);
+                        } else {
+                            logger.info("上传文件失败!!");
+                        }
+                    }
+                    for (DynamicObject dynamicObject : pictureentry) {
+                        String picturename = dynamicObject.getString("yem_picturename");
+                        if (successMap.contains(picturename)) {
+                            dynamicObject.set("yem_suyntype", "B");
+                            dynamicObject.set("yem_syncdate", new Date());
+                        }
+                    }
+                    SaveServiceHelper.save(new DynamicObject[]{assAtlas});
+                }
+            }
+            SaveServiceHelper.save(new DynamicObject[]{plmObj});
+        }
+    }
+
+    /**
+     * 查询匹配的 总成图册明细
+     * PLM：变更后父项编码 - 总成图册明细.编码
+     * PLM：变更后子项编码 - 替换关系：ABC 替换编码，E（删除）：不匹配，D（新增）替换前编码
+     * @return
+     */
+    private DynamicObject queryMatchAssemblyAtlasDetails(DynamicObject plmObj, DynamicObject d) {
+        QFilter qFilter = new QFilter("status", "=", "C");
+        String exchangetype = d.getString("yem_exchangetype");
+        String parentno = d.getString("yem_parent_now");
+        String childno = d.getString("yem_child_now");
+        qFilter.and("number", "=", parentno);
+        if ("ABC".contains(exchangetype)) {
+            qFilter.and("yem_entryentity.yem_enablesubno", "=", childno);
+        }
+        if ("D".equals(exchangetype)) {
+            qFilter.and("yem_entryentity.yem_partnumber", "=", childno);
+        }
+        if ("E".equals(exchangetype)) {
+            return null;
+        }
+        return BusinessDataServiceHelper.loadSingle("yem_em_assatlasdet", qFilter.toArray());
+    }
+
+    private List<DynamicObject> getImageInfo(DynamicObjectCollection pictureentry, String imageName) {
+        List<DynamicObject> list = new ArrayList<>();
+        for (DynamicObject d : pictureentry) {
+            String picturename = d.getString("yem_picturename");
+            if (StringUtils.containsIgnoreCase(picturename, imageName)) {
+                list.add(d);
+            }
+        }
+        return list;
+    }
+
+
+    private Date getBreakPointTime(DynamicObjectCollection detail, String partno) {
+        for (DynamicObject d : detail) {
+            String exchangetype = d.getString("yem_exchangetype");
+            String detailPartNo;
+            if ("D".equals(exchangetype)) {
+                detailPartNo = d.getString("yem_parent_now");
+            } else {
+                detailPartNo = d.getString("yem_textfield");
+            }
+
+            if (partno.equals(detailPartNo)) {
+                return d.getDate("yem_invoktime");
+            }
+        }
+        return null;
+    }
 }

src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java

@@ -55,10 +55,11 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
                         if (plmMatchBom != null && !plmMatchBom) {
                             Date stoptime = plm.getDate("yem_stoptime");
                             if (YEM.isEmpty(stoptime)) {
-                                plm.set("yem_enablestatus_before", bom_enablesta);
                                 Date downdate = bom.getDate("yem_downdate");
+                                plm.set("yem_enablestatus_before", bom_enablesta);
                                 plm.set("yem_stoptime", downdate);
-                                plm.set("yem_completetime", bom_completetime);
+                                plm.set("yem_invoktime", bom_completetime);
+                                plm.set("yem_invokstatus", "B");
                             } else {
                                 logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
@@ -70,7 +71,8 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
                                 Date enableddate = bom.getDate("yem_enableddate");
                                 plm.set("yem_enablesta", bom_enablesta);
                                 plm.set("yem_starttime", enableddate);
-                                plm.set("yem_completetime", bom_completetime);
+                                plm.set("yem_invoktime", bom_completetime);
+                                plm.set("yem_invokstatus", "B");
                             } else {
                                 logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }