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

Merge pull request 'demand: 财务中心费用审核无法看到驳回原因bug修复，中心运单查询无法根据多个寄件网点查询bug修复 运单补打印部分模板没有取始发网点bug修复' (#126) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/126
This commit is contained in:
heyu 2025-07-19 16:37:29 +08:00
commit 661f0b396a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
View File

@ -306,6 +306,7 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApply.setDestConfirmNote(spr.getDestConfirmNote());
emisWaybillAjustApply.setCenterConfirmNote(spr.getCenterConfirmNote());
emisWaybillAjustApplyService.auditCenterNoPass(emisWaybillAjustApply);
}catch (Exception ex){

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2623,6 +2623,9 @@ public class EmisBaseService {
if (StringUtils.isBlank(waybill.getStartSiteCode())) {
waybill.setStartSiteCode(waybill.getSendSiteCode());
}
if(StringUtils.isBlank(waybill.getStartSiteName())){
waybill.setStartSiteName(waybill.getSendSiteName());
}
EmisSite startSite = getSiteByCode(waybill.getStartSiteCode());
// 计算三段码 目的网点2字码+目的地名称
@ -2760,7 +2763,7 @@ public class EmisBaseService {
extData.put("k7",WaybillHelper.removeUnSeeChar(k7));
extData.put("k8",WaybillHelper.removeUnSeeChar(startSite.getSiteNameEn()));
extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getSendSiteName()));
extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getStartSiteName()));
extData.put("k9",WaybillHelper.removeUnSeeChar(destSite.getSiteNameEn()));
extData.put("k11",WaybillHelper.removeUnSeeChar(destSite.getSiteName()));

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

@ -1300,7 +1300,7 @@
<if test="paymentRemark != null and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
<if test="orderRemark != null and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
<if test="sendSiteCode != null and sendSiteCode != ''">and (a.send_site_code=#{sendSiteCode} or a.start_site_code=#{sendSiteCode})
<if test="sendSiteCode != null and sendSiteCode != ''">and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
</if>
<if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>