Browse Source

feat: 码库下拉详情问题修改

fangxinjian 3 years ago
parent
commit
9dda8624ac

+ 11 - 11
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapOrganizationMapper.xml

@@ -4,17 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapOrganization">
-        <id column="id" property="id" />
-        <result column="customer_code" property="customerCode" />
-        <result column="customer_name" property="customerName" />
-        <result column="parent_code" property="parentCode" />
-        <result column="organization_level" property="organizationLevel" />
-        <result column="province" property="province" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="is_delete" property="isDelete" />
+        <id column="id" property="id"/>
+        <result column="customer_code" property="customerCode"/>
+        <result column="customer_name" property="customerName"/>
+        <result column="parent_code" property="parentCode"/>
+        <result column="organization_level" property="organizationLevel"/>
+        <result column="province" property="province"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

+ 11 - 12
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapSkuMapper.xml

@@ -4,17 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapSku">
-        <id column="id" property="id" />
-        <result column="sku_code" property="skuCode" />
-        <result column="sku_name" property="skuName" />
-        <result column="brand_code" property="brandCode" />
-        <result column="sub_brand_code" property="subBrandCode" />
-        <result column="valid" property="valid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="is_delete" property="isDelete" />
+        <id column="id" property="id"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="brand_code" property="brandCode"/>
+        <result column="sub_brand_code" property="subBrandCode"/>
+        <result column="valid" property="valid"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -23,5 +23,4 @@
     </sql>
 
 
-
 </mapper>

+ 3 - 2
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertoryMapper.xml

@@ -155,10 +155,11 @@
         qrc.id as repertoryColumnId,
         qrc.sort_number,
         qrc.alias,
-        qbs.split_num
+        qbs.split_num,
+        qbs.id as splitId
         from qr_repertory qr
         inner join qr_repertory_column qrc on qr.id=qrc.qr_repertory_id
-        left join qr_box_code_format_split qbs on qr.id=qbs.qr_repertory_id
+        inner join qr_box_code_format_split qbs on qrc.id = qbs.qr_repertory_column_id
         <where>
             <if test="id != null and id != ''">
                 qr.id = #{id}