From f536fc9fdb2d65abf08e135d806af78716fc7e62 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 07 五月 2025 10:35:03 +0800
Subject: [PATCH] 【UPDATE】BOM管理接口

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml                       |    4 ++--
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java                         |    2 +-
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
index 9654f51..16a850c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
@@ -35,7 +35,7 @@
     @GetMapping("/list")
     public TableDataInfo list(ApsBom apsBom)
     {
-        startPage();
+//        startPage();
         List<ApsBom> list = apsBomService.selectApsBomList(apsBom);
         return getDataTable(list);
     }
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index c8846f0..00845b6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -54,7 +54,7 @@
 
     /** 鎬绘暟閲� */
     @Excel(name = "鎬绘暟閲�")
-    private BigDecimal totalNum;
+    private BigDecimal total_num;
 
     /** 鍑嗗宸ユ椂 */
     @Excel(name = "鍑嗗宸ユ椂")
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index 50f1f10..35da42e 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -39,8 +39,8 @@
         <where>  
             <if test="bomLineId != null  and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
             <if test="bomHeaderId != null  and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
-            <if test="itemCode != null  and itemCode != ''"> and item_code like '%'||#{itemCode}||'%'</if>
-            <if test="itemName != null  and itemName != ''"> and item_name like '%'|| #{itemName}||'%'</if>
+            <if test="itemCode != null  and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
+            <if test="itemName != null  and itemName != ''"> and item_name like '%' || #{itemName} || '%'</if>
             <if test="params.beginStartDate != null and params.beginStartDate != '' and params.endStartDate != null and params.endStartDate != ''"> and start_date between #{params.beginStartDate} and #{params.endStartDate}</if>
             <if test="params.beginEndDate != null and params.beginEndDate != '' and params.endEndDate != null and params.endEndDate != ''"> and end_date between #{params.beginEndDate} and #{params.endEndDate}</if>
             <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>

--
Gitblit v1.9.3