md
This commit is contained in:
linfso
parent
d3954e4168
commit
b6f2d3c857
@ -192,12 +192,30 @@ public class EmisWaybillController extends BaseController
|
||||
}
|
||||
|
||||
// @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
|
||||
// @JacksonFilter(exclude= {},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||
// ,"receiveCounty","receiveAddress",
|
||||
// ,"sendCounty","sendAddress",
|
||||
// "sendCity","sendCounty","sendAddress",
|
||||
|
||||
@JacksonFilter(include= {
|
||||
"id","orderSn","billCode","orderStatus","waybillStatus",
|
||||
"orderType","sendDate","customerCode","customerName",
|
||||
"receiveName",
|
||||
"receiveCountry","receiveCountryName",
|
||||
"receiveProvince","receiveProvinceName",
|
||||
"receiveCity", "receiveCityName",
|
||||
"sendName",
|
||||
"sendCountry","sendCountryName",
|
||||
"sendProvince","sendProvinceName",
|
||||
"sendCity","sendCityName",
|
||||
"transLineType","transLineName",
|
||||
"productType","productName"
|
||||
|
||||
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||
@RequestMapping("/listSimple")
|
||||
public TableDataInfo listSimple(EmisWaybill emisWaybill)
|
||||
{
|
||||
startPage();
|
||||
emisWaybill.setCreateSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
// emisWaybill.setCreateSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@ -352,8 +352,23 @@ public class EmisWaybill extends BaseEntity
|
||||
private List<EmisWaybillFeeitem> feeitemList;
|
||||
private List<EmisWaybillAttachment> attachmentList;
|
||||
|
||||
|
||||
private String sendSiteName;
|
||||
|
||||
|
||||
/* 扩展信息 */
|
||||
private String receiveCountryName;
|
||||
private String receiveProvinceName;
|
||||
private String receiveCityName;
|
||||
|
||||
private String sendCountryName;
|
||||
private String sendProvinceName;
|
||||
private String sendCityName;
|
||||
|
||||
// private String transLineName;
|
||||
private String productName;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -163,8 +163,41 @@
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createSite" column="create_site" />
|
||||
<result property="updateSite" column="update_site" />
|
||||
|
||||
|
||||
<association property="receiveCountryName" column="receive_country" select="selectCountryNameByCode"/>
|
||||
<association property="receiveProvinceName" column="receive_province" select="selectRegionNameByCode"/>
|
||||
<association property="receiveCityName" column="receive_city" select="selectRegionNameByCode"/>
|
||||
|
||||
<association property="sendCountryName" column="send_country" select="selectCountryNameByCode"/>
|
||||
<association property="sendProvinceName" column="send_province" select="selectRegionNameByCode"/>
|
||||
<association property="sendCityName" column="send_city" select="selectRegionNameByCode"/>
|
||||
|
||||
<association property="productName" column="product_type" select="selectProdNameByCode"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
|
||||
select a.name from emis_country a where a.code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectRegionNameByCode" parameterType="String" resultType="string">
|
||||
select a.region_name from emis_region a where a.region_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
|
||||
select a.site_name from emis_site a where a.site_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
|
||||
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectProdNameByCode" parameterType="String" resultType="string">
|
||||
select a.prod_name from emis_trans_product a where a.prod_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
<sql id="selectEmisWaybillVo">
|
||||
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, 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, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, 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, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill
|
||||
</sql>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user