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-09-24 06:53:42 +08:00
parent 725ae3cf2f
commit e8f27ac2e4
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -531,9 +531,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode); EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode);
if(emisTmsPack!=null) { if(emisTmsPack!=null) {
try { try {
// 合包发件扫描 // 合包发件扫描
if( scanType.equals(ScanType.DEPARTURE.opCode) if( scanType.equals(ScanType.DEPARTURE.opCode)
|| scanType.equals(ScanType.CLEARANCE.opCode) || scanType.equals(ScanType.CLEARANCE.opCode)

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

@ -1801,6 +1801,7 @@
<if test="sendCompany != null and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if> <if test="sendCompany != null and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if> <if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if> <if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
<if test="params.beginDate != null and params.beginDate != ''"> <if test="params.beginDate != null and params.beginDate != ''">

BIN
emis-biz/src/main/resources/tpl/TAN-GOT-130.pdf
View File

Binary file not shown.