From eafc4d9957c3902abee2b6f49077fa3c71a794c3 Mon Sep 17 00:00:00 2001
From: zzs <hi@vio.vin>
Date: Fri, 27 Dec 2024 17:46:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:CMMP=E8=8E=B7=E5=8F=96=E5=88=B0BOM=E5=8F=98?=
=?UTF-8?q?=E6=9B=B4=E5=8D=95=E6=95=B0=E9=87=8F=E7=BC=BA=E5=B0=91=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=BB=E9=87=8D=E5=90=88=E5=B9=B6=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/yem/em/task/BomChangeTaskEdit.java | 4 ++--
src/main/java/com/yem/em/utils/AtlasUtils.java | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
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);//更改单号