violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-09 10:37:43 +08:00
commit 2c1de947e9
4 changed files with 220 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/yem/em/bd/bomchange/op/BomChangeNewAuditEdit.java
View File

@ -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");//新增
}
}
}

91
src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java Normal file
View File

@ -0,0 +1,91 @@
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 kd.bos.servicehelper.BusinessDataServiceHelper;
import java.util.Date;
import java.util.Map;
import static com.yem.em.task.MatchingPLMChangeUpdateTaskEdit.queryPLMChange;
/**
* @Description: 1、如《PLM变更单》分录【替换关系】=【相互替换】【新替换旧】【互不替换】,分录【启用停用状态】=‘停用’，并且【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id
* <p>
* 2、如《PLM变更单》分录【替换关系】=【新增】,分录【替换件启用停用状态】=‘启用’，更新当前行【执行状态】为【完成】、【完成时间】默认当前时间，并生成替换关系，记录替换关系id以及行id
* <p>
* 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<String, Object> 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) {
String enablesta = plm.getString("yem_enablesta");
if ("A".equals(enablesta)) {//"替换件启用停用状态 = 启用"
enabled.add(plm);
}
}
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", "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", "PLM");
}
}
}
}
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;
}
}

114
src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java Normal file
View File

@ -0,0 +1,114 @@
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
/**
* @Description:
* 1.根据《PLM变更单》中的
* 【PLM工艺变更单号】+【总成编码】+【子项零件编码】+【子件数量】
* 匹配《BOM》变更单
* 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘停用’】更新 《PLM变更单》【启用停用状态】【启用停用时间】；
* <p>
* 2.根据《PLM变更单》中的
* 【PLM工艺变更单号】+【替换后总成编码】+【替换后子项零件编码】+【替换子件数量】
* 匹配《BOM》变更单
* 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘启用’】更新 《PLM变更单》【替换件启用停用状态】【替换件启用停用时间】；
*
* @Date: 2024/8/29 15:08
* @Created: by ZZSLL
*/
public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
private static Logger logger = LoggerFactory.getLogger(MatchingPLMChangeUpdateTaskEdit.class);
@Override
public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
DynamicObject[] plms = queryPLMChange();
DynamicObject[] boms = queryBOMChange();
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_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)) {
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)) {
plm.set("yem_starttime", new Date());
}
}
if ("B".equals(enablesta)) {//停用
String plm_enablesta = plm.getString("yem_enablesta");
if ("B".equals(plm_enablesta)) {
plm.set("yem_stoptime", new Date());
}
}
plm.set("yem_enablesta", 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 = new QFilter("status", "=", "C");
return BusinessDataServiceHelper.load(formId, selectfields, qFilter.toArray());
}
}

18
src/main/java/com/yem/em/utils/AtlasUtils.java
View File

@ -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;
@ -34,8 +32,10 @@ public class AtlasUtils {
* @param bill 表头数据包
* @param entryentity 分录行数据包
* @param entityName 单据标识
* @param source 来源类型 BOM | PLM
* @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, String source) {
DynamicObject billObj = null;
if (type.equals("add")) {
billObj = BusinessDataServiceHelper.newDynamicObject(entityName);
@ -46,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");
@ -105,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"));
@ -129,6 +134,7 @@ public class AtlasUtils {
// AtlasUtils.Upassatlasdet(bill, entryentity, "Audit");
SubRelationUtils.BomUpdateCMMPTable(bill, entryentity, "Audit");
}
return billObj;
} else {
List<IOperateInfo> allErrorOrValidateInfo = Operate.getAllErrorOrValidateInfo();
String message = Operate.getMessage();
@ -1084,6 +1090,4 @@ public class AtlasUtils {
}
return list;
}
}