diff --git a/src/main/java/com/yem/em/task/BomChangeTaskEdit.java b/src/main/java/com/yem/em/task/BomChangeTaskEdit.java index 6492d2dd..018d0a46 100644 --- a/src/main/java/com/yem/em/task/BomChangeTaskEdit.java +++ b/src/main/java/com/yem/em/task/BomChangeTaskEdit.java @@ -71,8 +71,8 @@ public class BomChangeTaskEdit extends AbstractTask { calendar.set(Calendar.MILLISECOND, 999); String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()); -// start = "2024-12-04 00:00:00"; -// end = "2024-12-10 23:59:59"; +// start = "2024-12-25 00:00:00"; +// end = "2024-12-25 23:59:59"; for (String key : productmap.keySet()) { String value = productmap.get(key); diff --git a/src/main/java/com/yem/em/utils/AtlasUtils.java b/src/main/java/com/yem/em/utils/AtlasUtils.java index 89e1e6ed..1e516f80 100644 --- a/src/main/java/com/yem/em/utils/AtlasUtils.java +++ b/src/main/java/com/yem/em/utils/AtlasUtils.java @@ -924,10 +924,17 @@ public class AtlasUtils { if (yem_em_bomchange != null) { DynamicObject bomchange = BusinessDataServiceHelper.loadSingle(yem_em_bomchange.getLong("id"), "yem_em_bomchange"); 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; 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)) { exist = true; dynamicObject.set("yem_changeno", changebill_code);//更改单号