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 2025-03-06 13:30:56 +08:00
parent e3022cee39
commit 1aee402af4
2 changed files with 111 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,4 +648,12 @@ public class EmisWaybill extends BaseEntity
@DataAuditField(fieldComment = "录单备注")
private String remark;
// 下单客户:电话,昵称,头像
@TableField(exist = false)
private String customerPhone;
@TableField(exist = false)
private String customerNickName;
@TableField(exist = false)
private String customerAvatar;
}

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

@ -212,6 +212,11 @@
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="billPicGoodsRmk" column="goods_pics" />
<result property="customerPhone" column="customer_phone" />
<result property="customerNickName" column="customer_nick_name" />
<result property="customerAvatar" column="customer_avatar" />
</resultMap>
<resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">
@ -301,95 +306,9 @@
a1.site_name as send_center_name,
a2.site_name as destination_center_name,
p.emp_name as dispatch_man_name,q.site_name as print_site_name,
r.emp_name as print_man_name,
s.emp_name as take_piece_employee_name,
t.emp_name as operate_employee_name,
u.site_name as register_site_name,
v.emp_name as register_man_name,
w.site_name as current_site_name,
x.site_name as next_site_name,
y.site_name as last_site_name,
z.type_name as problem_type_name
from emis_waybill a
left join emis_country b on a.receive_country=b.code and b.del_flag='0'
left join emis_country c on a.send_country=c.code and c.del_flag='0'
left join emis_region d on a.receive_province=d.region_code and d.del_flag='0'
left join emis_region e on a.receive_city=e.region_code and e.del_flag='0'
left join emis_region f on a.receive_county=f.region_code and f.del_flag='0'
left join emis_region g on a.send_province=g.region_code and g.del_flag='0'
left join emis_region h on a.send_city=h.region_code and h.del_flag='0'
left join emis_region i on a.send_county=i.region_code and i.del_flag='0'
left join emis_trans_product j on a.product_type=j.prod_code and j.del_flag='0'
left join emis_trans_line k on a.trans_line_type=k.line_code and k.del_flag='0'
left join emis_site l on a.send_site_code=l.site_code and l.del_flag=0 and l.del_flag='0'
left join emis_site m on a.dispatch_underling_site_code=m.site_code and m.del_flag=0
left join emis_destination n on a.destination_code=n.dest_code and n.del_flag='0'
left join emis_site o on a.dispatch_site_code=o.site_code and o.del_flag='0'
left join sys_user p on a.dispatch_man_code=p.emp_code and p.del_flag='0'
left join emis_site q on a.print_site=q.site_code and q.del_flag='0'
left join sys_user r on a.print_man_code=r.emp_code and r.del_flag='0'
left join sys_user s on a.take_piece_employee_code=s.emp_code and s.del_flag='0'
left join sys_user t on a.operate_employee_code=t.emp_code and t.del_flag='0'
left join emis_site u on a.register_site_code=u.site_code and u.del_flag='0'
left join sys_user v on a.register_man_code=v.emp_code and v.del_flag='0'
left join emis_site w on a.current_site_code=w.site_code and w.del_flag='0'
left join emis_site x on a.next_site_code=x.site_code and x.del_flag='0'
left join emis_site y on a.last_site_code=y.site_code and y.del_flag='0'
left join emis_problem_type z on a.problem_type=z.id and z.del_flag='0'
left join emis_site a1 on a.send_center_code=a1.site_code and a1.del_flag='0'
left join emis_site a2 on a.destination_center_code=a2.site_code and a2.del_flag='0'
</sql>
<!-- 单个对象可以返回子单数据 -->
<sql id="selectEmisWaybillDetailVo">
select
a.id,a.order_sn, a.cust_order_id, a.bill_code,a.bill_code_sub, a.order_status, a.waybill_status,
a.order_type, a.order_date, a.user_id, a.customer_code, a.customer_name, a.open_id, a.receive_name,
a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,
a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
a.into_warehouse_bill_code, a.warehouse_in_no, a.customer_delivery_begin_time, a.customer_delivery_end_time,
a.goods_type, a.goods_info, a.goods_pics, a.bl_prepare_in_freight, a.prepare_in_est_fee,
a.prepare_in_real_fee, a.prepare_in_express, a.prepare_in_bill_code, a.prepare_in_remark,
a.prepare_in_supplier, a.total_weight, a.total_volume, a.parcel_qty, a.bill_weight, a.volume_weight, a.currency,
a.settlement_weight, a.scan_weight, a.fee_weight, a.freight, a.real_payment_type, a.real_fee, a.bl_special_quote,
a.bl_over_long, a.bl_bill, a.bl_bill_text, a.bl_over_weight, a.over_weight_number, a.fee_remark, a.third_code,
a.real_value, a.bl_insure, a.insure_value, a.insure_value_currency, a.insure_fee_currency, a.insure_fee, a.insure_remark,
a.insure_site_code, a.insure_date, a.bl_print, a.print_man_code, a.print_site, a.print_date, a.print_count, a.bl_disp_fd,
a.transfer_code, a.transfer_billcode, a.disp_fd_date, a.disp_fd_reason, a.current_site_code, a.next_site_code, a.last_site_code,
a.register_site_code, a.register_date, a.register_man_code, a.take_piece_employee_code, a.send_site_code, a.send_center_code,
a.send_date, a.dispatch_man_code, a.dispatch_date, a.dispatch_site_code, a.produce_bill_date, a.produce_bill_site_code,
a.produce_bill_man_code, a.destination_code, a.destination_province, a.destination_city, a.destination_county,
a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code,
a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill,
a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset,
a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
a.remark, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
b.name as receive_country_name,c.name as send_country_name,
d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
g.region_name as send_province_name,h.region_name as send_city_name,i.region_name as send_county_name,
j.prod_name as product_type_name,k.line_name as trans_line_type_name,
l.site_name as send_site_name,m.site_name as dispatch_underling_site_name,
n.dest_name as destination_name,o.site_name as dispatch_site_name,
a1.site_name as send_center_name,
a2.site_name as destination_center_name,
a3.phone as customer_phone,
a3.nick_name as customer_nick_name,
a3.avatar as customer_avatar,
p.emp_name as dispatch_man_name,q.site_name as print_site_name,
r.emp_name as print_man_name,
@ -435,6 +354,101 @@
left join emis_site a1 on a.send_center_code=a1.site_code and a1.del_flag='0'
left join emis_site a2 on a.destination_center_code=a2.site_code and a2.del_flag='0'
left join emis_customer_user a3 on a.customer_code=a3.customer_code and a3.del_flag='0'
</sql>
<!-- 单个对象可以返回子单数据 -->
<sql id="selectEmisWaybillDetailVo">
select
a.id,a.order_sn, a.cust_order_id, a.bill_code,a.bill_code_sub, a.order_status, a.waybill_status,
a.order_type, a.order_date, a.user_id, a.customer_code, a.customer_name, a.open_id, a.receive_name,
a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,
a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
a.into_warehouse_bill_code, a.warehouse_in_no, a.customer_delivery_begin_time, a.customer_delivery_end_time,
a.goods_type, a.goods_info, a.goods_pics, a.bl_prepare_in_freight, a.prepare_in_est_fee,
a.prepare_in_real_fee, a.prepare_in_express, a.prepare_in_bill_code, a.prepare_in_remark,
a.prepare_in_supplier, a.total_weight, a.total_volume, a.parcel_qty, a.bill_weight, a.volume_weight, a.currency,
a.settlement_weight, a.scan_weight, a.fee_weight, a.freight, a.real_payment_type, a.real_fee, a.bl_special_quote,
a.bl_over_long, a.bl_bill, a.bl_bill_text, a.bl_over_weight, a.over_weight_number, a.fee_remark, a.third_code,
a.real_value, a.bl_insure, a.insure_value, a.insure_value_currency, a.insure_fee_currency, a.insure_fee, a.insure_remark,
a.insure_site_code, a.insure_date, a.bl_print, a.print_man_code, a.print_site, a.print_date, a.print_count, a.bl_disp_fd,
a.transfer_code, a.transfer_billcode, a.disp_fd_date, a.disp_fd_reason, a.current_site_code, a.next_site_code, a.last_site_code,
a.register_site_code, a.register_date, a.register_man_code, a.take_piece_employee_code, a.send_site_code, a.send_center_code,
a.send_date, a.dispatch_man_code, a.dispatch_date, a.dispatch_site_code, a.produce_bill_date, a.produce_bill_site_code,
a.produce_bill_man_code, a.destination_code, a.destination_province, a.destination_city, a.destination_county,
a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code,
a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill,
a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset,
a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
a.remark, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
b.name as receive_country_name,c.name as send_country_name,
d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
g.region_name as send_province_name,h.region_name as send_city_name,i.region_name as send_county_name,
j.prod_name as product_type_name,k.line_name as trans_line_type_name,
l.site_name as send_site_name,m.site_name as dispatch_underling_site_name,
n.dest_name as destination_name,o.site_name as dispatch_site_name,
a1.site_name as send_center_name,
a2.site_name as destination_center_name,
a3.phone as customer_phone,
a3.nick_name as customer_nick_name,
a3.avatar as customer_avatar,
p.emp_name as dispatch_man_name,q.site_name as print_site_name,
r.emp_name as print_man_name,
s.emp_name as take_piece_employee_name,
t.emp_name as operate_employee_name,
u.site_name as register_site_name,
v.emp_name as register_man_name,
w.site_name as current_site_name,
x.site_name as next_site_name,
y.site_name as last_site_name,
z.type_name as problem_type_name
from emis_waybill a
left join emis_country b on a.receive_country=b.code and b.del_flag='0'
left join emis_country c on a.send_country=c.code and c.del_flag='0'
left join emis_region d on a.receive_province=d.region_code and d.del_flag='0'
left join emis_region e on a.receive_city=e.region_code and e.del_flag='0'
left join emis_region f on a.receive_county=f.region_code and f.del_flag='0'
left join emis_region g on a.send_province=g.region_code and g.del_flag='0'
left join emis_region h on a.send_city=h.region_code and h.del_flag='0'
left join emis_region i on a.send_county=i.region_code and i.del_flag='0'
left join emis_trans_product j on a.product_type=j.prod_code and j.del_flag='0'
left join emis_trans_line k on a.trans_line_type=k.line_code and k.del_flag='0'
left join emis_site l on a.send_site_code=l.site_code and l.del_flag=0 and l.del_flag='0'
left join emis_site m on a.dispatch_underling_site_code=m.site_code and m.del_flag=0
left join emis_destination n on a.destination_code=n.dest_code and n.del_flag='0'
left join emis_site o on a.dispatch_site_code=o.site_code and o.del_flag='0'
left join sys_user p on a.dispatch_man_code=p.emp_code and p.del_flag='0'
left join emis_site q on a.print_site=q.site_code and q.del_flag='0'
left join sys_user r on a.print_man_code=r.emp_code and r.del_flag='0'
left join sys_user s on a.take_piece_employee_code=s.emp_code and s.del_flag='0'
left join sys_user t on a.operate_employee_code=t.emp_code and t.del_flag='0'
left join emis_site u on a.register_site_code=u.site_code and u.del_flag='0'
left join sys_user v on a.register_man_code=v.emp_code and v.del_flag='0'
left join emis_site w on a.current_site_code=w.site_code and w.del_flag='0'
left join emis_site x on a.next_site_code=x.site_code and x.del_flag='0'
left join emis_site y on a.last_site_code=y.site_code and y.del_flag='0'
left join emis_problem_type z on a.problem_type=z.id and z.del_flag='0'
left join emis_site a1 on a.send_center_code=a1.site_code and a1.del_flag='0'
left join emis_site a2 on a.destination_center_code=a2.site_code and a2.del_flag='0'
left join emis_customer_user a3 on a.customer_code=a3.customer_code and a3.del_flag='0'
</sql>
@ -730,7 +744,6 @@
</if>
</select>
<select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/>
<where>