diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java index f9513e6d..232884b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java @@ -157,7 +157,7 @@ public class BaseCarController extends BaseController @PostMapping("/PdaQueryCarList") @ResponseBody - public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar) + public AjaxResult PdaQueryCarList(BaseCar baseCar) { List list = baseCarService.selectBaseCarList(baseCar); if (list == null || list.isEmpty()){ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java index 27c762f5..1654afa5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java @@ -47,6 +47,26 @@ public class RecordTyreInstall extends BaseEntity @Excel(name = "所在轮位") private String wheelPostion; + private String stageMileage; + + private String recordId; + + public String getStageMileage() { + return stageMileage; + } + + public void setStageMileage(String stageMileage) { + this.stageMileage = stageMileage; + } + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + private String selfNo; public String getCompany() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreMileage.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreMileage.java index 69125451..5de261bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreMileage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreMileage.java @@ -42,6 +42,17 @@ public class RecordTyreMileage extends BaseEntity @Excel(name = "花纹深度") private String patternDepth; + private String recordId; + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getPatternDepth() { return patternDepth; } 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 304adb85..945cd9b1 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 @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.UUID; /** * 轮胎安装记录Service业务层处理 @@ -137,9 +138,11 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService @Override public AjaxResult PdaUnInstallTyre(RecordTyreInstall recordTyreInstall) { try { - //插入安装记录表 + //插入记录表 + String recordId = UUID.randomUUID().toString(); recordTyreInstall.setType("1"); recordTyreInstall.setCreateTime(DateUtils.getNowDate()); + recordTyreInstall.setRecordId(recordId); int n = recordTyreInstallMapper.insertRecordTyreInstall(recordTyreInstall); //更新轮胎基础信息表 BaseTyre baseTyre = new BaseTyre(); @@ -169,6 +172,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService recordTyreMileage.setMileage(between); recordTyreMileage.setCreateTime(DateUtils.getNowDate()); recordTyreMileage.setCreateBy(recordTyreInstall.getCreateBy()); + recordTyreMileage.setRecordId(recordId); recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage); if (n>0&&m>0){ return AjaxResult.success("卸胎成功!"); diff --git a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml index cd5dedef..46be076a 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"