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 2025-05-12 11:55:32 +08:00
parent 357c29d7ce
commit 70f4fba5fb
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -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);