From c354b57a9a24dbafa166f0a176ad04c74f76ae68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com> Date: Mon, 20 Apr 2026 15:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysProfileController.java | 5 + .../tyre/BizMaintenanceOrderController.java | 36 ++- .../tyre/RecordTyreInstallController.java | 7 + .../src/main/resources/application.yml | 2 +- .../src/main/resources/templates/main_v1.html | 8 +- .../templates/tyre/install/install.html | 4 +- .../resources/templates/tyre/order/edit.html | 234 ++++++++++++++---- .../templates/tyre/uninstall/add.html | 46 ++++ .../templates/tyre/uninstall/edit.html | 65 +++++ .../templates/tyre/uninstall/install.html | 173 +++++++++++++ .../system/domain/BizOrderTireDetail.java | 2 + .../mapper/BizMaintenanceOrderMapper.java | 2 + .../mapper/BizOrderTireDetailMapper.java | 6 + .../service/IBizMaintenanceOrderService.java | 3 + .../service/IBizOrderTireDetailService.java | 6 + .../impl/BaseInventoryServiceImpl.java | 2 +- .../impl/BizMaintenanceOrderServiceImpl.java | 5 + .../impl/BizOrderTireDetailServiceImpl.java | 12 + .../mapper/tyre/BaseInventoryMapper.xml | 2 +- .../mapper/tyre/BizMaintenanceOrderMapper.xml | 34 +++ .../mapper/tyre/BizOrderTireDetailMapper.xml | 34 ++- 21 files changed, 618 insertions(+), 70 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/tyre/uninstall/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/tyre/uninstall/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 7d962230..1f0e87b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -25,6 +25,9 @@ import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.system.service.ISysUserService; +import static com.ruoyi.common.utils.file.FileUploadUtils.extractFilename; +import static com.ruoyi.common.utils.file.FileUploadUtils.uuidFilename; + /** * 个人信息 业务处理 * @@ -161,6 +164,8 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { SysUser currentUser = getSysUser(); + String fileName = uuidFilename(file); + System.out.println(fileName); String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); if (userService.updateUserAvatar(currentUser.getUserId(), avatar)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java index 6127640b..aeffcf02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java @@ -1,8 +1,10 @@ package com.ruoyi.web.controller.tyre; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.config.RuoYiConfig; @@ -10,9 +12,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.*; -import com.ruoyi.system.service.IBaseCarService; -import com.ruoyi.system.service.IBizOrderTireDetailService; -import com.ruoyi.system.service.ISysAttachmentService; +import com.ruoyi.system.service.*; import com.sun.jna.platform.win32.OaIdl; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.service.IBizMaintenanceOrderService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -46,6 +45,9 @@ public class BizMaintenanceOrderController extends BaseController @Autowired private IBaseCarService baseCarService; + @Autowired + private IBaseTyreService baseTyreService; + @Autowired private IBizMaintenanceOrderService bizMaintenanceOrderService; @@ -131,7 +133,7 @@ public class BizMaintenanceOrderController extends BaseController } /** - * 修改维保工单 + * 维保工单详情 */ @RequiresPermissions("system:order:edit") @GetMapping("/edit/{orderId}") @@ -139,6 +141,25 @@ public class BizMaintenanceOrderController extends BaseController { BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderService.selectBizMaintenanceOrderByOrderId(orderId); mmap.put("bizMaintenanceOrder", bizMaintenanceOrder); + //查询前一个工单 + BizMaintenanceOrder bizMaintenanceOrderBefore = bizMaintenanceOrderService.selectBizMaintenanceOrderByOrderIdBefore(bizMaintenanceOrder); + BizOrderTireDetail bizOrderTireDetail = new BizOrderTireDetail(); + List bizOrderTireDetailsBefore = new ArrayList<>(); + if (bizMaintenanceOrderBefore==null){ + //如果上一次的检查结果为空 + //则数据为车辆目前的安装数据 + //查询此车辆安装的轮胎数据 + bizOrderTireDetailsBefore = bizOrderTireDetailService.selectBaseTrieInstall(bizMaintenanceOrder.getPlateNumber()); + + }else { + bizOrderTireDetail.setOrderId(bizMaintenanceOrderBefore.getOrderId()); + bizOrderTireDetailsBefore = bizOrderTireDetailService.selectBizOrderTireDetail(bizOrderTireDetail); + } + //查询此车辆的维保数据 + bizOrderTireDetail.setOrderId(orderId); + List bizOrderTireDetails = bizOrderTireDetailService.selectBizOrderTireDetail(bizOrderTireDetail); + mmap.put("bizOrderTireDetailsBefore", bizOrderTireDetailsBefore); + mmap.put("bizOrderTireDetails", bizOrderTireDetails); return prefix + "/edit"; } @@ -188,8 +209,9 @@ public class BizMaintenanceOrderController extends BaseController } /** - * PDA保存执行工单的方法 - * @param bizMaintenanceOrder + * PDA保存执行工单的方法 + * @param json + * @param files * @return */ @PostMapping("/PDASaveMaintenanceOrder") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/RecordTyreInstallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/RecordTyreInstallController.java index 9dc8d693..1ff7d699 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/RecordTyreInstallController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/RecordTyreInstallController.java @@ -28,6 +28,7 @@ import java.util.List; public class RecordTyreInstallController extends BaseController { private String prefix = "tyre/install"; + private String prefix_uninstall = "tyre/uninstall"; @Autowired private IRecordTyreInstallService recordTyreInstallService; @@ -39,6 +40,12 @@ public class RecordTyreInstallController extends BaseController return prefix + "/install"; } + @RequiresPermissions("tyre:install:uninstall") + @GetMapping("/uninstall") + public String uninstall() + { + return prefix_uninstall + "/install"; + } /** * 查询轮胎安装记录列表 */ diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 95b89968..9458cb68 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2026 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） profile: C:/ruoyi/uploadPath # 获取ip地址开关 diff --git a/ruoyi-admin/src/main/resources/templates/main_v1.html b/ruoyi-admin/src/main/resources/templates/main_v1.html index e0496b5c..320f83f1 100644 --- a/ruoyi-admin/src/main/resources/templates/main_v1.html +++ b/ruoyi-admin/src/main/resources/templates/main_v1.html @@ -83,7 +83,7 @@
- 全新胎 + 全新胎

305

在库: 305 @@ -96,7 +96,7 @@
- 翻新胎 + 翻新胎

35

在库: 34 @@ -109,7 +109,7 @@
- 周转胎 + 周转胎

1

在库: 1 @@ -122,7 +122,7 @@
- 实验胎 + 实验胎

1

在库: 1 diff --git a/ruoyi-admin/src/main/resources/templates/tyre/install/install.html b/ruoyi-admin/src/main/resources/templates/tyre/install/install.html index acdf3758..1c4cc03c 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/install/install.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/install/install.html @@ -41,8 +41,8 @@

  • 操作类型

  • diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html b/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html index 79fcef71..d94128f5 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html @@ -126,6 +126,41 @@ border-radius: 4px; } + /* 状态样式：装胎 (橙色/金色) */ + .status-installed { + border: 2px solid #f8ac59 !important; /* 橙色边框 */ + background-color: #2f4050; + position: relative; /* 确保伪元素定位正确 */ + } + + /* 位置标签背景色 */ + .status-installed .pos-tag { + background: #f8ac59; + color: #fff; /* 确保文字清晰 */ + } + + /* 轮胎纹路：稍微调亮一点，表示是新胎或重点关注的胎 */ + .status-installed .tyre-pattern { + opacity: 0.8; + } + + /* 中间的文字标签 */ + .status-installed::after { + content: "装胎"; + position: absolute; + top: 30%; + left: 50%; + transform: translateX(-50%); + color: #f8ac59; /* 文字颜色与边框呼应 */ + font-weight: bold; + font-size: 14px; + z-index: 4; + background: rgba(255, 255, 255, 0.95); /* 稍微不透明一点，保证文字可读性 */ + padding: 2px 8px; + border-radius: 4px; + box-shadow: 0 2px 4px rgba(0,0,0,0.2); /* 加一点阴影更有立体感 */ + } + /* 状态样式：空位 (灰色透明) */ .status-empty { background: #e7eaec; @@ -165,13 +200,16 @@ 完成操作人：
    • - 当前车辆里程(km)： + 上次维保里程(km)： +
    +
    + 当前车辆里程(km)：
    线路：
    - 补充说明：- + 补充说明：-
    备注：- @@ -195,7 +233,7 @@
    - +
    维保后
    @@ -210,77 +248,169 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/uninstall/add.html b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/add.html new file mode 100644 index 00000000..fb1bec9b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/add.html @@ -0,0 +1,46 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + 代码生成请选择字典属性 +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/uninstall/edit.html b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/edit.html new file mode 100644 index 00000000..a86f7a7b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/edit.html @@ -0,0 +1,65 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html new file mode 100644 index 00000000..5c3887ed --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/tyre/uninstall/install.html @@ -0,0 +1,173 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • +

      轮胎芯片：

      + +
      • +
    • +

      胎号：

      + +
      • +
    • +

      自编号：

      + +
      • +
    • +

      车牌号：

      + +
      • +
    • + 轮位： +
      • +
    • + 轮胎品牌： +
      • +
    • +

      操作类型

      + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizOrderTireDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizOrderTireDetail.java index 61599eb6..796d175b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizOrderTireDetail.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizOrderTireDetail.java @@ -47,6 +47,8 @@ public class BizOrderTireDetail extends BaseEntity @Excel(name = "轮胎状态描述", readConverterExp = "截=图中的“新胎”、“模拟数据”") private String tireStatus; + + public void setDetailId(Long detailId) { this.detailId = detailId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java index 724276bf..c55921e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java @@ -63,4 +63,6 @@ public interface BizMaintenanceOrderMapper public int deleteBizMaintenanceOrderByOrderIds(String[] orderIds); BizMaintenanceOrder selectBizMaintenanceOrderTD(); + + BizMaintenanceOrder selectBizMaintenanceOrderByOrderIdBefore(BizMaintenanceOrder bizMaintenanceOrder); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizOrderTireDetailMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizOrderTireDetailMapper.java index bfdda768..7276ffa2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizOrderTireDetailMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizOrderTireDetailMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import java.util.Map; + import com.ruoyi.system.domain.BizOrderTireDetail; /** @@ -58,4 +60,8 @@ public interface BizOrderTireDetailMapper * @return 结果 */ public int deleteBizOrderTireDetailByDetailIds(String[] detailIds); + + List selectBizOrderTireDetail(BizOrderTireDetail bizOrderTireDetail); + + List selectBaseTrieInstall(String plateNumber); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java index 0315e843..952cc018 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.system.domain.BizMaintenanceOrder; +import org.apache.ibatis.annotations.Param; /** * 维保工单Service接口 @@ -63,4 +64,6 @@ public interface IBizMaintenanceOrderService BizMaintenanceOrder selectBizMaintenanceOrderTD(); + + BizMaintenanceOrder selectBizMaintenanceOrderByOrderIdBefore(BizMaintenanceOrder bizMaintenanceOrder); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizOrderTireDetailService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizOrderTireDetailService.java index d03e9ba8..188e7f6f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizOrderTireDetailService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizOrderTireDetailService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; +import java.util.Map; + import com.ruoyi.system.domain.BizOrderTireDetail; /** @@ -58,4 +60,8 @@ public interface IBizOrderTireDetailService * @return 结果 */ public int deleteBizOrderTireDetailByDetailId(Long detailId); + + List selectBizOrderTireDetail(BizOrderTireDetail bizOrderTireDetail); + + List selectBaseTrieInstall(String plateNumber); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java index 3ef8f7bf..b4931474 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java @@ -127,7 +127,7 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService int m=0,t=0; try { if (isbaseInventory!=null){ - return AjaxResult.error("该轮胎已在仓库！"); + return AjaxResult.error("该轮胎已存在！"); }else { //插入库存表以及基础信息表 baseInventory.setStatus("0"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java index 9cc62f16..22cb056b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java @@ -115,4 +115,9 @@ public class BizMaintenanceOrderServiceImpl implements IBizMaintenanceOrderServi public BizMaintenanceOrder selectBizMaintenanceOrderTD() { return bizMaintenanceOrderMapper.selectBizMaintenanceOrderTD(); } + + @Override + public BizMaintenanceOrder selectBizMaintenanceOrderByOrderIdBefore(BizMaintenanceOrder bizMaintenanceOrder) { + return bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderIdBefore(bizMaintenanceOrder); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizOrderTireDetailServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizOrderTireDetailServiceImpl.java index 503243dd..3470f662 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizOrderTireDetailServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizOrderTireDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; +import java.util.Map; + import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -94,4 +96,14 @@ public class BizOrderTireDetailServiceImpl implements IBizOrderTireDetailService { return bizOrderTireDetailMapper.deleteBizOrderTireDetailByDetailId(detailId); } + + @Override + public List selectBizOrderTireDetail(BizOrderTireDetail bizOrderTireDetail) { + return bizOrderTireDetailMapper.selectBizOrderTireDetail(bizOrderTireDetail); + } + + @Override + public List selectBaseTrieInstall(String plateNumber) { + return bizOrderTireDetailMapper.selectBaseTrieInstall(plateNumber); + } } diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml index a4241b93..75f962bc 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseInventoryMapper.xml @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tyre_rfid = #{tyreRfid} - and tyre_outside_id = #{tyreOutsideId} + and number = #{number} diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml index b8dc64d7..13bbd13c 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml @@ -121,6 +121,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE DATE(create_time) = CURDATE(); + insert into biz_maintenance_order diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml index 746833ee..4b37f18c 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BizOrderTireDetailMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + insert into biz_order_tire_detail