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-08-04 16:12:44 +08:00
parent 366e6ffdb0
commit 33f13dc2f3
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1287,6 +1287,21 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String packNo=emisTmsPack.getPackNo();
String scanWeightStr = MapUtils.getString(scanDataItem,"scanWeight",null);
// 重复扫描
// 同站点，同动作，同一天不允许重复扫描
int scanCnt = emisTmsScanRecordMapper.checkSiteScanUnique(packNo, scanType, getCurrentUser().getOwnerSiteCode());
if (scanCnt > 0) {
// 返回原始数据返回
ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(packNo);
scanResultItem.getData().putAll(scanDataItem);
scanResultItem.setResult("fail");
scanResultItem.setMessage("重复扫描");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode);
itemList.add(scanResultItem);
return itemList;
}
// 获取合包内件
List<EmisTmsPackDtl> listPackDtl=emisTmsPackDtlMapper.selectPackDtlListByPackNo(packNo);
// 内件处理
@ -1354,6 +1369,24 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
}
// 插入合包扫描记录
EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
emisTmsScanRecord.setBillCode(packNo);
emisTmsScanRecord.setMainBillCode(packNo);
emisTmsScanRecord.setOrderSn(packNo);
emisTmsScanRecord.setWeight(emisTmsPack.getTotalWeight());
emisTmsScanRecord.setScanType(scanType);
emisTmsScanRecord.setScanDate(scanDate);
emisTmsScanRecord.setBagNo(packNo);
// 填充公共数据
this.fillBillBaseData(emisTmsScanRecord);
// 插入合包扫描记录
addScanRecord(emisTmsScanRecord);
// 到件不用更新合包信息
// emisTmsPack.setPackNo(packNo);
// emisTmsPackMapper.updateEmisTmsPackByPackNo(emisTmsPack);