md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java

@@ -396,6 +396,34 @@ public class EmisWaybillController extends EmisBaseController
         return getDataTable(list);
     }
 
+
+    @RequestMapping("/selectEmisWaybillByMutiBillCode")
+    public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill)
+    {
+        startPage();
+
+        // 设置通用权限查询参数
+        setPrivParams(emisWaybill);
+
+        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
+
+        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+        return getDataTable(list);
+    }
+
+
     @JacksonFilter(include= {
             "orderSn","billCode","orderStatus","waybillStatus", "sendDate","blPrint","printDate","printManCode"
             ,"printManName"

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java

@@ -87,7 +87,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     public int deleteEmisWaybillByIds(Long[] ids);
 
 
-    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes);
+    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill);
 
 
     // 改变状态

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java

@@ -159,6 +159,6 @@ public interface IEmisWaybillService
      * @param billCodes
      * @return
      */
-    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes);
+    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill);
 
 }

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -1094,8 +1094,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
     @Override
-    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes){
-        return emisWaybillMapper.selectEmisWaybillByMutiBillCode(billCodes);
+    public List<EmisWaybill> selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill){
+        return emisWaybillMapper.selectEmisWaybillByMutiBillCode(emisWaybill);
     }
 
 

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -351,15 +351,26 @@
     </select>
 
 <!--    多个运单查询-->
-    <select id="selectEmisWaybillByMutiBillCode" parameterType="String" resultMap="EmisWaybillResult">
-        select
-            id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, carry_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remark, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
-        from emis_waybill
-        where  billCode in
-            <foreach item="id" collection="array" open="(" separator="," close=")">
-                #{billCode}
-            </foreach>
+    <select id="selectEmisWaybillByMutiBillCode" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
+        <include refid="selectEmisWaybillVo"/>
+        where FIND_IN_SET(`bill_code`,#{billCode}
 
+        ORDER BY
+        <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
+            FIELD
+            <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
+                #{item}
+            </foreach>
+            ,
+        </if>
+        <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
+            FIELD
+            <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
+                #{item}
+            </foreach>
+            ,
+        </if>
+        a.create_time desc
     </select>
 
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">