Yangwl
/
SZXBGJ_HT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:e40fa049277064fb3b82dab75b22177b42f7f1a8
Branches Tags
Yangwl:master
..
compare: Yangwl:cb8d5cd0393619bc5d2b4de0dd5d67f4ebb12f23
Branches Tags
Yangwl:master

No commits in common. 'e40fa049277064fb3b82dab75b22177b42f7f1a8' and 'cb8d5cd0393619bc5d2b4de0dd5d67f4ebb12f23' have entirely different histories.
e40fa04927 ... cb8d5cd039

5 changed files with 107 additions and 143 deletions
Show Stats

220
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java
Unescape Escape View File

@ -41,7 +41,8 @@ import java.util.stream.Collectors;
*/
@Controller
@RequestMapping("/tyre/tyre")
public class BaseTyreController extends BaseController {
public class BaseTyreController extends BaseController
{
private String prefix = "tyre/tyre";
@Autowired
@ -62,16 +63,17 @@ public class BaseTyreController extends BaseController {
@Autowired
private IBaseInventoryService baseInventoryService;
@RequiresPermissions("tyre:tyre:view")
@GetMapping()
public String tyre() {
public String tyre()
{
return prefix + "/tyre";
}
@RequiresPermissions("tyre:tyre:stat")
@GetMapping("/stat")
public String stat() {
public String stat()
{
return prefix + "/stat";
}
@ -82,7 +84,8 @@ public class BaseTyreController extends BaseController {
@GetMapping("/detail/{tyreId}")
public String tyreDetil(@PathVariable("tyreId") Long tyreId, Model model) {
public String tyreDetil(@PathVariable("tyreId") Long tyreId, Model model)
{
// 1. 根据 ID 查询轮胎数据
BaseTyre tyre = baseTyreService.selectBaseTyreById(tyreId);
if (tyre == null) {
@ -108,13 +111,13 @@ public class BaseTyreController extends BaseController {
// 核心修改：根据 type 字段判断是入库还是出库
if (item.getType() != null && item.getType().equals("1")) {
// 1 代表 出库
timelineItem.setTitle("轮胎出库：" + item.getCreateBy());
timelineItem.setTitle("轮胎出库："+item.getCreateBy());
timelineItem.setIcon("fa-sign-out"); // 或者是 fa-truck (卡车图标)
timelineItem.setColor("warning"); // 橙色/黄色，代表离开
timelineItem.setTime(item.getCreateTime());
} else {
// 0 代表 入库 (默认情况)
timelineItem.setTitle("轮胎入库:" + item.getCreateBy());
timelineItem.setTitle("轮胎入库:"+item.getCreateBy());
timelineItem.setIcon("fa-sign-in"); // 或者是 fa-inbox (盒子图标)
timelineItem.setColor("primary"); // 蓝色，代表进入
timelineItem.setTime(item.getCreateTime());
@ -136,7 +139,7 @@ public class BaseTyreController extends BaseController {
for (RecordTyreInstall item : installList) {
TimelineItem timelineItem = new TimelineItem();
timelineItem.setId(item.getId());
timelineItem.setTitle("轮胎安装:" + item.getCreateBy());
timelineItem.setTitle("轮胎安装:"+item.getCreateBy());
timelineItem.setType("install");
timelineItem.setDetail("车辆：" + item.getCarNo() + " | 轮位：" + item.getWheelPostion());
timelineItem.setTime(item.getCreateTime());
@ -154,7 +157,7 @@ public class BaseTyreController extends BaseController {
for (RecordCheck item : checkList) {
TimelineItem timelineItem = new TimelineItem();
timelineItem.setId(item.getId());
timelineItem.setTitle("轮胎检查" + item.getCreateBy());
timelineItem.setTitle("轮胎检查"+item.getCreateBy());
timelineItem.setType("check");
// timelineItem.setDetail(buildCheckDetail(item));
timelineItem.setDetail("深度：" + "17.8mm");
@ -175,19 +178,18 @@ public class BaseTyreController extends BaseController {
return prefix + "/tyreDetil";
}
/**
/**
* 查询轮胎基础信息列表
*/
@RequiresPermissions("tyre:tyre:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(BaseTyre baseTyre) {
public TableDataInfo list(BaseTyre baseTyre)
{
startPage();
List<BaseTyre> list = baseTyreService.selectBaseTyreList(baseTyre);
return getDataTable(list);
}
@PostMapping("/statList")
@ResponseBody
public TableDataInfo statList(SysDept sysDept) {
@ -197,30 +199,30 @@ public class BaseTyreController extends BaseController {
@PostMapping("/getCarBingTire")
@ResponseBody
public List<BaseTyre> getCarBingTire(BaseTyre baseTyre) {
return baseTyreService.getCarBingTireList(baseTyre);
public List<BaseTyre> getCarBingTire(BaseTyre baseTyre)
{
return baseTyreService.getCarBingTireList(baseTyre);
}
@RequiresPermissions("tyre:tyre:view")
@GetMapping("/importTemplate")
@ResponseBody
public AjaxResult importTemplate() {
public AjaxResult importTemplate()
{
ExcelUtil<BaseTyreVo> util = new ExcelUtil<BaseTyreVo>(BaseTyreVo.class);
return util.importTemplateExcel("轮胎数据导入模板");
}
@Log(title = "轮胎管理", businessType = BusinessType.IMPORT)
@RequiresPermissions("tyre:tyre:import")
@PostMapping("/importData")
@ResponseBody
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<BaseTyreVo> util = new ExcelUtil<BaseTyreVo>(BaseTyreVo.class);
List<BaseTyreVo> baseTyreVoList = util.importExcel(file.getInputStream());
String operName = ShiroUtils.getSysUser().getLoginName();
String message = baseTyreService.importBaseTyre(baseTyreVoList, updateSupport, operName);
return AjaxResult.success(message);
}
/**
* 导出轮胎基础信息列表
*/
@ -228,7 +230,8 @@ public class BaseTyreController extends BaseController {
@Log(title = "轮胎基础信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(BaseTyre baseTyre) {
public AjaxResult export(BaseTyre baseTyre)
{
List<BaseTyre> list = baseTyreService.selectBaseTyreList(baseTyre);
ExcelUtil<BaseTyre> util = new ExcelUtil<BaseTyre>(BaseTyre.class);
return util.exportExcel(list, "tyre");
@ -238,7 +241,8 @@ public class BaseTyreController extends BaseController {
* 新增轮胎基础信息
*/
@GetMapping("/add")
public String add() {
public String add()
{
return prefix + "/add";
}
@ -249,8 +253,10 @@ public class BaseTyreController extends BaseController {
// @Log(title = "轮胎基础信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(BaseTyre baseTyre) {
if (UserConstants.USER_NAME_NOT_UNIQUE.equals(baseTyreService.checkTyreNoUnique(baseTyre.getTyreNo()))) {
public AjaxResult addSave(BaseTyre baseTyre)
{
if (UserConstants.USER_NAME_NOT_UNIQUE.equals(baseTyreService.checkTyreNoUnique(baseTyre.getTyreNo())))
{
return error("新增轮胎'" + baseTyre.getTyreNo() + "'失败，该轮胎已存在");
}
return toAjax(baseTyreService.insertBaseTyre(baseTyre));
@ -260,7 +266,8 @@ public class BaseTyreController extends BaseController {
* 修改轮胎基础信息
*/
@GetMapping("/edit/{tyreId}")
public String edit(@PathVariable("tyreId") Long tyreId, ModelMap mmap) {
public String edit(@PathVariable("tyreId") Long tyreId, ModelMap mmap)
{
BaseTyre baseTyre = baseTyreService.selectBaseTyreById(tyreId);
mmap.put("baseTyre", baseTyre);
return prefix + "/edit";
@ -273,7 +280,8 @@ public class BaseTyreController extends BaseController {
@Log(title = "轮胎基础信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(BaseTyre baseTyre) {
public AjaxResult editSave(BaseTyre baseTyre)
{
return toAjax(baseTyreService.updateBaseTyre(baseTyre));
}
@ -282,44 +290,83 @@ public class BaseTyreController extends BaseController {
*/
@RequiresPermissions("tyre:tyre:remove")
@Log(title = "轮胎基础信息", businessType = BusinessType.DELETE)
@PostMapping("/remove")
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids) {
public AjaxResult remove(String ids)
{
return toAjax(baseTyreService.deleteBaseTyreByIds(ids));
}
@PostMapping("/pdaQueryTyreInfo")
@ResponseBody
public BaseTyre pdaQueryTyreInfo(BaseTyre baseTyre) {
public BaseTyre pdaQueryTyreInfo(BaseTyre baseTyre)
{
BaseTyre info = baseTyreService.selectBaseTyreByEpc(baseTyre);
return info;
}
@PostMapping("/setRfidBarcode")
@ResponseBody
public AjaxResult setRfidBarcode(@Validated BaseTyre baseTyre) {
public AjaxResult setRfidBarcode(@Validated BaseTyre baseTyre)
{
//BaseTyre info = baseTyreService.selectBaseTyreByEpc(baseTyre);
return toAjax(baseTyreService.insertBaseTyreBd(baseTyre));
}
private String buildCheckDetail(RecordCheck item) {
public static class TimelineItem {
private Long id;
private String title;
private String type; // 类型：warehousing, install, check
private String detail;
private Date time;
private String icon; // Font Awesome 图标名
private String color; // 颜色：primary, success, warning, danger
// Getters and Setters
public Long getId() { return id; }
public void setId(Long id) { this.id = id; }
public String getTitle() { return title; }
public void setTitle(String title) { this.title = title; }
public String getType() { return type; }
public void setType(String type) { this.type = type; }
public String getDetail() { return detail; }
public void setDetail(String detail) { this.detail = detail; }
public Date getTime() { return time; }
public void setTime(Date time) { this.time = time; }
public String getIcon() { return icon; }
public void setIcon(String icon) { this.icon = icon; }
public String getColor() { return color; }
public void setColor(String color) { this.color = color; }
}
private String buildCheckDetail(RecordCheck item)
{
List<String> detailParts = new ArrayList<>();
if (StringUtils.isNotBlank(item.getPatternDepth())) {
if (StringUtils.isNotBlank(item.getPatternDepth()))
{
detailParts.add("花纹深度：" + item.getPatternDepth() + "mm");
}
if (StringUtils.isNotBlank(item.getMileage())) {
if (StringUtils.isNotBlank(item.getMileage()))
{
detailParts.add("车辆里程：" + item.getMileage());
}
if (StringUtils.isNotBlank(item.getResult())) {
if (StringUtils.isNotBlank(item.getResult()))
{
detailParts.add("处理意见：" + item.getResult());
}
if (StringUtils.isNotBlank(item.getMaintenanceType())) {
if (StringUtils.isNotBlank(item.getMaintenanceType()))
{
detailParts.add("保养类型：" + item.getMaintenanceType());
}
return detailParts.isEmpty() ? "暂无检查明细" : String.join(" | ", detailParts);
}
private String defaultValue(String value) {
private String defaultValue(String value)
{
return StringUtils.isBlank(value) ? "-" : value;
}
@ -331,7 +378,8 @@ public class BaseTyreController extends BaseController {
@GetMapping("/stat/detail")
public String statDetail(@RequestParam("deptName") String deptName,
@RequestParam("stockType") String stockType,
ModelMap mmap) {
ModelMap mmap)
{
mmap.put("deptName", deptName);
mmap.put("stockType", stockType);
return prefix + "/statDetail";
@ -344,14 +392,16 @@ public class BaseTyreController extends BaseController {
@RequiresPermissions("tyre:tyre:stat")
@PostMapping("/stat/detail/list")
@ResponseBody
public TableDataInfo statDetailList(BaseTyre baseTyre, @RequestParam("stockType") String stockType) {
public TableDataInfo statDetailList(BaseTyre baseTyre, @RequestParam("stockType") String stockType)
{
startPage();
List<BaseTyre> list = tyreStatDetailService.selectStatDetailList(baseTyre, stockType);
return getDataTable(list);
}
@GetMapping("/detail2")
public String tyreDetil2(BaseTyre baseTyre, Model model) {
public String tyreDetil2(BaseTyre baseTyre, Model model)
{
if (baseTyre == null || (baseTyre.getTyreId() == null && StringUtils.isBlank(baseTyre.getKeyParam()))) {
return "error/404";
}
@ -370,7 +420,8 @@ public class BaseTyreController extends BaseController {
*/
@RequiresPermissions("tyre:tyre:receive")
@GetMapping("/receive")
public String receive() {
public String receive()
{
return prefix + "/receive";
}
@ -380,7 +431,8 @@ public class BaseTyreController extends BaseController {
@RequiresPermissions("tyre:tyre:receive")
@PostMapping("/receive/preview")
@ResponseBody
public AjaxResult receivePreview(@RequestParam("inboundCode") String inboundCode) {
public AjaxResult receivePreview(@RequestParam("inboundCode") String inboundCode)
{
InboundBatchPreviewVo data = baseInventoryService.previewBatchByCode(inboundCode);
return AjaxResult.success("批次预览成功", data);
}
@ -392,10 +444,11 @@ public class BaseTyreController extends BaseController {
@Log(title = "轮胎收货", businessType = BusinessType.IMPORT)
@PostMapping("/receive")
@ResponseBody
public AjaxResult receiveSubmit(@RequestParam("inboundCode") String inboundCode) {
public AjaxResult receiveSubmit(@RequestParam("inboundCode") String inboundCode)
{
int rows = baseInventoryService.batchInboundByCode(inboundCode, ShiroUtils.getLoginName());
return rows > 0 ? AjaxResult.success("收货完成，成功处理 " + rows + " 条", rows)
: AjaxResult.error("收货失败或无可入库轮胎");
: AjaxResult.error("收货失败或无可入库轮胎");
}
/**
@ -405,88 +458,23 @@ public class BaseTyreController extends BaseController {
@Log(title = "轮胎收货撤回", businessType = BusinessType.UPDATE)
@PostMapping("/receive/rollback")
@ResponseBody
public AjaxResult receiveRollback(@RequestParam("inboundCode") String inboundCode) {
public AjaxResult receiveRollback(@RequestParam("inboundCode") String inboundCode)
{
int rows = baseInventoryService.rollbackBatchInboundByCode(inboundCode, ShiroUtils.getLoginName());
return rows > 0 ? AjaxResult.success("收货撤回完成，成功处理 " + rows + " 条", rows)
: AjaxResult.error("收货撤回失败或无可撤回轮胎");
: AjaxResult.error("收货撤回失败或无可撤回轮胎");
}
@PostMapping("/pdaQueryTyreTimeLine")
@ResponseBody
public AjaxResult pdaQueryTyreTimeLine(BaseTyre baseTyre) {
public AjaxResult pdaQueryTyreTimeLine(BaseTyre baseTyre)
{
try {
Map resultMap = baseTyreService.pdaQueryTyreTimeLine(baseTyre);
return success(resultMap);
} catch (Exception e) {
Map resultMap = baseTyreService.pdaQueryTyreTimeLine(baseTyre);
return success(resultMap);
}catch (Exception e){
e.printStackTrace();
return error();
}
}
public static class TimelineItem {
private Long id;
private String title;
private String type; // 类型：warehousing, install, check
private String detail;
private Date time;
private String icon; // Font Awesome 图标名
private String color; // 颜色：primary, success, warning, danger
// Getters and Setters
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public Date getTime() {
return time;
}
public void setTime(Date time) {
this.time = time;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
}
}

8
ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java
Unescape Escape View File

@ -79,15 +79,7 @@ public class BaseTyre extends BaseEntity
@Excel(name = "所在轮位")
private String wheelPostion;
private double sumMileage;
public double getSumMileage() {
return sumMileage;
}
public void setSumMileage(double sumMileage) {
this.sumMileage = sumMileage;
}
/**
* 库存状态（字典 inventory_status）。

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java
Unescape Escape View File

@ -102,6 +102,4 @@ public interface BaseTyreMapper
* @return 轮胎基础信息集合
*/
List<BaseTyre> selectCarNoByTyreEpcs(List<String> tyreEpcs);
double selectSumMileageByRFID(@Param("tyreEpc") String tyreEpc);
}

9
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java
Unescape Escape View File

@ -275,9 +275,6 @@ public class BaseTyreServiceImpl implements IBaseTyreService
return map;
}else {
map.put("resultBase",resultBase);
double value = baseTyreMapper.selectSumMileageByRFID(resultBase.getTyreEpc());
resultBase.setSumMileage(value);
//查询出入库数据
String tyreRfid = resultBase.getTyreEpc();
RecordWarehousing recordWarehousing = new RecordWarehousing();
@ -289,7 +286,6 @@ public class BaseTyreServiceImpl implements IBaseTyreService
recordTyreInstall.setTyreRfid(tyreRfid);
List<RecordTyreInstall> recordTyreInstallList = recordTyreInstallMapper.selectRecordTyreInstallList(recordTyreInstall);
map.put("recordTyreInstallList",recordTyreInstallList);
//维修/保养
//查询轮胎详细表
BizOrderTireDetail bizOrderTireDetail = new BizOrderTireDetail();
@ -303,14 +299,9 @@ public class BaseTyreServiceImpl implements IBaseTyreService
.collect(Collectors.toList());
BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(biz.getOrderId());
bizMaintenanceOrder.setBizOrderTireDetailList(filteredList);
System.out.println(bizMaintenanceOrder.getLastMileage());
if (bizMaintenanceOrder.getLastMileage() ==null || String.valueOf(bizMaintenanceOrder.getLastMileage() ).equals("null")) {
bizMaintenanceOrder.setLastMileage(BigDecimal.valueOf(0));
}
map.put("bizMaintenanceOrder",bizMaintenanceOrder);
}
}
return map;
}
}

9
ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
Unescape Escape View File

@ -118,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="getTeamByUser" resultType="java.lang.String">
SELECT
dept_name
@ -295,13 +297,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectSumMileageByRFID" resultType="double">
select ifnull(sum(mileage),0)
from record_tyre_mileage
where tyre_rfid = #{tyreEpc}
</select>
<select id="selectCarNoByTyreEpcs" parameterType="java.util.List" resultMap="BaseTyreResult">

Write Preview
Loading…
Cancel
Save