Compare commits

..

No commits in common. 'dff0cfd164de81110499221aa9c3a49b902b2520' and 'fdc578b40309d5673147207cdeccdcc6c1bee09f' have entirely different histories.

@ -4,16 +4,20 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.BaseTyre;
import com.ruoyi.system.domain.RecordCheck;
import com.ruoyi.system.domain.RecordTyreInstall;
import com.ruoyi.system.domain.RecordWarehousing;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.vo.BaseTyreVo;
import com.ruoyi.system.service.IBaseInventoryService;
import com.ruoyi.system.service.IBaseTyreService;
import com.ruoyi.system.service.IRecordCheckService;
import com.ruoyi.system.service.IRecordTyreInstallService;
import com.ruoyi.system.service.IRecordWarehousingService;
import com.ruoyi.system.service.ITyreStatDetailService;
import com.ruoyi.system.domain.vo.InboundBatchPreviewVo;
import com.ruoyi.system.service.*;
import org.apache.commons.lang3.StringUtils;
@ -76,6 +80,7 @@ public class BaseTyreController extends BaseController {
*/
@GetMapping("/detail/{tyreId}")
public String tyreDetil(@PathVariable("tyreId") Long tyreId, Model model) {
// 1. 根据 ID 查询轮胎数据
@ -418,21 +423,6 @@ public class BaseTyreController extends BaseController {
}
}
// 同车互换接口,实际就是修改基础信息表
@PostMapping("/changeTyreForOneCar")
public AjaxResult changeTyreForOneCar(Long oldTyreId, Long newTyreId, String oldLocation, String newLocation) {
BaseTyre baseTyre1 = new BaseTyre();
baseTyre1.setTyreId(oldTyreId);
baseTyre1.setWheelPostion(newLocation);
int i = baseTyreService.updateBaseTyre(baseTyre1);
BaseTyre baseTyre2 = new BaseTyre();
baseTyre2.setTyreId(newTyreId);
baseTyre2.setWheelPostion(oldLocation);
i += baseTyreService.updateBaseTyre(baseTyre2);
return i == 2 ? success() : error();
}
public static class TimelineItem {
private Long id;
private String title;

@ -38,7 +38,6 @@ public class RecordTyreMileage extends BaseEntity
/** 记录里程 */
@Excel(name = "记录里程")
private Long mileage;
private Long mileageOld;
@Excel(name = "花纹深度")
private String patternDepth;
@ -47,25 +46,6 @@ public class RecordTyreMileage extends BaseEntity
private String plateNumber;
private String recordId;
// 类型:装胎、卸胎、保养
private String recordType;
public String getRecordType() {
return recordType;
}
public void setRecordType(String recordType) {
this.recordType = recordType;
}
public Long getMileageOld() {
return mileageOld;
}
public void setMileageOld(Long mileageOld) {
this.mileageOld = mileageOld;
}
public String getPlateNumber() {
return plateNumber;

Loading…
Cancel
Save