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-06-19 15:49:08 +08:00
parent 1421701c06
commit 73c49c43e2
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
View File

@ -11,6 +11,7 @@
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -67,6 +68,19 @@ public class EmisTmsCostFeeController extends BaseController
public TableDataInfo list(EmisTmsCostFee emisTmsCostFee) public TableDataInfo list(EmisTmsCostFee emisTmsCostFee)
{ {
startPage(); startPage();
if(!StringUtils.isEmpty(emisTmsCostFee.getBillCode())){
emisTmsCostFee.setBillCode(WaybillHelper.formatQueryValue(emisTmsCostFee.getBillCode()));
}
if(!StringUtils.isEmpty(emisTmsCostFee.getBatchNo())){
emisTmsCostFee.setBatchNo(WaybillHelper.formatQueryValue(emisTmsCostFee.getBatchNo()));
}
if(!StringUtils.isEmpty(emisTmsCostFee.getTransSignNo())){
emisTmsCostFee.setTransSignNo(WaybillHelper.formatQueryValue(emisTmsCostFee.getTransSignNo()));
}
List<EmisTmsCostFee> list = emisTmsCostFeeService.selectEmisTmsCostFeeList(emisTmsCostFee); List<EmisTmsCostFee> list = emisTmsCostFeeService.selectEmisTmsCostFeeList(emisTmsCostFee);
return getDataTable(list); return getDataTable(list);
} }

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
View File

@ -116,6 +116,9 @@ public class EmisTmsCostFee extends BaseEntity
private Date calcDate; private Date calcDate;
// --- 扩展 // --- 扩展
// 用于根据运单号查询
private String billCode;
// 关联单号 // 关联单号
private List<EmisTmsCostFeeRel> billRelList; private List<EmisTmsCostFeeRel> billRelList;

16
emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
View File

@ -54,17 +54,17 @@
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="costNo != null and costNo != ''"> and cost_no = #{costNo}</if> <if test="costNo != null and costNo != ''"> and cost_no = #{costNo}</if>
<if test="costName != null and costName != ''"> and cost_name like concat('%', #{costName}, '%')</if> <if test="costName != null and costName != ''"> and cost_name like concat('%', #{costName}, '%')</if>
<if test="batchNo != null and batchNo != ''"> and batch_no like concat('%', #{batchNo}, '%')</if> <if test="batchNo != null and batchNo != ''"> and FIND_IN_SET(batch_no,#{batchNo}) </if>
<if test="feeType != null and feeType != ''"> and fee_type = #{feeType}</if> <if test="feeType != null and feeType != ''"> and fee_type = #{feeType}</if>
<if test="splitType != null and splitType != ''"> and split_type = #{splitType}</if> <if test="splitType != null and splitType != ''"> and split_type = #{splitType}</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if> <if test="transType != null and transType != ''"> and trans_type=#{transType}</if>
<if test="transSignNo != null and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if> <if test="transSignNo != null and transSignNo != ''"> and FIND_IN_SET(trans_sign_no,#{transSignNo})</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if> <if test="supplierCode != null and supplierCode != ''"> and supplier_code=#{supplierCode} </if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if> <if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="sendPlace != null and sendPlace != ''"> and send_place like concat('%', #{sendPlace}, '%')</if> <if test="sendPlace != null and sendPlace != ''"> and send_place=#{sendPlace}</if>
<if test="destPlace != null and destPlace != ''"> and dest_place like concat('%', #{destPlace}, '%')</if> <if test="destPlace != null and destPlace != ''"> and dest_place=#{destPlace}</if>
<if test="costFee != null "> and cost_fee = #{costFee}</if> <if test="costFee != null "> and cost_fee = #{costFee}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if> <if test="billMonth != null and billMonth != ''"> and bill_month=#{billMonth}</if>
<if test="tradeDate != null "> and trade_date = #{tradeDate}</if> <if test="tradeDate != null "> and trade_date = #{tradeDate}</if>
<if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if> <if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
<if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if> <if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>
@ -96,7 +96,7 @@
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
and exists ( and exists (
select 1 from emis_tms_cost_fee_rel brel where brel.cost_no=a.cost_no and FIND_IN_SET(brel.bill_code,#{params.billCode}) select 1 from emis_tms_cost_fee_rel etcfl where etcfl.cost_no=a.cost_no and FIND_IN_SET(etcfl.bill_code,#{params.billCode})
) )
</if> </if>