Merge branch 'dev-plm' into test

.gitignore

@@ -5,4 +5,4 @@
 
 *.idea/
 out/
-!/src/main/java/kd/cosmic/
+src/main/java/kd/cosmic/

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

@@ -1,6 +1,7 @@
 package com.yem.em.task;
 
 import com.yem.em.utils.AtlasUtils;
+import com.yem.wm.utils.YEM;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -13,7 +14,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange;
+import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.*;
 import static com.yem.em.utils.AtlasUtils.seelctDyn;
 
 /**
@@ -37,68 +38,122 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
 
         for (DynamicObject plmObj : plms) {
             DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail");
-            DynamicObjectCollection enabled = new DynamicObjectCollection();
+            DynamicObjectCollection situation_replace = new DynamicObjectCollection();
-            Set<Long> successMap = new HashSet<>();
+            DynamicObjectCollection situation_add = new DynamicObjectCollection();
+            DynamicObjectCollection situation_delete = new DynamicObjectCollection();
+
             for (DynamicObject plm : collection) {
-                String enablesta = plm.getString("yem_enablesta");
+                String enablesta = plm.getString("yem_enablesta");//替换件停用启用状态
+                String enablestatus_before = plm.getString("yem_enablestatus_before");//停用启用状态
                 String invokstatus = plm.getString("yem_invokstatus");
                 String exchangetype = plm.getString("yem_exchangetype");
-                String parentno;
-                if ("D".equals(exchangetype)) {//新增
-                    parentno = plm.getString("yem_parent_now");
-                } else {
-                    parentno = plm.getString("yem_textfield");
-                }
-                DynamicObject assatlasdet = seelctDyn("yem_em_assatlasdet", "number", parentno);//父项编码
-                plm.set("yem_isassy", false);
-                plm.set("yem_isresource", false);
-                if (assatlasdet != null) {
-                    plm.set("yem_isassy", true);
-                }
-                logger.info("是否总成：{}，{}", parentno, assatlasdet != null);
-                DynamicObject basemodelib = seelctDyn("yem_bd_basemodelib", "number", parentno);
-                if (basemodelib != null) {
-                    plm.set("yem_isresource", true);
-                }
-                logger.info("是否资源：{}，{}", parentno, basemodelib != null);
-                if ("A".equals(enablesta) && !"B".equals(invokstatus) ) {//"替换件启用停用状态 = 启用" && 执行状态 != 已完成
-                    enabled.add(plm);
-                }
-            }
-            DynamicObject bomChange = createBOMChange(plmObj, enabled);
-            DynamicObjectCollection entry = bomChange.getDynamicObjectCollection("yem_entryentity");
-            if (!entry.isEmpty()) {
-                DynamicObject replace = null;
-                String billno = plmObj.getString("billno");
-                String gybg_no = plmObj.getString("yem_gybg_no");
-                if (entry.size() == 1) {
-                    logger.info("生成替换关系：PLM单号：{}， PLM工艺变更单号：{}，父项编码：{}", billno, gybg_no, enabled.get(0).getString("yem_textfield"));
-                    replace = AtlasUtils.Addreplace(bomChange, entry.get(0), null, "yem_em_replace", "add", "PLM");
-                    successMap.add(entry.get(0).getLong("id"));
-                }
-                for (DynamicObject entryObject : entry) {
-                    int idx = entry.indexOf(entryObject);
-                    if (idx == 0) continue;
-                    logger.info("更新替换关系：PLM单号：{}， PLM工艺变更单号：{}，父项编码：{}", billno, gybg_no, entryObject.getString("yem_textfield"));
-                    replace = AtlasUtils.Addreplace(bomChange, entry.get(0), replace, "yem_em_replace", "update", "PLM");
-                    successMap.add(entryObject.getLong("id"));
-                }
-            }
 
-            for (Long s : successMap) {
+                //【替换关系】=【相互替换】【新替换旧】【互不替换】 && 【启用停用状态】=‘停用’ && 【替换件启用停用状态】=‘启用’ && 执行状态 != 已完成
-                for (DynamicObject d : collection) {
+                if ("A-B-C".contains(exchangetype) && "A".equals(enablesta) && "B".equals(enablestatus_before) && !"B".equals(invokstatus)) {
-                    long id = d.getLong("id");
+                    situation_replace.add(plm);
-                    if (s == id) {
+                }
-                        d.set("yem_invokstatus", "B");
+
-                        d.set("yem_invoktime", new Date());
+                // 【替换关系】=【新增】 && 【替换件启用停用状态】=‘启用’
-                    }
+                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);
-            SaveServiceHelper.save(new DynamicObject[]{plmObj});
+            generateReplaceRelation(plmObj, situation_add);
+            generateReplaceRelation(plmObj, situation_delete);
         }
     }
 
+    /**
+     * 生成替换关系，更新完成时间、状态
+     *
+     * @param plmObj
+     * @param enabled
+     */
+    private void generateReplaceRelation(DynamicObject plmObj, DynamicObjectCollection enabled) {
+        DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail");
+        // 更新是否资源、是否总成
+        for (DynamicObject plm : collection) {
+
+            String exchangetype = plm.getString("yem_exchangetype");
+            String parentno;
+            if ("D".equals(exchangetype)) {//新增
+                parentno = plm.getString("yem_parent_now");
+            } else {
+                parentno = plm.getString("yem_textfield");
+            }
+            DynamicObject assatlasdet = seelctDyn("yem_em_assatlasdet", "number", parentno);//父项编码
+            plm.set("yem_isassy", false);
+            plm.set("yem_isresource", false);
+            if (assatlasdet != null) {
+                plm.set("yem_isassy", true);
+            }
+            logger.info("是否总成：{}，{}", parentno, assatlasdet != null);
+            DynamicObject basemodelib = seelctDyn("yem_bd_basemodelib", "number", parentno);
+            if (basemodelib != null) {
+                plm.set("yem_isresource", true);
+            }
+            logger.info("是否资源：{}，{}", parentno, basemodelib != null);
+        }
+        // 替换关系生成成功之后更新完成时间、状态
+        Map<Long, DynamicObject> successMap = new HashMap<>();
+        DynamicObject bomChange = createBOMChange(plmObj, enabled);
+        DynamicObjectCollection entry = bomChange.getDynamicObjectCollection("yem_entryentity");
+        if (!entry.isEmpty()) {
+            DynamicObject replace = null;
+            String billno = plmObj.getString("billno");
+            String gybg_no = plmObj.getString("yem_gybg_no");
+            if (entry.size() == 1) {
+                logger.info("生成替换关系：PLM单号：{}， PLM工艺变更单号：{}，父项编码：{}", billno, gybg_no, enabled.get(0).getString("yem_textfield"));
+                logger.info("生成_当前替换关系：{}", entry.get(0).getString("yem_replace"));
+                replace = AtlasUtils.Addreplace(bomChange, entry.get(0), null, "yem_em_replace", "add", "PLM");
+                successMap.put(entry.get(0).getLong("id"), bomChange);
+            }
+            for (DynamicObject entryObject : entry) {
+                int idx = entry.indexOf(entryObject);
+                if (idx == 0) continue;
+                logger.info("更新替换关系：PLM单号：{}， PLM工艺变更单号：{}，父项编码：{}", billno, gybg_no, entryObject.getString("yem_textfield"));
+                logger.info("更新_替换关系：{}", entryObject.getString("yem_replace"));
+                replace = AtlasUtils.Addreplace(bomChange, entry.get(0), replace, "yem_em_replace", "update", "PLM");
+                successMap.put(entryObject.getLong("id"), bomChange);
+            }
+        }
+
+        for (Map.Entry<Long, DynamicObject> mapEntry : successMap.entrySet()) {
+            Long bomChangeEntryId = mapEntry.getKey();
+            DynamicObject bomChangeObj = mapEntry.getValue();
+            DynamicObjectCollection bomChangeEntry = bomChangeObj.getDynamicObjectCollection("yem_entryentity");
+            int idx = 0;
+            for (DynamicObject bom : bomChangeEntry) {
+                if (bomChangeEntryId == bom.getLong("id")) {
+                    idx = bomChangeEntry.indexOf(bom);
+                }
+            }
+            DynamicObject currentEntry = bomChangeEntry.get(idx);
+            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_invoktime", completetime);
+                }
+            }
+        }
+
+        SaveServiceHelper.save(new DynamicObject[]{plmObj});
+    }
+
+    /**
+     * 根据PLM创建BOM，用于生成替换关系
+     *
+     * @param head
+     * @param entries
+     * @return
+     */
     private DynamicObject createBOMChange(DynamicObject head, DynamicObjectCollection entries) {
         DynamicObject bomchange = BusinessDataServiceHelper.newDynamicObject("yem_em_bomchange");
         bomchange.set("id", head.getLong("id"));
@@ -114,29 +169,34 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
 
             String exchangetype = entry.getString("yem_exchangetype");
 
-            if (exchangetype.equals("D")) {
+            if (exchangetype.equals("D")) {//新增PLM变更后对应BOM变更前
-                addNew.set("yem_parentno", entry.getString("yem_parent_now"));//父件编码
+                addNew.set("yem_parentno", entry.getString("yem_parent_now"));//替换后-父件编码
-                addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//父项名称
+                addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//替换后-父项名称
-            } else {
+                addNew.set("yem_subno", entry.getString("yem_child_now"));//替换后-子件编码
-                addNew.set("yem_parentno", entry.getString("yem_textfield"));//父件编码
+                addNew.set("yem_subname", entry.getString("yem_name_newchild"));//替换后-子件名称
-                addNew.set("yem_parentname", entry.getString("yem_name_parent"));//父项名称
+                addNew.set("yem_subenname", "yem_englishname");//替换后-子件英文名称
+                addNew.set("yem_qty", entry.getBigDecimal("yem_qty_new"));//替换后-数量
+            } else {//否则变更前对应变更前
+                addNew.set("yem_parentno", entry.getString("yem_textfield"));//替换前-父件编码
+                addNew.set("yem_parentname", entry.getString("yem_name_parent"));//替换前-父项名称
+                addNew.set("yem_subno", entry.getString("yem_child_before"));//替换前-子件编码
+                addNew.set("yem_subname", entry.getString("yem_name_child"));//替换前-子件名称
+                addNew.set("yem_subenname", "");//替换前-子件英文名称
+                addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//替换前-数量
             }
 
-            addNew.set("yem_subno", entry.getString("yem_child_before"));//子件编码
-            addNew.set("yem_subname", entry.getString("yem_name_child"));//子件名称
-            addNew.set("yem_subenname", "");//子件英文名称
-            addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//数量
-            addNew.set("yem_enablesta", entry.getString("yem_enablesta"));//启用停用状态
-            addNew.set("yem_replace", exchangetype);//替换关系
             addNew.set("yem_enableparno", entry.getString("yem_parent_now"));//替换父件编码-父项编码
             addNew.set("yem_enableparname", entry.getString("yem_name_newparent"));//替换父件名称-父项名称
             addNew.set("yem_enablesubno", entry.getString("yem_child_now"));//替换子件编码-子项编码
             addNew.set("yem_enablesubname", entry.getString("yem_name_newchild"));//替换子件名称
             addNew.set("yem_enablesubenname", entry.getString("yem_englishname"));//替换件英文名称-子件英文名称
             addNew.set("yem_enablesubqty", entry.getBigDecimal("yem_qty_new"));//数量
+
+            addNew.set("yem_enablesta", entry.getString("yem_enablesta"));//启用停用状态
+            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", new Date());//执行时间
+            addNew.set("yem_completetime", entry.getDate("yem_completetime"));//执行时间
             addNew.set("yem_remark", "");//备注
             addNew.set("yem_isass", entry.getBoolean("yem_isassy"));//是否总成
             addNew.set("yem_isresource", entry.getBoolean("yem_isresource"));//是否资源

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

@@ -41,49 +41,36 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
         DynamicObject[] plms = queryPLMChange();
         DynamicObject[] boms = queryBOMChange();
 
-        for (DynamicObject plmObj : plms) {
+        for (DynamicObject bomObj : boms) {
-            DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
+            DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity");
-            String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
+            for (DynamicObject bom : bom_entry) {
-            for (DynamicObject plm : plm_entry) {
+                for (DynamicObject plmObj : plms) {
-                String plm_parent = plm.getString("yem_textfield");//总成编码
+                    DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
-                String plm_child = plm.getString("yem_child_before");//子项零件编码
+                    for (DynamicObject plm : plm_entry) {
-                BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量
+                        String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
-                for (DynamicObject bomObj : boms) {
+                        String plm_parent = plm.getString("yem_textfield");//总成编码
-                    DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity");
-                    for (DynamicObject bom : bom_entry) {
-                        String bom_billno = bom.getString("yem_changeno");//更改单号
-                        String bom_parent = bom.getString("yem_parentno");//父件编码
-                        String bom_child = bom.getString("yem_subno");//子项零件编码
-                        BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量
                         String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
-                        logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_child, bom_enablesta);
+                        Date bom_completetime = bom.getDate("yem_completetime");
-                        if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty) && "B".equals(bom_enablesta)) {
+                        Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
-                            logger.info("停用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
+                        if (plmMatchBom != null && !plmMatchBom) {
                             Date stoptime = plm.getDate("yem_stoptime");
                             if (YEM.isEmpty(stoptime)) {
-                                plm.set("yem_enablesta", bom_enablesta);
+                                plm.set("yem_enablestatus_before", bom_enablesta);
                                 Date downdate = bom.getDate("yem_downdate");
                                 plm.set("yem_stoptime", downdate);
+                                plm.set("yem_completetime", bom_completetime);
                             } else {
                                 logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
                         }
 
-                        String plm_after_parent_now = plm.getString("yem_parent_now");//父项编码
+                        if (plmMatchBom != null && plmMatchBom) {
-                        String plm_after_child_now = plm.getString("yem_child_now");//子项编码
-                        BigDecimal plm_after_qty = plm.getBigDecimal("yem_qty_new");
-
-                        String bom_before_parent_no = bom.getString("yem_parentno");//总成编码
-                        String bom_before_child_no = bom.getString("yem_subno");//数量
-                        BigDecimal bom_before_qty = bom.getBigDecimal("yem_qty");
-                        logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty, bom_enablesta);
-                        if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_before_parent_no) && eq(plm_after_child_now, bom_before_child_no) && eq(plm_after_qty, bom_before_qty) && "A".equals(bom_enablesta)) {
-                            logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty);
                             Date starttime = plm.getDate("yem_starttime");
                             if (YEM.isEmpty(starttime)) {
                                 Date enableddate = bom.getDate("yem_enableddate");
                                 plm.set("yem_enablesta", bom_enablesta);
                                 plm.set("yem_starttime", enableddate);
+                                plm.set("yem_completetime", bom_completetime);
                             } else {
                                 logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
@@ -92,11 +79,89 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
                 }
             }
         }
+//
+//        for (DynamicObject plmObj : plms) {
+//            DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
+//            String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
+//            for (DynamicObject plm : plm_entry) {
+//                String plm_parent = plm.getString("yem_textfield");//总成编码
+//                for (DynamicObject bomObj : boms) {
+//                    DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity");
+//                    for (DynamicObject bom : bom_entry) {
+//                        String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
+//                        Date bom_completetime = bom.getDate("yem_completetime");
+//                        Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
+//                        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_stoptime", downdate);
+//                                plm.set("yem_completetime", bom_completetime);
+//                            } else {
+//                                logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
+//                            }
+//                        }
+//
+//                        if (plmMatchBom != null && plmMatchBom) {
+//                            Date starttime = plm.getDate("yem_starttime");
+//                            if (YEM.isEmpty(starttime)) {
+//                                Date enableddate = bom.getDate("yem_enableddate");
+//                                plm.set("yem_enablesta", bom_enablesta);
+//                                plm.set("yem_starttime", enableddate);
+//                                plm.set("yem_completetime", bom_completetime);
+//                            } else {
+//                                logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
 
         SaveServiceHelper.save(plms);
     }
 
-    private boolean eq(Object str1, Object str2) {
+    /**
+     * PLM匹配BOM，
+     * @param plmObj
+     * @param bom
+     * @param plm
+     * @return 匹配到停用返回false，启用返回true，未匹配到返回null
+     */
+    public static Boolean isPlmMatchBom(DynamicObject plmObj, DynamicObject bom, DynamicObject plm) {
+        String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
+        String bom_billno = bom.getString("yem_changeno");//更改单号
+        String bom_parent = bom.getString("yem_parentno");//父件编码
+        String bom_child = bom.getString("yem_subno");//子项零件编码
+        BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量
+        String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
+        String plm_parent = plm.getString("yem_textfield");//总成编码
+        String plm_child = plm.getString("yem_child_before");//子项零件编码
+        BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量
+        String plm_after_parent_now = plm.getString("yem_parent_now");//父项编码
+        String plm_after_child_now = plm.getString("yem_child_now");//子项编码
+        BigDecimal plm_after_qty = plm.getBigDecimal("yem_qty_new");
+
+        String bom_before_parent_no = bom.getString("yem_parentno");//总成编码
+        String bom_before_child_no = bom.getString("yem_subno");//数量
+        BigDecimal bom_before_qty = bom.getBigDecimal("yem_qty");
+        logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_child, bom_enablesta);
+        if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty) && "B".equals(bom_enablesta)) {
+            logger.info("停用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
+            return false;
+        }
+
+        logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty, bom_enablesta);
+        if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_before_parent_no) && eq(plm_after_child_now, bom_before_child_no) && eq(plm_after_qty, bom_before_qty) && "A".equals(bom_enablesta)) {
+            logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty);
+            return true;
+        }
+
+        return null;
+    }
+
+    public static boolean eq(Object str1, Object str2) {
         if (str1 instanceof String && str2 instanceof String) {
             return str1.equals(str2);
         }