From bf499f14686cffc62e53f4581932af0c0e7ef99d Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 18 Jun 2024 06:01:00 +0800 Subject: [PATCH] md --- .../service/impl/EmisTmsScanRecordServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 9f52ca1d3..af8b22170 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -198,9 +198,10 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(billCode,scanType,getCurrentUser().getOwnerSiteCode(),scanDate); if(scanCnt>0){ scanResultItem.setResult("fail"); - scanResultItem.setMessage("重复扫描"); + scanResultItem.setMessage(""+billCode+"已["+scanTypeLabel+"]"); itemList.add(scanResultItem); - throw new EmisBizError(EmisBizErrorType.EXISTS,"重复扫描"); + String scanTypeLabel=DictUtils.getDictLabel("emis_scan_type",scanType); + throw new EmisBizError(EmisBizErrorType.EXISTS,""+billCode+"已["+scanTypeLabel+"]"); // continue; } @@ -313,9 +314,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(billCode,scanType,getCurrentUser().getOwnerSiteCode(),scanDate); if(scanCnt>0){ scanResultItem.setResult("fail"); - scanResultItem.setMessage("重复扫描"); + scanResultItem.setMessage("单号["+billCode+"]重复扫描"); itemList.add(scanResultItem); - throw new EmisBizError(EmisBizErrorType.EXISTS,"重复扫描"); + // T12312321已[转件扫描] + String scanTypeLabel=DictUtils.getDictLabel("emis_scan_type",scanType); + throw new EmisBizError(EmisBizErrorType.EXISTS,""+billCode+"已["+scanTypeLabel+"]"); } // 生成扫描记录并填充公共数据