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

demand: TMS系统 - 运输管理 - 漏组批次订单界面 - 查询增加根据销售联系人、回款联系人、录入人查询

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-09-09 17:48:42 +08:00
parent 76c8a183d3
commit 6826a06797
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java
View File

@ -138,6 +138,18 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
/** 人工审核备注 */
private String manualRemark;
/* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1*/
/* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1 */
private String blManual;
/* 收款人 */
@TableField(exist = false)
private String payee;
/* 销售员 */
@TableField(exist = false)
private String salesmen;
/* 录单人姓名 */
@TableField(exist = false)
private String registerManName;
}

25
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
View File

@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dispatchUnderlingSiteName" column="dispatch_underling_site_name" />
<result property="manual_remark" column="manualRemark" />
<result property="bl_manual" column="blManual" />
<result property="payee" column="payee" />
<result property="salesmen" column="salesmen" />
<result property="registerManName" column="registerManName" />
</resultMap>
<sql id="selectEmisTmsSiteBatchMissVo">
@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code,
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
w.payee, w.salesmen, u.emp_name as registerManName,
(SELECT GROUP_CONCAT(s.name)
FROM emis_supplier s
WHERE FIND_IN_SET(s.code, m.supplier_code)
@ -81,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join emis_trans_line k on w.trans_line_type=k.line_code and k.del_flag='0'
left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0'
left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0'
left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0'
</sql>
<!-- <select id="selectEmisTmsSiteBatchMissList" parameterType="EmisTmsSiteBatchMiss" resultMap="EmisTmsSiteBatchMissResult">-->
@ -149,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
null as manager, null as trans_manager,
w.payee, w.salesmen, u.emp_name as registerManName,
(SELECT GROUP_CONCAT(s.site_name ORDER BY FIND_IN_SET(s.site_code, w.start_site_code))
FROM emis_site s
WHERE FIND_IN_SET(s.site_code, w.start_site_code) AND s.del_flag = 0) as start_site_name,
@ -168,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join emis_site s2 on w.dispatch_underling_site_code=s2.site_code and s2.del_flag=0
left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0
left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0
left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0'
<where>
b.site_batch_status = '1'
<if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
@ -213,6 +220,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode})
</if>
<if test="payee != null and payee != ''">
AND w.payee like concat('%', #{payee}, '%')
</if>
<if test="salesmen != null and salesmen != ''">
AND w.salesmen like concat('%', #{salesmen}, '%')
</if>
<if test="registerManName != null and registerManName != ''">
AND u.emp_name like concat('%', #{registerManName}, '%')
</if>
</where>
</when>
<otherwise>
@ -314,6 +330,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endSendDate != null and params.endSendDate != ''">
and w.send_date <![CDATA[ <= ]]> #{params.endSendDate}
</if>
<if test="payee != null and payee != ''">
AND w.payee like concat('%', #{payee}, '%')
</if>
<if test="salesmen != null and salesmen != ''">
AND w.salesmen like concat('%', #{salesmen}, '%')
</if>
<if test="registerManName != null and registerManName != ''">
AND u.emp_name like concat('%', #{registerManName}, '%')
</if>
</where>
order by m.bill_code desc
</otherwise>