From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
index d66f9e7..174bc86 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.aps.core.mapper.ApsBomHeaderMapper">
     
-    <resultMap type="ApsBomHeader" id="ApsBomHeaderResult">
+    <resultMap type="com.aps.core.domain.ApsBomHeader" id="ApsBomHeaderResult">
         <result property="id"    column="id"    />
         <result property="bomHeaderId"    column="bom_header_id"    />
         <result property="itemCode"    column="item_code"    />
@@ -25,7 +25,7 @@
         from aps_bom_header
     </sql>
 
-    <select id="selectApsBomHeaderList" parameterType="ApsBomHeader" resultMap="ApsBomHeaderResult">
+    <select id="selectApsBomHeaderList" parameterType="com.aps.core.domain.ApsBomHeader" resultMap="ApsBomHeaderResult">
         <include refid="selectApsBomHeaderVo"/>
         <where>  
             <if test="bomHeaderId != null  and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
@@ -42,7 +42,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertApsBomHeader" parameterType="ApsBomHeader">
+    <insert id="insertApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
         insert into aps_bom_header
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -74,7 +74,7 @@
          </trim>
     </insert>
 
-    <update id="updateApsBomHeader" parameterType="ApsBomHeader">
+    <update id="updateApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
         update aps_bom_header
         <trim prefix="SET" suffixOverrides=",">
             <if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>
@@ -103,16 +103,15 @@
         </foreach>
     </delete>
 
-    <select id="selectBomRedisData" parameterType="String" resultType="com.alibaba.fastjson2.JSONObject">
-        SELECT a.item_code as mainItemCode,f.num as mainStock,b.bom_line_id as bomLineId, b.item_code as itemCode,b.num ,c.num as subStock,d.self_made as selfMade
+    <select id="selectBomRedisData" parameterType="String" resultType="com.aps.core.domain.ApsBom">
+        SELECT a.item_code as mainItemCode,b.bom_line_id as bomLineId, b.item_code as itemCode,b.num
         FROM aps_bom_header a
-            LEFT JOIN aps_bom_line b on a.bom_header_id=b.bom_header_id
-            LEFT JOIN aps_material_storage_management c on b.item_code=c.item_number
-            LEFT JOIN aps_material_management d on b.item_code=d.item_number
-            LEFT JOIN aps_material_storage_management as f on a.item_code=f.item_number
+        LEFT JOIN aps_bom_line b on a.bom_header_id=b.bom_header_id
+        LEFT JOIN aps_material_management d on b.item_code=d.item_number
+        LEFT JOIN aps_material_management c on a.item_code=c.item_number
+        where   d.material_type='鍒堕�犱欢' and c.material_type='鍒堕�犱欢'
         <if test="orgCode != null and orgCode != ''">
-            WHERE a.org_code=#{orgCode} and d.applicable_factories=#{orgCode} and c.applicable_factories=#{orgCode}
-            and a.item_code='A6501-001080'
+            and a.org_code=#{orgCode} and d.applicable_factories=#{orgCode}
         </if>
         ORDER BY mainItemCode
     </select>

--
Gitblit v1.9.3