diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java index 60b35afaf..9780f2b1d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java @@ -90,7 +90,7 @@ public enum ScanType { DECLEARE_SUCCESS("701","报关放行"), DECLEARE_FAIL("702","报关失败"), - CLEARANCE("800","清关开始"), + CLEARANCE("800","清关扫描"), CLEARANCE_SUCCESS("801","清关放行"), CLEARANCE_FAIL("802","清关失败"), 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 2ab8f4ad5..392590032 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 @@ -521,6 +521,44 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm String carNo = (String)scanDataItem.get("carNo"); emisTmsScanRecord.setCarNo(carNo); } + // 报关扫描 + else if(ScanType.DECLEARE.opCode.equals(scanType)){ + // 下一站 +// String scanWeightStr = (String)scanDataItem.get("scanWeight"); + String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode"); + if(!StringUtils.isEmpty(preOrNextStationCode)) { + EmisSite site=getSiteByCode(preOrNextStationCode); + emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode); + emisTmsScanRecord.setPreOrNextStation(site.getSiteName()); + emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone()); + + // 当前站点 + changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode()); + // 下一站点 + changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode); + } + + } + // 清关扫描 + else if(ScanType.CLEARANCE.opCode.equals(scanType)){ + // 下一站 +// String scanWeightStr = (String)scanDataItem.get("scanWeight"); + String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode"); + if(!StringUtils.isEmpty(preOrNextStationCode)) { + EmisSite site=getSiteByCode(preOrNextStationCode); + emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode); + emisTmsScanRecord.setPreOrNextStation(site.getSiteName()); + emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone()); + + // 当前站点 + changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode()); + // 下一站点 + changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode); + } + + } + + }