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

fix:CMMP获取到BOM变更单数量缺少，修改去重合并条件

Browse Source
This commit is contained in:
zzs 2024-12-27 17:46:16 +08:00
parent 4b07bb93fc
commit eafc4d9957
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yem/em/task/BomChangeTaskEdit.java
View File

@ -71,8 +71,8 @@ public class BomChangeTaskEdit extends AbstractTask {
calendar.set(Calendar.MILLISECOND, 999); calendar.set(Calendar.MILLISECOND, 999);
String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()); String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
// start = "2024-12-04 00:00:00"; // start = "2024-12-25 00:00:00";
// end = "2024-12-10 23:59:59"; // end = "2024-12-25 23:59:59";
for (String key : productmap.keySet()) { for (String key : productmap.keySet()) {
String value = productmap.get(key); String value = productmap.get(key);

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

@ -924,10 +924,17 @@ public class AtlasUtils {
if (yem_em_bomchange != null) { if (yem_em_bomchange != null) {
DynamicObject bomchange = BusinessDataServiceHelper.loadSingle(yem_em_bomchange.getLong("id"), "yem_em_bomchange"); DynamicObject bomchange = BusinessDataServiceHelper.loadSingle(yem_em_bomchange.getLong("id"), "yem_em_bomchange");
DynamicObjectCollection yem_entryentity = bomchange.getDynamicObjectCollection("yem_entryentity"); DynamicObjectCollection yem_entryentity = bomchange.getDynamicObjectCollection("yem_entryentity");
String code = map.get("pcode").toString() + "_" + map.get("ccode").toString(); String code = map.get("pcode").toString() + "_" + map.get("ccode").toString() + "_" + map.get("break_flag").toString();
boolean exist = false; boolean exist = false;
for (DynamicObject dynamicObject : yem_entryentity) { for (DynamicObject dynamicObject : yem_entryentity) {
String key = dynamicObject.getString("yem_parentno") + "_" + dynamicObject.getString("yem_subno"); String break_flag = "";
if ("A".equals(dynamicObject.getString("yem_enablesta"))) {
break_flag = "启用";
}
if ("B".equals(dynamicObject.getString("yem_enablesta"))) {
break_flag = "停用";
}
String key = dynamicObject.getString("yem_parentno") + "_" + dynamicObject.getString("yem_subno") + "_" + break_flag;
if (code.equals(key)) { if (code.equals(key)) {
exist = true; exist = true;
dynamicObject.set("yem_changeno", changebill_code);//更改单号 dynamicObject.set("yem_changeno", changebill_code);//更改单号