bug修改

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/shipment/mapper/ShipmentPackingProductMapper.xml

@@ -93,22 +93,24 @@
 
     <select id="getCustomsProductList" resultMap="shipmentPackingProductResultMap">
         SELECT
-            t2.id,
-            t2.contract_product_id,
-            t2.product_name,
-            t2.product_name_en,
-            t2.price,
-            t2.product_main_img,
-            t2.declared_price,
-            t2.customs_code,
-            t2.declare_remark
+        t2.id,
+        t2.contract_product_id,
+        t2.product_name,
+        t2.product_name_en,
+        t2.price,
+        t2.product_main_img,
+        t2.declared_price,
+        t2.customs_code,
+        t2.declare_remark
         FROM
-            t_erp_shipment_packing t1
+        t_erp_shipment_packing t1
         INNER JOIN t_erp_shipment_packing_product t2 ON t2.shipment_packing_id = t1.id
         <where>
             t1.tenant_id = #{tenantId}
             AND t1.batch_code = #{batchCode}
         </where>
+        ORDER BY
+        t2.product_name,t2.product_name_en
     </select>
 
     <select id="getProductsByBatchCode" resultType="com.alibaba.fastjson.JSONObject">
@@ -211,7 +213,7 @@
             AND t1.batch_code = #{batchCode}
         </where>
         ORDER BY
-            t1.create_time ASC
+        t2.product_name,t2.product_name_en
     </select>
 
     <select id="getByBatchCode2" resultMap="shipmentPackingProductResultMap">