diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java index 21e70ce9..69a9f6d2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java @@ -127,6 +127,22 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService baseTyre.setTyreNo(recordTyreInstall.getTyreNo()); int m = baseTyreMapper.updateBaseTyre(baseTyre); if (n>0&&m>0){ + // 装车时插入一条里程快照记录(段里程为0,仅记录装车时刻的累计总里程) + Long totalMileage = recordTyreMileageMapper.selectTotalMileageByTyreRfid(recordTyreInstall.getTyreRfid()); + if (totalMileage == null) { + totalMileage = 0L; + } + RecordTyreMileage recordTyreMileage = new RecordTyreMileage(); + recordTyreMileage.setTyreRfid(recordTyreInstall.getTyreRfid()); + recordTyreMileage.setStartTime(DateUtils.getNowDate()); + recordTyreMileage.setMileage(totalMileage); // 装车时累计总里程不变 + recordTyreMileage.setMileageOld(0L); // 装车操作本身不产生行驶里程 + recordTyreMileage.setPlateNumber(recordTyreInstall.getCarNo()); + recordTyreMileage.setPatternDepth(recordTyreInstall.getPatternDepth()); + recordTyreMileage.setRecordType("install"); // 标记为装车记录 + recordTyreMileage.setCreateTime(DateUtils.getNowDate()); + recordTyreMileage.setCreateBy(recordTyreInstall.getCreateBy()); + recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage); return AjaxResult.success("安装成功!"); } }catch (Exception e){ @@ -178,6 +194,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService recordTyreMileage.setEndTime(DateUtils.getNowDate()); recordTyreMileage.setMileage(totalMileage + between); // 当前累计总里程 recordTyreMileage.setMileageOld(between); // 本段行驶里程 + recordTyreMileage.setPlateNumber(recordTyreInstall.getCarNo()); // 车牌快照 + recordTyreMileage.setRecordType("uninstall"); // 标记为卸车记录 recordTyreMileage.setCreateTime(DateUtils.getNowDate()); recordTyreMileage.setCreateBy(recordTyreInstall.getCreateBy()); recordTyreMileage.setRecordId(recordId); diff --git a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml index 45b15660..a9e09cf5 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml @@ -29,6 +29,8 @@