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;
}

15
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,6 +306,9 @@
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,
@ -346,6 +354,7 @@
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>
@ -390,6 +399,9 @@
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,
@ -402,6 +414,7 @@
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'
@ -435,6 +448,7 @@
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>