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 95e9bddf0..78fecf84a 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 @@ -1127,6 +1127,23 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm emisTmsPackMapper.insertEmisTmsPack(emisTmsPack); } + // 插入拆包扫描记录 + EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord(); + emisTmsScanRecord.setBillCode(packNo); + emisTmsScanRecord.setMainBillCode(packNo); + emisTmsScanRecord.setOrderSn(packNo); + emisTmsScanRecord.setWeight(emisTmsPack.getTotalWeight()); + + emisTmsScanRecord.setScanType(ScanType.CO_PACKING.opCode); + emisTmsScanRecord.setScanDate(scanDate); + emisTmsScanRecord.setBagNo(packNo); + + // 填充公共数据 + this.fillBillBaseData(emisTmsScanRecord); + + // 插入拆包扫描记录 + addScanRecord(emisTmsScanRecord); + return itemList; } @@ -1501,6 +1518,24 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm emisTmsPack.setTotalParcelQty(0); emisTmsPackMapper.updateEmisTmsPack(emisTmsPack); + // 插入拆包扫描记录 + EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord(); + emisTmsScanRecord.setBillCode(packNo); + emisTmsScanRecord.setMainBillCode(packNo); + emisTmsScanRecord.setOrderSn(packNo); + emisTmsScanRecord.setWeight(emisTmsPack.getTotalWeight()); + + emisTmsScanRecord.setScanType(ScanType.UN_PACKING.opCode); + emisTmsScanRecord.setScanDate(scanDate); + emisTmsScanRecord.setBagNo(packNo); + + // 填充公共数据 + this.fillBillBaseData(emisTmsScanRecord); + + // 插入拆包扫描记录 + addScanRecord(emisTmsScanRecord); + + } return itemList; @@ -1627,7 +1662,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 插入子单扫描记录 emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord); - // 插入主单扫描记录 emisTmsScanRecord.setId(null); emisTmsScanRecord.setBillCode(mainBillCode);