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:09:03 +08:00
parent 32a6eaddc4
commit 366e6ffdb0
1 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,6 +506,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode); EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode);
if(emisTmsPack!=null) { if(emisTmsPack!=null) {
try { try {
// 合包发件扫描 // 合包发件扫描
if( scanType.equals(ScanType.DEPARTURE.opCode) if( scanType.equals(ScanType.DEPARTURE.opCode)
|| scanType.equals(ScanType.CLEARANCE.opCode) || scanType.equals(ScanType.CLEARANCE.opCode)
@ -1148,6 +1151,24 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"下一站必填"); throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"下一站必填");
} }
// 获取下一网点
EmisSite preOrNextStation=getSiteByCode(preOrNextStationCode);
// 重复扫描
// 同站点，同动作，同一天不允许重复扫描
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); List<EmisTmsPackDtl> listPackDtl=emisTmsPackDtlMapper.selectPackDtlListByPackNo(packNo);
// 内件处理 // 内件处理
@ -1191,11 +1212,10 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn()); emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
emisTmsScanRecord.setWeight(emisWaybill.getBillWeight()); emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
// 获取下一网点
EmisSite site=getSiteByCode(preOrNextStationCode);
emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode); emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
emisTmsScanRecord.setPreOrNextStation(site.getSiteName()); emisTmsScanRecord.setPreOrNextStation(preOrNextStation.getSiteName());
emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone()); emisTmsScanRecord.setPreOrNextStationPhone(preOrNextStation.getPhone());
emisTmsScanRecord.setScanType(scanType); emisTmsScanRecord.setScanType(scanType);
emisTmsScanRecord.setScanDate(scanDate); emisTmsScanRecord.setScanDate(scanDate);
@ -1227,6 +1247,27 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsPack.setNextSiteCode(preOrNextStationCode); emisTmsPack.setNextSiteCode(preOrNextStationCode);
emisTmsPackMapper.updateEmisTmsPackByPackNo(emisTmsPack); emisTmsPackMapper.updateEmisTmsPackByPackNo(emisTmsPack);
// 插入合包扫描记录
EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
emisTmsScanRecord.setBillCode(packNo);
emisTmsScanRecord.setMainBillCode(packNo);
emisTmsScanRecord.setOrderSn(packNo);
emisTmsScanRecord.setWeight(emisTmsPack.getTotalWeight());
emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
emisTmsScanRecord.setPreOrNextStation(preOrNextStation.getSiteName());
emisTmsScanRecord.setPreOrNextStationPhone(preOrNextStation.getPhone());
emisTmsScanRecord.setScanType(scanType);
emisTmsScanRecord.setScanDate(scanDate);
emisTmsScanRecord.setBagNo(packNo);
// 填充公共数据
this.fillBillBaseData(emisTmsScanRecord);
// 插入合包扫描记录
addScanRecord(emisTmsScanRecord);
return itemList; return itemList;
} }