From bd558537cb45606ed2eb5cf502ee2e86e7d8b733 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 4 Jul 2025 08:18:25 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisTmsCostFeeServiceImpl.java | 4 ++-- .../src/main/resources/mapper/EmisTmsCostFeeMapper.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index bb725a863..530c28137 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -376,9 +376,9 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT splitItem.setTransWeight(mainWaybill.getBillWeight()); // 运输重量 splitItem.setTransVolume(mainWaybill.getTotalVolume()); // 运输体积 - // 取件员，取件网点 + // 派件员，派件网点 String dispathEmpName=null; - if(!StringUtils.isEmpty(mainWaybill.getTakePieceEmployeeCode())) { + if(!StringUtils.isEmpty(mainWaybill.getDispatchManCode())) { SysUser dispathEmpUser = getEmisStaffByCode(mainWaybill.getDispatchManCode()); if (dispathEmpUser != null) { dispathEmpName = dispathEmpUser.getEmpName(); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml index 74a3fe835..b51ccab40 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml @@ -136,7 +136,15 @@ a.settlement_weight as settlementWeight, a.freight as freight, a.bl_virtual as blVirtual, - a.master_bill_code as masterBillCode + a.master_bill_code as masterBillCode, + a.send_date as sendDate, + a.take_piece_employee_code as takePieceEmployeeCode, + a.send_site_code as sendSiteCode, + a.dispatch_man_code as dispatchManCode, + a.dispatch_man_code as dispatchManCode, + a.dispatch_underling_site_code as dispatchUnderlingSiteCode, + a.dispatch_date as dispatchDate + FROM emis_waybill a WHERE a.del_flag = '0' and bill_code=#{billCode}