From 612511712a3c2d5dcce89838f2b3792fdfcf3df4 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 19:57:57 +0800
Subject: [PATCH] 钣金计划:从Redis中读取库存信息

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java                        |    5 +++--
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml                      |    2 +-
 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index d084b25..e16b755 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -107,7 +107,7 @@
     /**
      * 閽i噾渚涘簲缂哄彛鎶ヨ〃
      */
-    @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
+    //@RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
     @GetMapping("/supplyGapList")
     public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
     {
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
index 36c0220..0b9717b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
@@ -139,9 +139,10 @@
                 ApsBom apsBom = jsonArray.getJSONObject(i).to(ApsBom.class);
                 bomLineList.add(apsBom);
             }
-        }else {
-            bomLineList = selectApsBomLineList(plant, itemNumber);
         }
+//        else {
+//            bomLineList = selectApsBomLineList(plant, itemNumber);
+//        }
 
         return bomLineList;
     }
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
index 9e28066..30b40e7 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
@@ -180,7 +180,7 @@
         select id, require_track_id, bom_line_code, bom_line_level,
                match_state, match_mode, unmatched_demand_amount, start_date,
                complete_date, demand_date, org_code, production_base
-        from aps_plate_standard_require where unmatched_demand_amount>0 and del_flag='0'
+        from aps_plate_standard_require where unmatched_demand_amount>0 and del_flag='0' and bom_line_level>0
         <if test="requireTrackId != null and requireTrackId != ''"> and require_track_id like '%' || #{requireTrackId} || '%'</if>
         <if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
     </select>

--
Gitblit v1.9.3