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-06-24 21:59:56 +08:00
parent 62031a737e
commit 17a2263793
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -828,7 +828,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 货物不在当前网点不允许扫描 // 货物不在当前网点不允许扫描
if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){ if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage("货物不在当前网点"); scanResultItem.setMessage("运单不在当前网点");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
itemList.add(scanResultItem); itemList.add(scanResultItem);
return itemList; return itemList;
@ -868,6 +868,12 @@ 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.setPreOrNextStation(site.getSiteName());
emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
emisTmsScanRecord.setScanType(ScanType.CO_PACKING.opCode); emisTmsScanRecord.setScanType(ScanType.CO_PACKING.opCode);
emisTmsScanRecord.setScanDate(scanDate); emisTmsScanRecord.setScanDate(scanDate);
emisTmsScanRecord.setBagNo(packNo); emisTmsScanRecord.setBagNo(packNo);
@ -891,6 +897,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsPackDtl.setScanMan(emisTmsScanRecord.getScanManCode()); emisTmsPackDtl.setScanMan(emisTmsScanRecord.getScanManCode());
emisTmsPackDtlMapper.insertEmisTmsPackDtl(emisTmsPackDtl); emisTmsPackDtlMapper.insertEmisTmsPackDtl(emisTmsPackDtl);
// 下一站点
changeWaybillNextSite(emisTmsScanRecord.getMainBillCode(),preOrNextStationCode);
// 修改主运单状态,子单做合包扫描，主单不变化 // 修改主运单状态,子单做合包扫描，主单不变化
// this.changeWaybillStatus(mainBillCode, ScanType.CO_PACKING.opCode); // this.changeWaybillStatus(mainBillCode, ScanType.CO_PACKING.opCode);
scanResultItem.getData().put("billWeight", emisWaybill.getBillWeight()); scanResultItem.getData().put("billWeight", emisWaybill.getBillWeight());