From 61bfbad2d3d3f832402198b40f419a6a22cd2ccf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 24 Jun 2024 09:54:32 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisTmsScanRecordController.java  | 2 +-
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index a973e59c1..c4f9fc8c8 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -243,7 +243,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
         // 设置通用权限查询参数
         setPrivParams(emisTmsScanRecord);
 
-        if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
+        if(!StringUtils.isEmpty(emisTmsScanRecord.getMainBillCode())){
             emisTmsScanRecord.setBillCode(WaybillHelper.formatQueryValue(emisTmsScanRecord.getBillCode()));
             String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
             if(billCodeSortList.length>1){
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 fd0cb7932..66de45eab 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
@@ -574,7 +574,7 @@ public class EmisBaseService {
 
              String transferCompanyName="";
              String transferBillCode="";
-             EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode());
+             EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getMainBillCode());
              if(emisTmsTransferTrace!=null) {
                  if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferExpress())) {
                      transferCompanyName = DictUtils.getDictLabel("emis_express_code", emisTmsTransferTrace.getTransferExpress());
@@ -595,7 +595,7 @@ public class EmisBaseService {
          // 问题件
          else if(ScanType.ISSUE.opCode.equals(scanType)){
 
-             EmisWaybill waybill = getWaybillByBillCode(scanRecord.getBillCode());
+             EmisWaybill waybill = getWaybillByBillCode(scanRecord.getMainBillCode());
 
              content="问题件 "+waybill.getProblemTypeName()+"("+waybill.getProblemCause()+")";
              if(isInner){