Merge branch 'dev-plm' into test

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

@@ -7,11 +7,14 @@ import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.exception.KDException;
 import kd.bos.schedule.executor.AbstractTask;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Date;
+import java.util.*;
-import java.util.Map;
 
 import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange;
+import static com.yem.em.utils.AtlasUtils.seelctDyn;
 
 /**
  * @Description: 1、如《PLM变更单》分录【替换关系】=【相互替换】【新替换旧】【互不替换】,分录【启用停用状态】=‘停用’，并且【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id
@@ -25,16 +28,40 @@ import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange;
 
 public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
 
+    private final static Logger logger = LoggerFactory.getLogger(GenerateReplaceRelationshipTaskEdit.class);
+
     @Override
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
+
         DynamicObject[] plms = queryPLMChange();
 
         for (DynamicObject plmObj : plms) {
             DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail");
             DynamicObjectCollection enabled = new DynamicObjectCollection();
+            Set<Long> successMap = new HashSet<>();
             for (DynamicObject plm : collection) {
                 String enablesta = plm.getString("yem_enablesta");
-                if ("A".equals(enablesta)) {//"替换件启用停用状态 = 启用"
+                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);
                 }
             }
@@ -42,38 +69,65 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
             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) {
+                    long id = d.getLong("id");
+                    if (s == id) {
+                        d.set("yem_invokstatus", "B");
+                        d.set("yem_invoktime", new Date());
+                    }
+                }
+            }
+
+            SaveServiceHelper.save(new DynamicObject[]{plmObj});
         }
     }
 
     private DynamicObject createBOMChange(DynamicObject head, DynamicObjectCollection entries) {
         DynamicObject bomchange = BusinessDataServiceHelper.newDynamicObject("yem_em_bomchange");
         bomchange.set("id", head.getLong("id"));
-        bomchange.set("createorg", head.getString("org"));//创建组织-组织
+        bomchange.set("createorg", head.getDynamicObject("org"));//创建组织-组织
         bomchange.set("yem_producttype", head.getString("yem_producttype"));//产品分类
         bomchange.set("number", head.getString("billno"));//单据编号
         bomchange.set("yem_date", head.getDate("createtime"));//业务日期-创建时间
-        bomchange.set("creator", head.getLong("creator.id"));//创建人
+        bomchange.set("creator", head.getDynamicObject("creator"));//创建人
-        DynamicObjectCollection detail = bomchange.getDynamicObjectCollection("yem_change_detail");
+        DynamicObjectCollection detail = bomchange.getDynamicObjectCollection("yem_entryentity");
         for (DynamicObject entry : entries) {
             DynamicObject addNew = detail.addNew();
             addNew.set("id", entry.getLong("id"));
+
+            String exchangetype = entry.getString("yem_exchangetype");
+
+            if (exchangetype.equals("D")) {
+                addNew.set("yem_parentno", entry.getString("yem_parent_now"));//父件编码
+                addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//父项名称
+            } 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_enablesta", entry.getBigDecimal("yem_enablesta"));//启用停用状态
+            addNew.set("yem_enablesta", entry.getString("yem_enablesta"));//启用停用状态
-            addNew.set("yem_replace", entry.getString("yem_exchangetype"));//替换关系
+            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"));//替换子件编码-子项编码
@@ -82,6 +136,7 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
             addNew.set("yem_enablesubqty", entry.getBigDecimal("yem_qty_new"));//数量
             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_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

@@ -2,6 +2,7 @@ package com.yem.em.task;
 
 import com.yem.rf.utils.RFUtils;
 import com.yem.wm.utils.DynamicObjectUtil;
+import com.yem.wm.utils.YEM;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -18,8 +19,7 @@ import java.util.Date;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description: 1.根据《PLM变更单》中的
- * 1.根据《PLM变更单》中的
  * 【PLM工艺变更单号】+【总成编码】+【子项零件编码】+【子件数量】
  * 匹配《BOM》变更单
  * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘停用’】更新 《PLM变更单》【启用停用状态】【启用停用时间】；
@@ -28,7 +28,6 @@ import java.util.Map;
  * 【PLM工艺变更单号】+【替换后总成编码】+【替换后子项零件编码】+【替换子件数量】
  * 匹配《BOM》变更单
  * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘启用’】更新 《PLM变更单》【替换件启用停用状态】【替换件启用停用时间】；
- *
  * @Date: 2024/8/29 15:08
  * @Created: by ZZSLL
  */
@@ -44,38 +43,51 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
 
         for (DynamicObject plmObj : plms) {
             DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
-            String plm_billno = plmObj.getString("billno");//PLM工艺变更单号
+            String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
             for (DynamicObject plm : plm_entry) {
-                String plm_parent = plm.getString("yem_materiel_parent.number");//总成编码
+                String plm_parent = plm.getString("yem_textfield");//总成编码
-                String plm_child = plm.getString("yem_materiel_child.number");//子项零件编码
+                String plm_child = plm.getString("yem_child_before");//子项零件编码
                 BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量
                 for (DynamicObject bomObj : boms) {
                     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_parent = bom.getString("yem_parentno.number");//父件编码
                         String bom_child = bom.getString("yem_subno");//子项零件编码
                         BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量
-                        if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty)) {
+                        String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
-                            logger.info("PLM匹配到BOM，{}-{}, {}-{}, {}-{}, {}-{}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
+                        logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_child, bom_enablesta);
-                            String enablesta = bom.getString("yem_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("BOM 状态为 {}", "A".equals(enablesta) ? "启用" : "停用");
+                            logger.info("停用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
-                            if ("A".equals(enablesta)) {//启用
+                            Date stoptime = plm.getDate("yem_stoptime");
-                                String plm_enablesta = plm.getString("yem_enablesta");
+                            if (YEM.isEmpty(stoptime)) {
-                                if ("A".equals(plm_enablesta)) {
+                                plm.set("yem_enablesta", bom_enablesta);
-                                    plm.set("yem_starttime", new Date());
+                                Date downdate = bom.getDate("yem_downdate");
+                                plm.set("yem_stoptime", downdate);
+                            } else {
+                                logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
                         }
-                            if ("B".equals(enablesta)) {//停用
+
-                                String plm_enablesta = plm.getString("yem_enablesta");
+                        String plm_after_parent_now = plm.getString("yem_parent_now");//父项编码
-                                if ("B".equals(plm_enablesta)) {
+                        String plm_after_child_now = plm.getString("yem_child_now");//子项编码
-                                    plm.set("yem_stoptime", new Date());
+                        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);
+                            } else {
+                                logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
                         }
-                            plm.set("yem_enablesta", enablesta);
-                        }
                     }
                 }
             }