From 70f4fba5fbc52a24b483adf1e4473612ab43c2a6 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 12 May 2025 11:55:32 +0800 Subject: [PATCH] md --- .../impl/EmisTmsScanRecordServiceImpl.java | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 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 508abd888..cdb8bc5b1 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 @@ -630,14 +630,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1371 问题件类型：出口虚拟单/返货虚拟单/面单删除，若登记了以上三种类型任意问题件 都不允许再做扫描和签收了 - int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); - if (rnt>0) { - scanResultItem.setResult("fail"); - scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); - itemList.add(scanResultItem); - return itemList; - } +// int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); +// if (rnt>0) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); +// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } // 返货虚拟面单、出口虚拟面单；不允许做 派件扫描和签收扫描 // if("1".equals(emisWaybill.getBlIsQuestion()) && (scanType.equals(ScanType.SENT.opCode) || scanType.equals(ScanType.SIGNED.opCode) )){ @@ -782,14 +782,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1371 问题件类型：出口虚拟单/返货虚拟单/面单删除，若登记了以上三种类型任意问题件 都不允许再做扫描和签收了 - int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); - if (rnt>0) { - scanResultItem.setResult("fail"); - scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); - itemList.add(scanResultItem); - return itemList; - } +// int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); +// if (rnt>0) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); +// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); @@ -1075,14 +1075,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1371 问题件类型：出口虚拟单/返货虚拟单/面单删除，若登记了以上三种类型任意问题件 都不允许再做扫描和签收了 - int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); - if (rnt>0) { - scanResultItem.setResult("fail"); - scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); - itemList.add(scanResultItem); - return itemList; - } +// int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); +// if (rnt>0) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); +// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); @@ -1314,14 +1314,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1371 问题件类型：出口虚拟单/返货虚拟单/面单删除，若登记了以上三种类型任意问题件 都不允许再做扫描和签收了 - int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); - if (rnt>0) { - scanResultItem.setResult("fail"); - scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); - itemList.add(scanResultItem); - return itemList; - } +// int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); +// if (rnt>0) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); +// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode); @@ -1465,14 +1465,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } // bug:1371 问题件类型：出口虚拟单/返货虚拟单/面单删除，若登记了以上三种类型任意问题件 都不允许再做扫描和签收了 - int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); - if (rnt>0) { - scanResultItem.setResult("fail"); - scanResultItem.setMessage(mainBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); - itemList.add(scanResultItem); - return itemList; - } +// int rnt=emisWaybillProblemInfoMapper.checkIsNoNeedScanBill(mainBillCode); +// if (rnt>0) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage(mainBillCode + "此单号是虚拟单，不允许扫描"); +// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } // 已签收不允许扫描 boolean isSign = checkWaybillIsSign(mainBillCode);