bu

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -1011,8 +1011,10 @@ create_by,create_date,update_by,update_date
                CONVERT(DECIMAL(20, 2),detail.total_price) as total_price,detail.currency,detail.made_area,detail.destination,
                detail.source_area,detail.levy,detail.hs_code,detail.hs_code_desc,h.hsCodeDescEn
         from ecss_declaration_detail detail
-                 left join ecss_hsCode h on detail.hs_code=h.HsCode and detail.site=h.Site and detail.hs_code_desc=h.hsCodeDesc
-        where detail.site=#{site} and declaration_no=#{declarationNo}
+                 left join ecss_declaration_header hdr on detail.site=hdr.site and detail.declaration_no=hdr.declaration_no
+                 left join ecss_CoDelNotifyHeader nh on hdr.site=nh.site and hdr.delNo=nh.delNo
+                 left join ecss_hsCode h on detail.hs_code=h.HsCode and detail.site=h.Site and detail.hs_code_desc=h.hsCodeDesc and nh.bu_no=h.BuNo
+        where detail.site=#{site} and detail.declaration_no=#{declarationNo}
     </select>
 
     <select id="exportDeclarationDetailTX" resultType="java.util.Map">
@@ -1022,8 +1024,10 @@ create_by,create_date,update_by,update_date
                CONVERT(DECIMAL(20, 2),detail.total_price) as total_price,detail.currency,detail.made_area,detail.destination,
                detail.source_area,detail.levy,detail.hs_code,detail.hs_code_desc,h.hsCodeDescEn
         from ecss_declaration_detail detail
-                 left join ecss_hsCode h on detail.hs_code=h.HsCode and detail.site=h.Site and detail.hs_code_desc=h.hsCodeDesc and detail.brand=h.brand
-        where detail.site=#{site} and declaration_no=#{declarationNo}
+                 left join ecss_declaration_header hdr on detail.site=hdr.site and detail.declaration_no=hdr.declaration_no
+                 left join ecss_CoDelNotifyHeader nh on hdr.site=nh.site and hdr.delNo=nh.delNo
+                 left join ecss_hsCode h on detail.hs_code=h.HsCode and detail.site=h.Site and detail.hs_code_desc=h.hsCodeDesc and detail.brand=h.brand and nh.bu_no=h.BuNo
+        where detail.site=#{site} and detail.declaration_no=#{declarationNo}
     </select>
 
     <select id="getEcssCoDelNotifyHeader" resultType="EcssCoDelNotifyHeaderData">