托书发票合并数据

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/SyShippingOrderMapper.java

@@ -69,4 +69,7 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
     //查询U8 服务供应商
     public List<SyShippingOrder> queryU8ventory();
 
+    //查询合并报关要素（申报要素-发票）使用
+    public List<SyShippingOrderItem> elmentsList(String id);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -217,4 +217,12 @@ group by order_number
 	   select cVenCode as cvencode,cvenName as cvenname from Vendor where bVenService = '1'
     </select>
 
+    <select id="elmentsList"  resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
+        select a.* from sy_shipping_order_item a
+        left join sy_declaration_elements b
+        on a.elements_Id = b.id
+        where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id} group by b.hs_code
+
+    </select>
+
 </mapper>