From 965abc8654ba02205982e2be6e1adeb58416260a Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 19 Jun 2024 19:39:37 +0800 Subject: [PATCH] md --- .../service/impl/EmisTmsScanRecordServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 e65b0b61d..7db700f25 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 @@ -215,13 +215,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm int scanCnt = emisTmsScanRecordMapper.checkSiteScanUnique(scanBillCode, scanType, getCurrentUser().getOwnerSiteCode()); if (scanCnt > 0) { scanResultItem.setResult("fail"); - scanResultItem.setMessage("单号[" + scanBillCode + "]重复扫描"); + scanResultItem.setMessage("重复扫描"); itemList.add(scanResultItem); - String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", scanType); - throw new EmisBizError(EmisBizErrorType.EXISTS, "" + scanBillCode + "已[" + scanTypeLabel + "]"); -// continue; + throw new EmisBizError(EmisBizErrorType.EXISTS, "重复扫描"); } + EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode); // 返回数据 @@ -327,11 +326,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm int scanCnt = emisTmsScanRecordMapper.checkSiteScanUnique(scanBillCode, scanType, getCurrentUser().getOwnerSiteCode()); if (scanCnt > 0) { scanResultItem.setResult("fail"); - scanResultItem.setMessage("单号[" + scanBillCode + "]重复扫描"); + scanResultItem.setMessage("重复扫描"); itemList.add(scanResultItem); - // T12312321已[转件扫描] - String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", scanType); - throw new EmisBizError(EmisBizErrorType.EXISTS, "" + scanBillCode + "已[" + scanTypeLabel + "]"); + throw new EmisBizError(EmisBizErrorType.EXISTS, "重复扫描"); }