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-07-21 15:18:52 +08:00
parent 9db6240eb1
commit f803f95be0
4 changed files with 12 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/IEmisTmsSiteBatchService.java
View File

@ -9,6 +9,7 @@
*/
package com.xdadan.erp.emis.service;
import java.util.Date;
import java.util.List;
import com.xdadan.erp.common.core.audit.IDataAuditService;
@ -38,7 +39,7 @@ public interface IEmisTmsSiteBatchService extends IDataAuditService
* @param carNo
* @return
*/
public List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo);
public List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode, String carNo, Date etd);
/**
* 查询一级网点TMS组批次列表

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -954,6 +954,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
// 更新账单收款状态 收款金额
log.debug("reCalcSettleBillPayStatus===>收款金额:{},应收:{}",totalMoney,oldBill.getRecMoney());
if( totalAllPayMoney.compareTo(BigDecimal.ZERO) == 0 ){
newBill.setPaymentStatus("0");
emisSettleBillMapper.updateEmisSettleBill(newBill);

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

@ -86,11 +86,12 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
}
@Override
public List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo)
public List<EmisTmsSiteBatch> selectTmsSiteBatchBySupplerAndCarNo(String supplierCode,String carNo, Date etd)
{
EmisTmsSiteBatch emisTmsSiteBatch = new EmisTmsSiteBatch();
emisTmsSiteBatch.setSupplierCode(supplierCode);
emisTmsSiteBatch.setCarNo(carNo);
emisTmsSiteBatch.setEtd(etd);
return emisTmsSiteBatchMapper.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch);
}

8
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
View File

@ -352,7 +352,13 @@
<select id="selectTmsSiteBatchBySupplerAndCarNo" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, total_settlement_weight, bl_profit, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering
from emis_tms_site_batch a
where a.del_flag='0' and a.supplier_code = #{supplierCode} and a.car_no = #{carNo} limit 1
where a.del_flag='0'
and a.supplier_code = #{supplierCode}
and a.car_no = #{carNo}
<if test="etd != null and etd != ''">
and DATE_FORMAT(a.etd,'%Y%m%d')= DATE_FORMAT(#{etd},'%Y%m%d')
</if>
limit 3
</select>
<select id="selectTmsSiteBatchByBatchNo" parameterType="String" resultMap="EmisTmsSiteBatchResult">