aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-17 04:12:13 +08:00
parent 3737275d9f
commit 213c55d600
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -347,7 +347,7 @@ public class EmisWaybill extends BaseEntity
private List<EmisWaybillFeeitem> feeitemList;
private List<EmisWaybillAttachment> attachmentList;
private String sendSiteName;
/* 扩展信息 */
private String receiveCountryName;
@ -358,10 +358,19 @@ public class EmisWaybill extends BaseEntity
private String sendProvinceName;
private String sendCityName;
// private String transLineName;
private String productName;
private String transLineTypeName;
private String productTypeName;
/* 寄件客户客户名称 */
private String customerName;
// 取件员
private String takePieceEmployeeName;
private String sendSiteName;
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -240,6 +240,8 @@ public class WaybillOrder implements Serializable {
private String sendSiteName;
/* 是否生成子单 1-是 0-否 */
private String blGenSubbill;
/**
@ -464,7 +466,7 @@ public class WaybillOrder implements Serializable {
voItem.setBlMessage(dbWaybill.getBlMessage());
voItem.setBlAcceptMessage(dbWaybill.getBlAcceptMessage());
// voItem.setBlGenSubbill(dbWaybill.getBlGenSubbill());
voItem.setBlGenSubbill(dbWaybill.getBlGenSubbill());
// voItem.setSignMan(dbWaybill.getSignMan());
// voItem.setSignManCode(dbWaybill.getSignManCode());
// voItem.setSignSiteCode(dbWaybill.getSignSiteCode());

15
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -173,10 +173,18 @@
<association property="sendProvinceName" column="send_province" select="selectRegionNameByCode"/>
<association property="sendCityName" column="send_city" select="selectRegionNameByCode"/>
<association property="productName" column="product_type" select="selectProdNameByCode"/>
<association property="productTypeName" column="product_type" select="selectProdNameByCode"/>
<association property="transLineTypeName" column="trans_line_type" select="selectLineNameByCode"/>
<association property="sendSiteName" column="send_site_code" select="selectSiteNameByCode"/>
</resultMap>
<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="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
</select>
@ -198,6 +206,11 @@
select a.prod_name from emis_trans_product a where a.prod_code = #{code} limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
select a.line_name from emis_trans_line a where a.line_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>