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 2024-06-24 09:54:32 +08:00
parent 7fd19ec66d
commit 61bfbad2d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -243,7 +243,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
// 设置通用权限查询参数 // 设置通用权限查询参数
setPrivParams(emisTmsScanRecord); setPrivParams(emisTmsScanRecord);
if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){ if(!StringUtils.isEmpty(emisTmsScanRecord.getMainBillCode())){
emisTmsScanRecord.setBillCode(WaybillHelper.formatQueryValue(emisTmsScanRecord.getBillCode())); emisTmsScanRecord.setBillCode(WaybillHelper.formatQueryValue(emisTmsScanRecord.getBillCode()));
String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(","); String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){

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

@ -574,7 +574,7 @@ public class EmisBaseService {
String transferCompanyName=""; String transferCompanyName="";
String transferBillCode=""; String transferBillCode="";
EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode()); EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getMainBillCode());
if(emisTmsTransferTrace!=null) { if(emisTmsTransferTrace!=null) {
if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferExpress())) { if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferExpress())) {
transferCompanyName = DictUtils.getDictLabel("emis_express_code", emisTmsTransferTrace.getTransferExpress()); transferCompanyName = DictUtils.getDictLabel("emis_express_code", emisTmsTransferTrace.getTransferExpress());
@ -595,7 +595,7 @@ public class EmisBaseService {
// 问题件 // 问题件
else if(ScanType.ISSUE.opCode.equals(scanType)){ else if(ScanType.ISSUE.opCode.equals(scanType)){
EmisWaybill waybill = getWaybillByBillCode(scanRecord.getBillCode()); EmisWaybill waybill = getWaybillByBillCode(scanRecord.getMainBillCode());
content="问题件 "+waybill.getProblemTypeName()+"("+waybill.getProblemCause()+")"; content="问题件 "+waybill.getProblemTypeName()+"("+waybill.getProblemCause()+")";
if(isInner){ if(isInner){