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()); } }