From df20214207804ba2fffc601f20284b26e800ffef Mon Sep 17 00:00:00 2001 From: dy <dingyang@lnfxkj.tech> Date: 星期三, 16 四月 2025 18:19:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java index 9091533..945cc4b 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java @@ -281,7 +281,7 @@ sb.append(value.get("work_order_name")); sb.append("-"); sb.append(value.get("classification_name")); - if(sb.toString().equals(title.get(i))){//鍒楁槑 + if(sb.toString().equals(title.get(i)) && month.equals(value.get("produce_month").toString())){ table.add(value.get("total_weld_seam").toString()); } } -- Gitblit v1.9.3