From 15ec1e9cac18411fcc9983180f3bf2a15d1cc7fb Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 29 Aug 2024 17:01:41 +0800 Subject: [PATCH 1/7] =?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 | 40 ++++++++ .../task/MatchingPLMChangeUpdateTaskEdit.java | 99 +++++++++++++++++++ .../java/com/yem/em/utils/AtlasUtils.java | 48 ++++++++- 3 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java create mode 100644 src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java new file mode 100644 index 00000000..09872d32 --- /dev/null +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -0,0 +1,40 @@ +package com.yem.em.task; + +import com.yem.em.utils.AtlasUtils; +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.schedule.executor.AbstractTask; + +import java.util.Map; + +import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange; + +/** + * @Description: 1、如《PLM变更单》分录【替换关系】=【相互替换】【新替换旧】【互不替换】,分录【启用停用状态】=‘停用’，并且【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id + *

+ * 2、如《PLM变更单》分录【替换关系】=【新增】,分录【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id + *

+ * 3、如《PLM变更单》分录【替换关系】=【删除】,分录【启用停用状态】=‘停用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id + * @Date: 2024/8/29 15:38 + * @Created: by ZZSLL + */ + +public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { + + @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(); + for (DynamicObject plm : collection) { +// if (替换件启用停用状态 = "启用") {} + enabled.add(plm); + } + AtlasUtils.generateReplaceRelationPLM(plmObj, enabled); + } + } +} diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java new file mode 100644 index 00000000..39e4b8a6 --- /dev/null +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -0,0 +1,99 @@ +package com.yem.em.task; + +import com.yem.rf.utils.RFUtils; +import com.yem.wm.utils.DynamicObjectUtil; +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.orm.query.QFilter; +import kd.bos.schedule.executor.AbstractTask; +import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.operation.SaveServiceHelper; + +import java.math.BigDecimal; +import java.util.Map; + +/** + * @Description: + * 1.根据《PLM变更单》中的 + * 【PLM工艺变更单号】+【总成编码】+【子项零件编码】+【子件数量】 + * 匹配《BOM》变更单 + * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘停用’】更新 《PLM变更单》【启用停用状态】【启用停用时间】； + *

+ * 2.根据《PLM变更单》中的 + * 【PLM工艺变更单号】+【替换后总成编码】+【替换后子项零件编码】+【替换子件数量】 + * 匹配《BOM》变更单 + * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘启用’】更新 《PLM变更单》【替换件启用停用状态】【替换件启用停用时间】； + * + * @Date: 2024/8/29 15:08 + * @Created: by ZZSLL + */ + +public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { + + @Override + public void execute(RequestContext requestContext, Map map) throws KDException { + DynamicObject[] plms = queryPLMChange(); + DynamicObject[] boms = queryBOMChange(); + + for (DynamicObject plmObj : plms) { + DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail"); + for (DynamicObject plm : plm_entry) { + String plm_billno = plm.getString("billno");//PLM工艺变更单号 + String plm_parent = plm.getString("yem_materiel_parent.number");//总成编码 + String plm_child = plm.getString("yem_materiel_child.number");//子项零件编码 + 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.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 enablesta = bom.getString("yem_enablesta");//启用停用状态 + if ("A".equals(enablesta)) {//启用 + + } + if ("B".equals(enablesta)) {//停用 + + } + + } + } + } + } + } + + SaveServiceHelper.save(plms); + } + + private boolean eq(Object str1, Object str2) { + if (str1 instanceof String && str2 instanceof String) { + return str1.equals(str2); + } + if (str1 instanceof BigDecimal && str2 instanceof BigDecimal) { + return ((BigDecimal) str1).compareTo((BigDecimal) str2) == 0; + } + return false; + } + + public static DynamicObject[] queryPLMChange() { + final String formId = "yem_changecompare"; + final String entryId = "yem_change_detail"; + String selectfields = DynamicObjectUtil.getSelectfields(formId); + selectfields = DynamicObjectUtil.getEntrySelectfields(selectfields, formId, entryId); + QFilter qFilter = RFUtils.getBaseQFilter(); + return BusinessDataServiceHelper.load(formId, selectfields, qFilter.toArray()); + } + + public static DynamicObject[] queryBOMChange() { + final String formId = "yem_em_bomchange"; + final String entryId = "yem_entryentity"; + String selectfields = DynamicObjectUtil.getSelectfields(formId); + selectfields = DynamicObjectUtil.getEntrySelectfields(selectfields, formId, entryId); + QFilter qFilter = RFUtils.getBaseQFilter(); + return BusinessDataServiceHelper.load(formId, selectfields, qFilter.toArray()); + } +} diff --git a/src/main/java/com/yem/em/utils/AtlasUtils.java b/src/main/java/com/yem/em/utils/AtlasUtils.java index 24a70b48..87bba664 100644 --- a/src/main/java/com/yem/em/utils/AtlasUtils.java +++ b/src/main/java/com/yem/em/utils/AtlasUtils.java @@ -8,8 +8,6 @@ import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.entity.operate.result.IOperateInfo; import kd.bos.entity.operate.result.OperationResult; import kd.bos.exception.KDBizException; -import kd.bos.form.control.Control; -import kd.bos.form.control.events.ISuportClick; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; @@ -1085,5 +1083,51 @@ public class AtlasUtils { return list; } + /** + * PLM变更单生成替换关系 + * @param head 单据头数据 + * @param entryCollection 分录数据（一行） + */ + public static void generateReplaceRelationPLM(DynamicObject head, DynamicObjectCollection entryCollection) { + DynamicObject replace = BusinessDataServiceHelper.newDynamicObject("yem_em_replace"); + replace.set("createorg", head.getDynamicObject("createorg")); + replace.set("enable", "1"); + replace.set("status", "C"); + replace.set("yem_sourcetype", "PLM");//来源类型 + DynamicObjectCollection collection = replace.getDynamicObjectCollection("yem_entryentity"); + for (DynamicObject entry : entryCollection) { + DynamicObject addNew = collection.addNew(); + addNew.set("yem_operator", YEM.getCurrentUserId());//操作人 + addNew.set("yem_replacedate", new Date());//操作时间 + + addNew.set("yem_replace", entry.getString("yem_exchangetype"));//替换关系 + addNew.set("yem_sourcetypeen", head.getDynamicObjectType().getName());//来源类型 + addNew.set("yem_trackingno", head.getString("billno"));//来源单号 + addNew.set("yem_trackingid", head.getLong("id"));//来源内码 + addNew.set("yem_sourceid", entry.getLong("id"));//来源分录内码 + } + + OperationResult Operate = OperationServiceHelper.executeOperate("save", + replace.getDynamicObjectType().getName(), + new DynamicObject[]{replace}, OperateOption.create()); + + if (Operate.isSuccess()) { +// //总成 +// boolean yem_isass = entryentity.getBoolean("yem_isass"); +// if (yem_isass) { +// AtlasUtils.Upassatlasdet(head, entryentity, "Audit"); +// } +// //资源 +// boolean yem_isresource = entryentity.getBoolean("yem_isresource"); +// if (yem_isresource) { +//// AtlasUtils.Upassatlasdet(bill, entryentity, "Audit"); +// SubRelationUtils.BomUpdateCMMPTable(bill, entryentity, "Audit"); +// } + } else { + List allErrorOrValidateInfo = Operate.getAllErrorOrValidateInfo(); + String message = Operate.getMessage(); + throw new KDBizException("保存《替换关系》失败，失败信息为：," + message + "，" + allErrorOrValidateInfo); + } + } } From db1cce9b4dd0202ed5a26f39fdcaa7c9c55be1c1 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 29 Aug 2024 17:31:52 +0800 Subject: [PATCH 2/7] =?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 | 21 +++++++- .../java/com/yem/em/utils/AtlasUtils.java | 52 ++----------------- 2 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index 09872d32..47616ec6 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -6,6 +6,7 @@ import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.exception.KDException; import kd.bos.schedule.executor.AbstractTask; +import kd.bos.servicehelper.BusinessDataServiceHelper; import java.util.Map; @@ -34,7 +35,25 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { // if (替换件启用停用状态 = "启用") {} enabled.add(plm); } - AtlasUtils.generateReplaceRelationPLM(plmObj, enabled); + DynamicObject bomChange = createBOMChange(plmObj, enabled); + DynamicObjectCollection entry = bomChange.getDynamicObjectCollection("yem_entryentity"); + if (!entry.isEmpty()) { + DynamicObject replace = null; + if (entry.size() == 1) { + replace = AtlasUtils.Addreplace(bomChange, entry.get(0), null, "yem_em_replace", "add"); + } + for (DynamicObject entryObject : entry) { + int idx = entry.indexOf(entryObject); + if (idx == 0) continue; + replace = AtlasUtils.Addreplace(bomChange, entry.get(0), replace, "yem_em_replace", "update"); + } + } } } + + private DynamicObject createBOMChange(DynamicObject head, DynamicObjectCollection entry) { + DynamicObject bomchange = BusinessDataServiceHelper.newDynamicObject("yem_em_bomchange"); + + return bomchange; + } } diff --git a/src/main/java/com/yem/em/utils/AtlasUtils.java b/src/main/java/com/yem/em/utils/AtlasUtils.java index 87bba664..d5d76043 100644 --- a/src/main/java/com/yem/em/utils/AtlasUtils.java +++ b/src/main/java/com/yem/em/utils/AtlasUtils.java @@ -32,8 +32,9 @@ public class AtlasUtils { * @param bill 表头数据包 * @param entryentity 分录行数据包 * @param entityName 单据标识 + * @return */ - public static void Addreplace(DynamicObject bill, DynamicObject entryentity, DynamicObject replace, String entityName, String type) { + public static DynamicObject Addreplace(DynamicObject bill, DynamicObject entryentity, DynamicObject replace, String entityName, String type) { DynamicObject billObj = null; if (type.equals("add")) { billObj = BusinessDataServiceHelper.newDynamicObject(entityName); @@ -127,6 +128,7 @@ public class AtlasUtils { // AtlasUtils.Upassatlasdet(bill, entryentity, "Audit"); SubRelationUtils.BomUpdateCMMPTable(bill, entryentity, "Audit"); } + return billObj; } else { List allErrorOrValidateInfo = Operate.getAllErrorOrValidateInfo(); String message = Operate.getMessage(); @@ -1082,52 +1084,4 @@ public class AtlasUtils { } return list; } - - /** - * PLM变更单生成替换关系 - * @param head 单据头数据 - * @param entryCollection 分录数据（一行） - */ - public static void generateReplaceRelationPLM(DynamicObject head, DynamicObjectCollection entryCollection) { - DynamicObject replace = BusinessDataServiceHelper.newDynamicObject("yem_em_replace"); - replace.set("createorg", head.getDynamicObject("createorg")); - replace.set("enable", "1"); - replace.set("status", "C"); - replace.set("yem_sourcetype", "PLM");//来源类型 - DynamicObjectCollection collection = replace.getDynamicObjectCollection("yem_entryentity"); - for (DynamicObject entry : entryCollection) { - DynamicObject addNew = collection.addNew(); - - addNew.set("yem_operator", YEM.getCurrentUserId());//操作人 - addNew.set("yem_replacedate", new Date());//操作时间 - - addNew.set("yem_replace", entry.getString("yem_exchangetype"));//替换关系 - addNew.set("yem_sourcetypeen", head.getDynamicObjectType().getName());//来源类型 - addNew.set("yem_trackingno", head.getString("billno"));//来源单号 - addNew.set("yem_trackingid", head.getLong("id"));//来源内码 - addNew.set("yem_sourceid", entry.getLong("id"));//来源分录内码 - } - - OperationResult Operate = OperationServiceHelper.executeOperate("save", - replace.getDynamicObjectType().getName(), - new DynamicObject[]{replace}, OperateOption.create()); - - if (Operate.isSuccess()) { -// //总成 -// boolean yem_isass = entryentity.getBoolean("yem_isass"); -// if (yem_isass) { -// AtlasUtils.Upassatlasdet(head, entryentity, "Audit"); -// } -// //资源 -// boolean yem_isresource = entryentity.getBoolean("yem_isresource"); -// if (yem_isresource) { -//// AtlasUtils.Upassatlasdet(bill, entryentity, "Audit"); -// SubRelationUtils.BomUpdateCMMPTable(bill, entryentity, "Audit"); -// } - } else { - List allErrorOrValidateInfo = Operate.getAllErrorOrValidateInfo(); - String message = Operate.getMessage(); - throw new KDBizException("保存《替换关系》失败，失败信息为：," + message + "，" + allErrorOrValidateInfo); - } - } } From c8cda50b5bcf626c425d91ebee2d0d899f1d6745 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 29 Aug 2024 17:48:29 +0800 Subject: [PATCH 3/7] =?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 --- .../em/bd/bomchange/op/BomChangeNewAuditEdit.java | 8 ++++---- .../em/task/GenerateReplaceRelationshipTaskEdit.java | 6 +++--- src/main/java/com/yem/em/utils/AtlasUtils.java | 12 +++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/yem/em/bd/bomchange/op/BomChangeNewAuditEdit.java b/src/main/java/com/yem/em/bd/bomchange/op/BomChangeNewAuditEdit.java index ee288821..03f89d52 100644 --- a/src/main/java/com/yem/em/bd/bomchange/op/BomChangeNewAuditEdit.java +++ b/src/main/java/com/yem/em/bd/bomchange/op/BomChangeNewAuditEdit.java @@ -93,10 +93,10 @@ public class BomChangeNewAuditEdit extends AbstractOperationServicePlugIn { if (yem_em_replace != null) { DynamicObject replace = BusinessDataServiceHelper.loadSingle(yem_em_replace.getLong("id"), "yem_em_replace"); if (replace != null) { - AtlasUtils.Addreplace(bill, entryentity, replace, "yem_em_replace", "update"); + AtlasUtils.Addreplace(bill, entryentity, replace, "yem_em_replace", "update", "BOM"); } } else { - AtlasUtils.Addreplace(bill, entryentity, null, "yem_em_replace", "add");//新增 + AtlasUtils.Addreplace(bill, entryentity, null, "yem_em_replace", "add", "BOM");//新增 } } if (StringUtils.isNotEmpty(yem_replace)) { @@ -109,10 +109,10 @@ public class BomChangeNewAuditEdit extends AbstractOperationServicePlugIn { if (yem_em_replace != null) { DynamicObject replace = BusinessDataServiceHelper.loadSingle(yem_em_replace.getLong("id"), "yem_em_replace"); if (replace != null) { - AtlasUtils.Addreplace(bill, entryentity, replace, "yem_em_replace", "update"); + AtlasUtils.Addreplace(bill, entryentity, replace, "yem_em_replace", "update", "BOM"); } } else { - AtlasUtils.Addreplace(bill, entryentity, null, "yem_em_replace", "add");//新增 + AtlasUtils.Addreplace(bill, entryentity, null, "yem_em_replace", "add", "BOM");//新增 } } } diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index 47616ec6..d44e4f19 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -40,12 +40,12 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { if (!entry.isEmpty()) { DynamicObject replace = null; if (entry.size() == 1) { - replace = AtlasUtils.Addreplace(bomChange, entry.get(0), null, "yem_em_replace", "add"); + replace = AtlasUtils.Addreplace(bomChange, entry.get(0), null, "yem_em_replace", "add", "PLM"); } for (DynamicObject entryObject : entry) { int idx = entry.indexOf(entryObject); if (idx == 0) continue; - replace = AtlasUtils.Addreplace(bomChange, entry.get(0), replace, "yem_em_replace", "update"); + replace = AtlasUtils.Addreplace(bomChange, entry.get(0), replace, "yem_em_replace", "update", "PLM"); } } } @@ -53,7 +53,7 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { private DynamicObject createBOMChange(DynamicObject head, DynamicObjectCollection entry) { DynamicObject bomchange = BusinessDataServiceHelper.newDynamicObject("yem_em_bomchange"); - + return bomchange; } } diff --git a/src/main/java/com/yem/em/utils/AtlasUtils.java b/src/main/java/com/yem/em/utils/AtlasUtils.java index d5d76043..2a4637a5 100644 --- a/src/main/java/com/yem/em/utils/AtlasUtils.java +++ b/src/main/java/com/yem/em/utils/AtlasUtils.java @@ -32,9 +32,10 @@ public class AtlasUtils { * @param bill 表头数据包 * @param entryentity 分录行数据包 * @param entityName 单据标识 + * @param source 来源类型 BOM | PLM * @return */ - public static DynamicObject Addreplace(DynamicObject bill, DynamicObject entryentity, DynamicObject replace, String entityName, String type) { + public static DynamicObject Addreplace(DynamicObject bill, DynamicObject entryentity, DynamicObject replace, String entityName, String type, String source) { DynamicObject billObj = null; if (type.equals("add")) { billObj = BusinessDataServiceHelper.newDynamicObject(entityName); @@ -45,7 +46,7 @@ public class AtlasUtils { billObj.set("number", entryentity.getString("yem_parentno")); billObj.set("name", entryentity.getString("yem_parentname")); billObj.set("creator", YEM.getCurrentUserId()); - billObj.set("yem_sourcetype", "BOM"); + billObj.set("yem_sourcetype", source); billObj.set("yem_parno", entryentity.getString("yem_subno")); billObj.set("yem_parname", entryentity.getString("yem_subname")); boolean yem_isass = entryentity.getBoolean("yem_isass"); @@ -104,7 +105,12 @@ public class AtlasUtils { subentryentity.set("yem_technology", new Date()); subentryentity.set("yem_remark", entryentity.getString("yem_remark")); subentryentity.set("yem_operator", YEM.getCurrentUserId()); - subentryentity.set("yem_sourcetypeen", "yem_em_bomchange"); + if ("BOM".equals(source)) { + subentryentity.set("yem_sourcetypeen", "yem_em_bomchange"); + } + if ("PLM".equals(source)) { + subentryentity.set("yem_sourcetypeen", "yem_changecompare"); + } subentryentity.set("yem_trackingno", bill.getString("number")); subentryentity.set("yem_trackingid", bill.getPkValue()); subentryentity.set("yem_sourceid", entryentity.getLong("id")); From 1e074f37aed5ea58430444b953d5340143434949 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 09:33:19 +0800 Subject: [PATCH 4/7] =?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 --- .../em/task/GenerateReplaceRelationshipTaskEdit.java | 3 +++ .../yem/em/task/MatchingPLMChangeUpdateTaskEdit.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index d44e4f19..ea51e5c9 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -8,6 +8,7 @@ import kd.bos.exception.KDException; import kd.bos.schedule.executor.AbstractTask; import kd.bos.servicehelper.BusinessDataServiceHelper; +import java.util.Date; import java.util.Map; import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange; @@ -32,7 +33,9 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail"); DynamicObjectCollection enabled = new DynamicObjectCollection(); for (DynamicObject plm : collection) { + Date starttime = plm.getDate("yem_starttime"); // if (替换件启用停用状态 = "启用") {} + enabled.add(plm); } DynamicObject bomChange = createBOMChange(plmObj, enabled); diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 39e4b8a6..9f2f588f 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -12,6 +12,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; import java.math.BigDecimal; +import java.util.Date; import java.util.Map; /** @@ -54,10 +55,16 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty)) { String enablesta = bom.getString("yem_enablesta");//启用停用状态 if ("A".equals(enablesta)) {//启用 - + Date starttime = plm.getDate("yem_starttime"); + if (starttime == null) { + plm.set("yem_starttime", new Date()); + } } if ("B".equals(enablesta)) {//停用 - + Date stoptime = plm.getDate("yem_stoptime"); + if (stoptime == null) { + plm.set("yem_stoptime", new Date()); + } } } From 0f1778e7e3265b82e3e2a73f58cd4767c7400ea1 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 09:41:57 +0800 Subject: [PATCH 5/7] =?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 --- .../yem/em/task/GenerateReplaceRelationshipTaskEdit.java | 8 ++++---- .../com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index ea51e5c9..48440ead 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -33,10 +33,10 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail"); DynamicObjectCollection enabled = new DynamicObjectCollection(); for (DynamicObject plm : collection) { - Date starttime = plm.getDate("yem_starttime"); -// if (替换件启用停用状态 = "启用") {} - - enabled.add(plm); + String enablesta = plm.getString("yem_enablesta"); + if ("A".equals(enablesta)) {//"替换件启用停用状态 = 启用" + enabled.add(plm); + } } DynamicObject bomChange = createBOMChange(plmObj, enabled); DynamicObjectCollection entry = bomChange.getDynamicObjectCollection("yem_entryentity"); diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 9f2f588f..69eaf32d 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -55,14 +55,14 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty)) { String enablesta = bom.getString("yem_enablesta");//启用停用状态 if ("A".equals(enablesta)) {//启用 - Date starttime = plm.getDate("yem_starttime"); - if (starttime == null) { + String plm_enablesta = plm.getString("yem_enablesta"); + if ("A".equals(plm_enablesta)) { plm.set("yem_starttime", new Date()); } } if ("B".equals(enablesta)) {//停用 - Date stoptime = plm.getDate("yem_stoptime"); - if (stoptime == null) { + String plm_enablesta = plm.getString("yem_enablesta"); + if ("B".equals(plm_enablesta)) { plm.set("yem_stoptime", new Date()); } } From 777b1b149e4de6078ca0b19f0d1449fc974fe1f7 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 15:09:25 +0800 Subject: [PATCH 6/7] =?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 | 33 +++++++++++++++++-- .../task/MatchingPLMChangeUpdateTaskEdit.java | 12 +++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index 48440ead..0e7256fa 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -54,9 +54,38 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { } } - private DynamicObject createBOMChange(DynamicObject head, DynamicObjectCollection entry) { + 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("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"); + for (DynamicObject entry : entries) { + DynamicObject addNew = detail.addNew(); + addNew.set("id", entry.getLong("id")); + 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_replace", entry.getString("yem_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_enableddate", entry.getDate("yem_starttime"));//启用时间 + addNew.set("yem_downdate", entry.getDate("yem_stoptime"));//停用时间 + addNew.set("yem_remark", "");//备注 + addNew.set("yem_isass", entry.getBoolean("yem_isassy"));//是否总成 + addNew.set("yem_isresource", entry.getBoolean("yem_isresource"));//是否资源 + } return bomchange; } } diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 69eaf32d..7aed7a0b 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -10,6 +10,8 @@ import kd.bos.orm.query.QFilter; 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.math.BigDecimal; import java.util.Date; @@ -33,6 +35,8 @@ import java.util.Map; public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { + private static Logger logger = LoggerFactory.getLogger(MatchingPLMChangeUpdateTaskEdit.class); + @Override public void execute(RequestContext requestContext, Map map) throws KDException { DynamicObject[] plms = queryPLMChange(); @@ -40,8 +44,8 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { for (DynamicObject plmObj : plms) { DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail"); + String plm_billno = plmObj.getString("billno");//PLM工艺变更单号 for (DynamicObject plm : plm_entry) { - String plm_billno = plm.getString("billno");//PLM工艺变更单号 String plm_parent = plm.getString("yem_materiel_parent.number");//总成编码 String plm_child = plm.getString("yem_materiel_child.number");//子项零件编码 BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量 @@ -53,7 +57,9 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { 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)) { + logger.info("PLM匹配到BOM，{}-{}, {}-{}, {}-{}, {}-{}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty); String enablesta = bom.getString("yem_enablesta");//启用停用状态 + logger.info("BOM 状态为 {}", "A".equals(enablesta) ? "启用" : "停用"); if ("A".equals(enablesta)) {//启用 String plm_enablesta = plm.getString("yem_enablesta"); if ("A".equals(plm_enablesta)) { @@ -66,7 +72,7 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { plm.set("yem_stoptime", new Date()); } } - + plm.set("yem_enablesta", enablesta); } } } @@ -100,7 +106,7 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { final String entryId = "yem_entryentity"; String selectfields = DynamicObjectUtil.getSelectfields(formId); selectfields = DynamicObjectUtil.getEntrySelectfields(selectfields, formId, entryId); - QFilter qFilter = RFUtils.getBaseQFilter(); + QFilter qFilter = new QFilter("status", "=", "C"); return BusinessDataServiceHelper.load(formId, selectfields, qFilter.toArray()); } } From d442546b87ad1520837f2aea33e53dcee0de465c Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 9 Sep 2024 10:27:18 +0800 Subject: [PATCH 7/7] =?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 --- .../java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 7aed7a0b..5ead36f8 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -53,6 +53,8 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { 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.number");//父件编码 String bom_child = bom.getString("yem_subno");//子项零件编码 BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量