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

wip:PLM匹配，生成替换关系

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-08-29 17:48:29 +08:00
parent db1cce9b4d
commit c8cda50b5b
3 changed files with 16 additions and 10 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");//新增
}
}
}

6
src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
View File

@ -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;
}
}

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

@ -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"));