diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
index 949ef3acb..859d9b958 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
@@ -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){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 5ce758f16..63c531b98 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -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()));
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index c1e9e1053..babd0ad05 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1300,7 +1300,7 @@
and payment_remark like concat('%', #{paymentRemark}, '%')
and order_remark like concat('%', #{orderRemark}, '%')
- and (a.send_site_code=#{sendSiteCode} or a.start_site_code=#{sendSiteCode})
+ and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
and a.remark like concat('%', #{remark}, '%')