From 5b224777e5f6f7dd14c9a40a03dd624c456bd770 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 9 Sep 2024 15:31:49 +0800 Subject: [PATCH] =?UTF-8?q?wip:PLM=E5=8C=B9=E9=85=8D=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9B=BF=E6=8D=A2=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenerateReplaceRelationshipTaskEdit.java | 54 ++++++++++++++++--- .../task/MatchingPLMChangeUpdateTaskEdit.java | 43 ++++++++------- 2 files changed, 68 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index 0e7256fa..d721eaad 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/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.Map; +import java.util.*; import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange; +import static com.yem.em.utils.AtlasUtils.seelctDyn; /** * @Description: 1、如《PLM变更单》分录【替换关系】=【相互替换】【新替换旧】【互不替换】,分录【启用停用状态】=‘停用’，并且【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id @@ -25,16 +28,34 @@ 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 map) throws KDException { + DynamicObject[] plms = queryPLMChange(); for (DynamicObject plmObj : plms) { DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail"); DynamicObjectCollection enabled = new DynamicObjectCollection(); + Set successMap = new HashSet<>(); for (DynamicObject plm : collection) { String enablesta = plm.getString("yem_enablesta"); - if ("A".equals(enablesta)) {//"替换件启用停用状态 = 启用" + String invokstatus = plm.getString("yem_invokstatus"); + String 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,27 +63,45 @@ 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"));//创建人 - DynamicObjectCollection detail = bomchange.getDynamicObjectCollection("yem_change_detail"); + bomchange.set("creator", head.getDynamicObject("creator"));//创建人 + DynamicObjectCollection detail = bomchange.getDynamicObjectCollection("yem_entryentity"); for (DynamicObject entry : entries) { DynamicObject addNew = detail.addNew(); addNew.set("id", entry.getLong("id")); @@ -72,7 +111,7 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { 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_enableparno", entry.getString("yem_parent_now"));//替换父件编码-父项编码 addNew.set("yem_enableparname", entry.getString("yem_name_newparent"));//替换父件名称-父项名称 @@ -82,6 +121,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"));//是否资源 diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index f659ee31..16fbe202 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/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; @@ -44,16 +45,9 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { 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");//总成编码 String plm_child = plm.getString("yem_child_before");//子项零件编码 BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量 - - String invokstatus = plm.getString("yem_invokstatus"); - if ("B".equals(invokstatus)) { - logger.info("执行状态为已完成，跳过：{}，父项编码：{}", plm_billno, plm_parent); - continue; - } for (DynamicObject bomObj : boms) { DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity"); for (DynamicObject bom : bom_entry) { @@ -65,27 +59,32 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { 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); - plm.set("yem_enablesta", bom_enablesta); - plm.set("yem_stoptime", new Date()); - plm.set("yem_invokstatus", "B"); - plm.set("yem_invoktime", new Date()); + Date stoptime = plm.getDate("yem_stoptime"); + if (YEM.isEmpty(stoptime)) { + plm.set("yem_enablesta", bom_enablesta); + plm.set("yem_stoptime", new Date()); + } else { + logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent); + } } 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_after_parent_no = bom.getString("yem_enableparno");//替换后总成编码 - String bom_after_child_no = bom.getString("yem_enablesubno");//替换子件编码 - BigDecimal bom_after_qty = bom.getBigDecimal("yem_enablesubqty"); - logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_after_parent_no, plm_after_child_now, bom_after_child_no, plm_after_qty, bom_after_qty, bom_enablesta); - if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_after_parent_no) && eq(plm_after_child_now, bom_after_child_no) && eq(plm_after_qty, bom_after_qty) && "A".equals(bom_enablesta)) { - logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_after_parent_no, plm_after_child_now, bom_after_child_no, plm_after_qty, bom_after_qty); - - plm.set("yem_enablesta", bom_enablesta); - plm.set("yem_starttime", new Date()); - plm.set("yem_invokstatus", "B"); - plm.set("yem_invoktime", new Date()); + 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)) { + plm.set("yem_enablesta", bom_enablesta); + plm.set("yem_starttime", new Date()); + } else { + logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent); + } } } }