采购需求去掉横向滚动问题

- 在流程任务完成后调用业务状态同步辅助类
- 实现审批通过后的业务状态更新机制
- 集成印章服务与业务状态同步的协调处理
- 确保流程实例与业务数据的一致性同步

fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmMyApplyController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.hrm.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -18,8 +19,10 @@ import com.ruoyi.hrm.domain.vo.HrmMyApplyVo;
 import com.ruoyi.hrm.domain.vo.HrmReimburseReqVo;
 import com.ruoyi.hrm.domain.vo.HrmSealReqVo;
 import com.ruoyi.hrm.domain.vo.HrmTravelReqVo;
+import com.ruoyi.hrm.domain.HrmFlowInstance;
 import com.ruoyi.hrm.mapper.HrmAppropriationReqMapper;
 import com.ruoyi.hrm.mapper.HrmEmployeeMapper;
+import com.ruoyi.hrm.mapper.HrmFlowInstanceMapper;
 import com.ruoyi.hrm.mapper.HrmLeaveReqMapper;
 import com.ruoyi.hrm.mapper.HrmReimburseReqMapper;
 import com.ruoyi.hrm.mapper.HrmSealReqMapper;
@@ -32,7 +35,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -48,6 +53,8 @@ public class HrmMyApplyController extends BaseController {
     private final HrmSealReqMapper sealReqMapper;
     private final HrmReimburseReqMapper reimburseReqMapper;
     private final HrmAppropriationReqMapper appropriationReqMapper;
+    private final HrmFlowInstanceMapper flowInstanceMapper;
+    private final ObjectMapper objectMapper;
 
     @GetMapping("/list")
     public TableDataInfo<HrmMyApplyVo> list(String bizType, String status, String keyword, PageQuery pageQuery) {
@@ -80,6 +87,9 @@ public class HrmMyApplyController extends BaseController {
             all.addAll(mapAppropriation(appropriationReqMapper.selectVoWithProjectList(buildAppropriationBo(emp.getEmpId(), status)), nickName));
         }
 
+        // 用流程实例状态覆盖业务表状态，避免历史数据状态未同步
+        overrideStatusByFlowInstance(all);
+
         if (keyword != null && !keyword.isEmpty()) {
             String lower = keyword.toLowerCase();
             all = all.stream().filter(v -> contains(v, lower)).collect(Collectors.toList());
@@ -93,6 +103,52 @@ public class HrmMyApplyController extends BaseController {
         return TableDataInfo.build(page);
     }
 
+    private void overrideStatusByFlowInstance(List<HrmMyApplyVo> all) {
+        if (all == null || all.isEmpty()) return;
+        Map<String, List<Long>> bizIdsByType = all.stream()
+            .filter(v -> v.getBizType() != null && v.getBizId() != null)
+            .collect(Collectors.groupingBy(
+                HrmMyApplyVo::getBizType,
+                Collectors.mapping(HrmMyApplyVo::getBizId, Collectors.toList())
+            ));
+        Map<String, String> statusByKey = new HashMap<>();
+        bizIdsByType.forEach((bizType, bizIds) -> {
+            if (bizIds.isEmpty()) return;
+            List<HrmFlowInstance> insts = flowInstanceMapper.selectList(
+                new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<HrmFlowInstance>()
+                    .eq(HrmFlowInstance::getBizType, bizType)
+                    .in(HrmFlowInstance::getBizId, bizIds)
+            );
+            for (HrmFlowInstance inst : insts) {
+                if (inst.getStatus() == null) continue;
+                // 合并多个流程实例：优先终态 (approved/rejected/withdrawn) > 进行中 (running/pending)，
+                // 否则前面遗留的"running"会盖掉新的"approved"，导致前端永远显示审批中
+                statusByKey.merge(bizType + "_" + inst.getBizId(), inst.getStatus(),
+                    (oldS, newS) -> _statusPriority(newS) > _statusPriority(oldS) ? newS : oldS);
+            }
+        });
+        for (HrmMyApplyVo v : all) {
+            String s = statusByKey.get(v.getBizType() + "_" + v.getBizId());
+            if (s != null) v.setStatus(s);
+        }
+    }
+
+    private int _statusPriority(String s) {
+        if (s == null) return 0;
+        switch (s) {
+            case "approved":
+            case "done":
+                return 3;
+            case "rejected":
+            case "withdrawn":
+                return 2;
+            case "running":
+            case "pending":
+            default:
+                return 1;
+        }
+    }
+
     private boolean contains(HrmMyApplyVo v, String lower) {
         return Objects.toString(v.getTitle(), "").toLowerCase().contains(lower)
             || Objects.toString(v.getRemark(), "").toLowerCase().contains(lower)
@@ -107,13 +163,14 @@ public class HrmMyApplyController extends BaseController {
     private HrmReimburseReqBo buildReimburseBo(Long empId, String status) { HrmReimburseReqBo bo = new HrmReimburseReqBo(); bo.setEmpId(empId); bo.setStatus(status); return bo; }
     private HrmAppropriationReqBo buildAppropriationBo(Long empId, String status) { HrmAppropriationReqBo bo = new HrmAppropriationReqBo(); bo.setEmpId(empId); bo.setStatus(status); return bo; }
 
-    private List<HrmMyApplyVo> mapLeave(List<HrmLeaveReqVo> list, String nickName) { return list.stream().map(v -> toVo("leave", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
-    private List<HrmMyApplyVo> mapTravel(List<HrmTravelReqVo> list, String nickName) { return list.stream().map(v -> toVo("travel", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
-    private List<HrmMyApplyVo> mapSeal(List<HrmSealReqVo> list, String nickName) { return list.stream().map(v -> toVo("seal", v.getBizId(), v.getEmpId(), nickName, v.getRemark(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
-    private List<HrmMyApplyVo> mapReimburse(List<HrmReimburseReqVo> list, String nickName) { return list.stream().map(v -> toVo("reimburse", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
-    private List<HrmMyApplyVo> mapAppropriation(List<HrmAppropriationReqVo> list, String nickName) { return list.stream().map(v -> toVo("appropriation", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime())).collect(Collectors.toList()); }
+    private List<HrmMyApplyVo> mapLeave(List<HrmLeaveReqVo> list, String nickName) { return list.stream().map(v -> toVo("leave", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime(), v)).collect(Collectors.toList()); }
+    private List<HrmMyApplyVo> mapTravel(List<HrmTravelReqVo> list, String nickName) { return list.stream().map(v -> toVo("travel", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime(), v)).collect(Collectors.toList()); }
+    private List<HrmMyApplyVo> mapSeal(List<HrmSealReqVo> list, String nickName) { return list.stream().map(v -> toVo("seal", v.getBizId(), v.getEmpId(), nickName, v.getPurpose() != null ? v.getPurpose() : v.getRemark(), v.getStatus(), v.getCreateTime(), v)).collect(Collectors.toList()); }
+    private List<HrmMyApplyVo> mapReimburse(List<HrmReimburseReqVo> list, String nickName) { return list.stream().map(v -> toVo("reimburse", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime(), v)).collect(Collectors.toList()); }
+    private List<HrmMyApplyVo> mapAppropriation(List<HrmAppropriationReqVo> list, String nickName) { return list.stream().map(v -> toVo("appropriation", v.getBizId(), v.getEmpId(), nickName, v.getReason(), v.getStatus(), v.getCreateTime(), v)).collect(Collectors.toList()); }
 
-    private HrmMyApplyVo toVo(String bizType, Long bizId, Long empId, String nickName, String title, String status, java.util.Date createTime) {
+    @SuppressWarnings("unchecked")
+    private HrmMyApplyVo toVo(String bizType, Long bizId, Long empId, String nickName, String title, String status, java.util.Date createTime, Object source) {
         HrmMyApplyVo vo = new HrmMyApplyVo();
         vo.setBizType(bizType);
         vo.setBizId(bizId);
@@ -122,6 +179,9 @@ public class HrmMyApplyController extends BaseController {
         vo.setTitle(title);
         vo.setStatus(status);
         vo.setCreateTime(createTime);
+        if (source != null) {
+            vo.setBizData(objectMapper.convertValue(source, Map.class));
+        }
         return vo;
     }
 }

fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Map;
 
 @Data
 public class HrmFlowInstanceVo implements Serializable {
@@ -41,4 +42,7 @@ public class HrmFlowInstanceVo implements Serializable {
     private Date createTime;
     private String updateBy;
     private Date updateTime;
+
+    /** 业务表回填的数据，用于列表关键信息展示 */
+    private Map<String, Object> bizData;
 }

fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmMyApplyVo.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 
 @Data
 public class HrmMyApplyVo implements Serializable {
@@ -21,4 +22,5 @@ public class HrmMyApplyVo implements Serializable {
     private Date endTime;
     private Date actualEndTime;
     private String remark;
+    private Map<String, Object> bizData;
 }

fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.service.UserService;
@@ -27,7 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -42,6 +45,11 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
     private final UserService userService;
     private final HrmFlowCcMapper ccMapper;
     private final HrmTravelReqMapper travelReqMapper;
+    private final HrmLeaveReqMapper leaveReqMapper;
+    private final HrmSealReqMapper sealReqMapper;
+    private final HrmReimburseReqMapper reimburseReqMapper;
+    private final HrmAppropriationReqMapper appropriationReqMapper;
+    private final ObjectMapper objectMapper;
     private final ApplicationEventPublisher eventPublisher;
 
     @Override
@@ -188,9 +196,55 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
                 }
             }
         }
+        fillInstanceBizData(result.getRecords());
         return TableDataInfo.build(result);
     }
 
+    @SuppressWarnings("unchecked")
+    private void fillInstanceBizData(List<HrmFlowInstanceVo> records) {
+        if (records == null || records.isEmpty()) return;
+        Map<String, List<Long>> bizIdsByType = records.stream()
+            .filter(v -> v.getBizType() != null && v.getBizId() != null)
+            .collect(Collectors.groupingBy(
+                HrmFlowInstanceVo::getBizType,
+                Collectors.mapping(HrmFlowInstanceVo::getBizId, Collectors.toList())
+            ));
+        Map<String, Object> bizDataMap = new HashMap<>();
+        bizIdsByType.forEach((bizType, bizIds) -> {
+            if (bizIds.isEmpty()) return;
+            switch (bizType) {
+                case "leave":
+                    leaveReqMapper.selectBatchIds(bizIds).forEach(d ->
+                        bizDataMap.put("leave_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
+                    break;
+                case "travel":
+                    travelReqMapper.selectBatchIds(bizIds).forEach(d ->
+                        bizDataMap.put("travel_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
+                    break;
+                case "seal":
+                    sealReqMapper.selectBatchIds(bizIds).forEach(d ->
+                        bizDataMap.put("seal_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
+                    break;
+                case "reimburse":
+                    reimburseReqMapper.selectBatchIds(bizIds).forEach(d ->
+                        bizDataMap.put("reimburse_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
+                    break;
+                case "appropriation":
+                    appropriationReqMapper.selectBatchIds(bizIds).forEach(d ->
+                        bizDataMap.put("appropriation_" + d.getBizId(), objectMapper.convertValue(d, Map.class)));
+                    break;
+                default:
+                    break;
+            }
+        });
+        records.forEach(vo -> {
+            Object data = bizDataMap.get(vo.getBizType() + "_" + vo.getBizId());
+            if (data != null) {
+                vo.setBizData((Map<String, Object>) data);
+            }
+        });
+    }
+
     @Override
     public List<HrmFlowInstanceVo> queryList(HrmFlowInstanceBo bo) {
         LambdaQueryWrapper<HrmFlowInstance> lqw = buildQueryWrapper(bo);

fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java

@@ -286,6 +286,7 @@ private void fillBizData(List<HrmFlowTaskVo> tasks) {
                     sealReqService.stampWithJava(inst.getBizId(), stampBo);
                 }
             }
+            bizStatusSyncHelper.setBizApproved(inst.getBizType(), inst.getBizId());
         }
         return true;
     }

fad-rolling-mill/migration_layer1.js

@@ -0,0 +1,47 @@
+const mysql = require('mysql2/promise');
+
+async function run() {
+  const conn = await mysql.createConnection({
+    host: '49.232.154.205',
+    port: 13306,
+    user: 'root',
+    password: 'Root@12345',
+    database: 'fad_oa_dev'
+  });
+
+  console.log('Connected. Running migration...\n');
+
+  // 1. Add manager_id to fad_rm_project
+  await conn.execute(`
+    ALTER TABLE fad_rm_project
+    ADD COLUMN manager_id BIGINT DEFAULT NULL COMMENT '项目经理用户ID，关联sys_user.user_id'
+    AFTER manager
+  `);
+  console.log('✓ Added manager_id to fad_rm_project');
+
+  // 2. Create fad_rm_project_member table
+  await conn.execute(`
+    CREATE TABLE IF NOT EXISTS fad_rm_project_member (
+      member_id   BIGINT       NOT NULL AUTO_INCREMENT COMMENT '成员ID',
+      project_id  BIGINT       NOT NULL                COMMENT '项目ID',
+      user_id     BIGINT       NOT NULL                COMMENT '用户ID',
+      role        VARCHAR(50)  DEFAULT 'member'         COMMENT '角色: manager/member/viewer',
+      create_by   VARCHAR(64)  DEFAULT ''              COMMENT '创建者',
+      create_time DATETIME     DEFAULT NULL            COMMENT '创建时间',
+      update_by   VARCHAR(64)  DEFAULT ''              COMMENT '更新者',
+      update_time DATETIME     DEFAULT NULL            COMMENT '更新时间',
+      del_flag    INT          DEFAULT 0               COMMENT '删除标志',
+      PRIMARY KEY (member_id),
+      UNIQUE KEY uk_project_user (project_id, user_id)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目成员表'
+  `);
+  console.log('✓ Created fad_rm_project_member table');
+
+  await conn.end();
+  console.log('\nMigration complete!');
+}
+
+run().catch(err => {
+  console.error('Migration failed:', err.message);
+  process.exit(1);
+});

fad-rolling-mill/pom.xml

@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-flowable-plus</artifactId>
+        <version>0.8.3</version>
+    </parent>
+    <artifactId>fad-rolling-mill</artifactId>
+    <name>fad-rolling-mill</name>
+    <description>连轧机/可逆轧机设备总包项目管理系统</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.9</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.35</version>
+        </dependency>
+    </dependencies>
+</project>

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceChecklistController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmAcceptanceChecklistBo;
+import com.ruoyi.rm.domain.vo.RmAcceptanceChecklistVo;
+import com.ruoyi.rm.service.IRmAcceptanceChecklistService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/acceptanceChecklist")
+public class RmAcceptanceChecklistController extends BaseController {
+
+    private final IRmAcceptanceChecklistService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmAcceptanceChecklistVo> list(RmAcceptanceChecklistBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{checkId}")
+    public R<RmAcceptanceChecklistVo> getInfo(@PathVariable @NotNull Long checkId) {
+        return R.ok(service.queryById(checkId));
+    }
+
+    @Log(title = "验收检查清单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmAcceptanceChecklistBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "验收检查清单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmAcceptanceChecklistBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "验收检查清单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{checkIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] checkIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(checkIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmAcceptanceChecklistVo>> all(RmAcceptanceChecklistBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmAcceptanceItemController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmAcceptanceItemBo;
+import com.ruoyi.rm.domain.vo.RmAcceptanceItemVo;
+import com.ruoyi.rm.service.IRmAcceptanceItemService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/acceptanceItem")
+public class RmAcceptanceItemController extends BaseController {
+
+    private final IRmAcceptanceItemService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmAcceptanceItemVo> list(RmAcceptanceItemBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{acceptItemId}")
+    public R<RmAcceptanceItemVo> getInfo(@PathVariable @NotNull Long acceptItemId) {
+        return R.ok(service.queryById(acceptItemId));
+    }
+
+    @Log(title = "安装验收项", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmAcceptanceItemBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装验收项", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmAcceptanceItemBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装验收项", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{acceptItemIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] acceptItemIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(acceptItemIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmAcceptanceItemVo>> all(RmAcceptanceItemBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmBudgetController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmBudgetBo;
+import com.ruoyi.rm.domain.vo.RmBudgetVo;
+import com.ruoyi.rm.service.IRmBudgetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/budget")
+public class RmBudgetController extends BaseController {
+
+    private final IRmBudgetService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmBudgetVo> list(RmBudgetBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{budgetId}")
+    public R<RmBudgetVo> getInfo(@PathVariable @NotNull Long budgetId) {
+        return R.ok(service.queryById(budgetId));
+    }
+
+    @Log(title = "项目预算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmBudgetBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "项目预算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmBudgetBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "项目预算", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{budgetIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] budgetIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(budgetIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<List<RmBudgetVo>> all(RmBudgetBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmColorCardController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmColorCardBo;
+import com.ruoyi.rm.domain.vo.RmColorCardVo;
+import com.ruoyi.rm.service.IRmColorCardService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/colorCard")
+public class RmColorCardController extends BaseController {
+
+    private final IRmColorCardService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmColorCardVo> list(RmColorCardBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{colorCardId}")
+    public R<RmColorCardVo> getInfo(@PathVariable @NotNull Long colorCardId) {
+        return R.ok(service.queryById(colorCardId));
+    }
+
+    @Log(title = "色卡管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmColorCardBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "色卡管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmColorCardBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "色卡管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{colorCardIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] colorCardIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(colorCardIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmColorCardVo>> all(RmColorCardBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningChecklistController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmCommissioningChecklistBo;
+import com.ruoyi.rm.domain.vo.RmCommissioningChecklistVo;
+import com.ruoyi.rm.service.IRmCommissioningChecklistService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/commissioningChecklist")
+public class RmCommissioningChecklistController extends BaseController {
+
+    private final IRmCommissioningChecklistService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmCommissioningChecklistVo> list(RmCommissioningChecklistBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{checkId}")
+    public R<RmCommissioningChecklistVo> getInfo(@PathVariable @NotNull Long checkId) {
+        return R.ok(service.queryById(checkId));
+    }
+
+    @Log(title = "热负荷试车CheckList", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmCommissioningChecklistBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "热负荷试车CheckList", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmCommissioningChecklistBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "热负荷试车CheckList", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{checkIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] checkIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(checkIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmCommissioningChecklistVo>> all(RmCommissioningChecklistBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningClauseController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmCommissioningClauseBo;
+import com.ruoyi.rm.domain.vo.RmCommissioningClauseVo;
+import com.ruoyi.rm.service.IRmCommissioningClauseService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/commissioningClause")
+public class RmCommissioningClauseController extends BaseController {
+
+    private final IRmCommissioningClauseService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmCommissioningClauseVo> list(RmCommissioningClauseBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{clauseId}")
+    public R<RmCommissioningClauseVo> getInfo(@PathVariable @NotNull Long clauseId) {
+        return R.ok(service.queryById(clauseId));
+    }
+
+    @Log(title = "热负荷试车条款", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmCommissioningClauseBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "热负荷试车条款", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmCommissioningClauseBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "热负荷试车条款", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{clauseIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] clauseIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(clauseIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmCommissioningClauseVo>> all(RmCommissioningClauseBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java

@@ -0,0 +1,25 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.rm.service.IRmDashboardService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/dashboard")
+public class RmDashboardController extends BaseController {
+
+    private final IRmDashboardService dashboardService;
+
+    @GetMapping("/stageStatus/{projectId}")
+    public R<Map<String, String>> stageStatus(@PathVariable @NotNull Long projectId) {
+        return R.ok(dashboardService.getStageStatus(projectId));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDocLibController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmDocLibBo;
+import com.ruoyi.rm.domain.vo.RmDocLibVo;
+import com.ruoyi.rm.service.IRmDocLibService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/docLib")
+public class RmDocLibController extends BaseController {
+
+    private final IRmDocLibService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmDocLibVo> list(RmDocLibBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{docId}")
+    public R<RmDocLibVo> getInfo(@PathVariable @NotNull Long docId) {
+        return R.ok(service.queryById(docId));
+    }
+
+    @Log(title = "图纸资料库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmDocLibBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "图纸资料库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmDocLibBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "图纸资料库", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{docIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] docIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(docIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmDocLibVo>> all(RmDocLibBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingCompareController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmDrawingCompareBo;
+import com.ruoyi.rm.domain.vo.RmDrawingCompareVo;
+import com.ruoyi.rm.service.IRmDrawingCompareService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/drawingCompare")
+public class RmDrawingCompareController extends BaseController {
+
+    private final IRmDrawingCompareService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmDrawingCompareVo> list(RmDrawingCompareBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{compareId}")
+    public R<RmDrawingCompareVo> getInfo(@PathVariable @NotNull Long compareId) {
+        return R.ok(service.queryById(compareId));
+    }
+
+    @Log(title = "图纸优化比较", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmDrawingCompareBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "图纸优化比较", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmDrawingCompareBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "图纸优化比较", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{compareIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] compareIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(compareIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmDrawingCompareVo>> all(RmDrawingCompareBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingDesignController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmDrawingDesignBo;
+import com.ruoyi.rm.domain.vo.RmDrawingDesignVo;
+import com.ruoyi.rm.service.IRmDrawingDesignService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/drawingDesign")
+public class RmDrawingDesignController extends BaseController {
+
+    private final IRmDrawingDesignService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmDrawingDesignVo> list(RmDrawingDesignBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{drawingId}")
+    public R<RmDrawingDesignVo> getInfo(@PathVariable @NotNull Long drawingId) {
+        return R.ok(service.queryById(drawingId));
+    }
+
+    @Log(title = "图纸详细设计", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmDrawingDesignBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "图纸详细设计", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmDrawingDesignBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "图纸详细设计", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{drawingIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] drawingIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(drawingIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmDrawingDesignVo>> all(RmDrawingDesignBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingReviewController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmDrawingReviewBo;
+import com.ruoyi.rm.domain.vo.RmDrawingReviewVo;
+import com.ruoyi.rm.service.IRmDrawingReviewService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/drawingReview")
+public class RmDrawingReviewController extends BaseController {
+
+    private final IRmDrawingReviewService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmDrawingReviewVo> list(RmDrawingReviewBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{reviewId}")
+    public R<RmDrawingReviewVo> getInfo(@PathVariable @NotNull Long reviewId) {
+        return R.ok(service.queryById(reviewId));
+    }
+
+    @Log(title = "图纸审查", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmDrawingReviewBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "图纸审查", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmDrawingReviewBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "图纸审查", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{reviewIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] reviewIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(reviewIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmDrawingReviewVo>> all(RmDrawingReviewBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallFeedbackController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmInstallFeedbackBo;
+import com.ruoyi.rm.domain.vo.RmInstallFeedbackVo;
+import com.ruoyi.rm.service.IRmInstallFeedbackService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/installFeedback")
+public class RmInstallFeedbackController extends BaseController {
+
+    private final IRmInstallFeedbackService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmInstallFeedbackVo> list(RmInstallFeedbackBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{feedbackId}")
+    public R<RmInstallFeedbackVo> getInfo(@PathVariable @NotNull Long feedbackId) {
+        return R.ok(service.queryById(feedbackId));
+    }
+
+    @Log(title = "安装问题反馈", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmInstallFeedbackBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装问题反馈", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmInstallFeedbackBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装问题反馈", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{feedbackIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] feedbackIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(feedbackIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmInstallFeedbackVo>> all(RmInstallFeedbackBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPersonnelController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmInstallPersonnelBo;
+import com.ruoyi.rm.domain.vo.RmInstallPersonnelVo;
+import com.ruoyi.rm.service.IRmInstallPersonnelService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/installPersonnel")
+public class RmInstallPersonnelController extends BaseController {
+
+    private final IRmInstallPersonnelService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmInstallPersonnelVo> list(RmInstallPersonnelBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{personnelId}")
+    public R<RmInstallPersonnelVo> getInfo(@PathVariable @NotNull Long personnelId) {
+        return R.ok(service.queryById(personnelId));
+    }
+
+    @Log(title = "安装人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmInstallPersonnelBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmInstallPersonnelBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装人员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{personnelIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] personnelIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(personnelIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmInstallPersonnelVo>> all(RmInstallPersonnelBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallPrecisionController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmInstallPrecisionBo;
+import com.ruoyi.rm.domain.vo.RmInstallPrecisionVo;
+import com.ruoyi.rm.service.IRmInstallPrecisionService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/installPrecision")
+public class RmInstallPrecisionController extends BaseController {
+
+    private final IRmInstallPrecisionService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmInstallPrecisionVo> list(RmInstallPrecisionBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{precisionId}")
+    public R<RmInstallPrecisionVo> getInfo(@PathVariable @NotNull Long precisionId) {
+        return R.ok(service.queryById(precisionId));
+    }
+
+    @Log(title = "安装精度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmInstallPrecisionBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装精度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmInstallPrecisionBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装精度", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{precisionIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] precisionIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(precisionIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmInstallPrecisionVo>> all(RmInstallPrecisionBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallProgressController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmInstallProgressBo;
+import com.ruoyi.rm.domain.vo.RmInstallProgressVo;
+import com.ruoyi.rm.service.IRmInstallProgressService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/installProgress")
+public class RmInstallProgressController extends BaseController {
+
+    private final IRmInstallProgressService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmInstallProgressVo> list(RmInstallProgressBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{progressId}")
+    public R<RmInstallProgressVo> getInfo(@PathVariable @NotNull Long progressId) {
+        return R.ok(service.queryById(progressId));
+    }
+
+    @Log(title = "安装进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmInstallProgressBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmInstallProgressBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装进度", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{progressIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] progressIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(progressIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmInstallProgressVo>> all(RmInstallProgressBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmInstallToolController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmInstallToolBo;
+import com.ruoyi.rm.domain.vo.RmInstallToolVo;
+import com.ruoyi.rm.service.IRmInstallToolService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/installTool")
+public class RmInstallToolController extends BaseController {
+
+    private final IRmInstallToolService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmInstallToolVo> list(RmInstallToolBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{toolId}")
+    public R<RmInstallToolVo> getInfo(@PathVariable @NotNull Long toolId) {
+        return R.ok(service.queryById(toolId));
+    }
+
+    @Log(title = "安装工具", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmInstallToolBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "安装工具", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmInstallToolBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "安装工具", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{toolIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] toolIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(toolIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmInstallToolVo>> all(RmInstallToolBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmLayoutFileController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmLayoutFileBo;
+import com.ruoyi.rm.domain.vo.RmLayoutFileVo;
+import com.ruoyi.rm.service.IRmLayoutFileService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/layout")
+public class RmLayoutFileController extends BaseController {
+
+    private final IRmLayoutFileService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmLayoutFileVo> list(RmLayoutFileBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{layoutFileId}")
+    public R<RmLayoutFileVo> getInfo(@PathVariable @NotNull Long layoutFileId) {
+        return R.ok(service.queryById(layoutFileId));
+    }
+
+    @Log(title = "布局图确定", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmLayoutFileBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "布局图确定", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmLayoutFileBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "布局图确定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{layoutFileIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] layoutFileIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(layoutFileIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmLayoutFileVo>> all(RmLayoutFileBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmManualController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmManualBo;
+import com.ruoyi.rm.domain.vo.RmManualVo;
+import com.ruoyi.rm.service.IRmManualService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/manual")
+public class RmManualController extends BaseController {
+
+    private final IRmManualService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmManualVo> list(RmManualBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{manualId}")
+    public R<RmManualVo> getInfo(@PathVariable @NotNull Long manualId) {
+        return R.ok(service.queryById(manualId));
+    }
+
+    @Log(title = "设备说明书", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmManualBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "设备说明书", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmManualBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "设备说明书", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{manualIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] manualIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(manualIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmManualVo>> all(RmManualBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgDeviceController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmMfgDeviceBo;
+import com.ruoyi.rm.domain.vo.RmMfgDeviceVo;
+import com.ruoyi.rm.service.IRmMfgDeviceService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/mfgDevice")
+public class RmMfgDeviceController extends BaseController {
+
+    private final IRmMfgDeviceService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmMfgDeviceVo> list(RmMfgDeviceBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{deviceId}")
+    public R<RmMfgDeviceVo> getInfo(@PathVariable @NotNull Long deviceId) {
+        return R.ok(service.queryById(deviceId));
+    }
+
+    @Log(title = "设备制造", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmMfgDeviceBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "设备制造", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmMfgDeviceBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "设备制造", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deviceIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] deviceIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(deviceIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmMfgDeviceVo>> all(RmMfgDeviceBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgStageController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmMfgStageBo;
+import com.ruoyi.rm.domain.vo.RmMfgStageVo;
+import com.ruoyi.rm.service.IRmMfgStageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/mfgStage")
+public class RmMfgStageController extends BaseController {
+
+    private final IRmMfgStageService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmMfgStageVo> list(RmMfgStageBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{stageId}")
+    public R<RmMfgStageVo> getInfo(@PathVariable @NotNull Long stageId) {
+        return R.ok(service.queryById(stageId));
+    }
+
+    @Log(title = "制造阶段", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmMfgStageBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "制造阶段", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmMfgStageBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "制造阶段", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{stageIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] stageIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(stageIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmMfgStageVo>> all(RmMfgStageBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementContractController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmProcurementContractBo;
+import com.ruoyi.rm.domain.vo.RmProcurementContractVo;
+import com.ruoyi.rm.service.IRmProcurementContractService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/contract")
+public class RmProcurementContractController extends BaseController {
+
+    private final IRmProcurementContractService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmProcurementContractVo> list(RmProcurementContractBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{contractId}")
+    public R<RmProcurementContractVo> getInfo(@PathVariable @NotNull Long contractId) {
+        return R.ok(service.queryById(contractId));
+    }
+
+    @Log(title = "合同管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmProcurementContractBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "合同管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmProcurementContractBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "合同管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{contractIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] contractIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(contractIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmProcurementContractVo>> all(RmProcurementContractBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementProgressController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmProcurementProgressBo;
+import com.ruoyi.rm.domain.vo.RmProcurementProgressVo;
+import com.ruoyi.rm.service.IRmProcurementProgressService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/procProgress")
+public class RmProcurementProgressController extends BaseController {
+
+    private final IRmProcurementProgressService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmProcurementProgressVo> list(RmProcurementProgressBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{progressId}")
+    public R<RmProcurementProgressVo> getInfo(@PathVariable @NotNull Long progressId) {
+        return R.ok(service.queryById(progressId));
+    }
+
+    @Log(title = "采购进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmProcurementProgressBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "采购进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmProcurementProgressBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "采购进度", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{progressIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] progressIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(progressIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmProcurementProgressVo>> all(RmProcurementProgressBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementQuoteController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmProcurementQuoteBo;
+import com.ruoyi.rm.domain.vo.RmProcurementQuoteVo;
+import com.ruoyi.rm.service.IRmProcurementQuoteService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/quote")
+public class RmProcurementQuoteController extends BaseController {
+
+    private final IRmProcurementQuoteService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmProcurementQuoteVo> list(RmProcurementQuoteBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{quoteId}")
+    public R<RmProcurementQuoteVo> getInfo(@PathVariable @NotNull Long quoteId) {
+        return R.ok(service.queryById(quoteId));
+    }
+
+    @Log(title = "报价管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmProcurementQuoteBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "报价管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmProcurementQuoteBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "报价管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{quoteIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] quoteIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(quoteIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmProcurementQuoteVo>> all(RmProcurementQuoteBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmProjectBo;
+import com.ruoyi.rm.domain.vo.RmProjectVo;
+import com.ruoyi.rm.service.IRmProjectService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/project")
+public class RmProjectController extends BaseController {
+
+    private final IRmProjectService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmProjectVo> list(RmProjectBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{projectId}")
+    public R<RmProjectVo> getInfo(@PathVariable @NotNull Long projectId) {
+        return R.ok(service.queryById(projectId));
+    }
+
+    @Log(title = "轧机项目管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmProjectBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "轧机项目管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmProjectBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "轧机项目管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{projectIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] projectIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(projectIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<List<RmProjectVo>> all(RmProjectBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectMemberController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmProjectMemberBo;
+import com.ruoyi.rm.domain.vo.RmProjectMemberVo;
+import com.ruoyi.rm.service.IRmProjectMemberService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/projectMember")
+public class RmProjectMemberController extends BaseController {
+
+    private final IRmProjectMemberService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmProjectMemberVo> list(RmProjectMemberBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{memberId}")
+    public R<RmProjectMemberVo> getInfo(@PathVariable @NotNull Long memberId) {
+        return R.ok(service.queryById(memberId));
+    }
+
+    @Log(title = "项目成员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmProjectMemberBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "项目成员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmProjectMemberBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "项目成员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{memberIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] memberIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(memberIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<List<RmProjectMemberVo>> all(RmProjectMemberBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingChecklistController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmShippingChecklistBo;
+import com.ruoyi.rm.domain.vo.RmShippingChecklistVo;
+import com.ruoyi.rm.service.IRmShippingChecklistService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/shippingChecklist")
+public class RmShippingChecklistController extends BaseController {
+
+    private final IRmShippingChecklistService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmShippingChecklistVo> list(RmShippingChecklistBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{checklistId}")
+    public R<RmShippingChecklistVo> getInfo(@PathVariable @NotNull Long checklistId) {
+        return R.ok(service.queryById(checklistId));
+    }
+
+    @Log(title = "发货前检查清单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmShippingChecklistBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "发货前检查清单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmShippingChecklistBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "发货前检查清单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{checklistIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] checklistIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(checklistIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmShippingChecklistVo>> all(RmShippingChecklistBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmShippingItemController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmShippingItemBo;
+import com.ruoyi.rm.domain.vo.RmShippingItemVo;
+import com.ruoyi.rm.service.IRmShippingItemService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/shippingItem")
+public class RmShippingItemController extends BaseController {
+
+    private final IRmShippingItemService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmShippingItemVo> list(RmShippingItemBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{itemId}")
+    public R<RmShippingItemVo> getInfo(@PathVariable @NotNull Long itemId) {
+        return R.ok(service.queryById(itemId));
+    }
+
+    @Log(title = "发货设备项", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmShippingItemBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "发货设备项", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmShippingItemBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "发货设备项", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{itemIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] itemIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(itemIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmShippingItemVo>> all(RmShippingItemBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmSiteModBo;
+import com.ruoyi.rm.domain.vo.RmSiteModVo;
+import com.ruoyi.rm.service.IRmSiteModService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/siteMod")
+public class RmSiteModController extends BaseController {
+
+    private final IRmSiteModService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmSiteModVo> list(RmSiteModBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{modId}")
+    public R<RmSiteModVo> getInfo(@PathVariable @NotNull Long modId) {
+        return R.ok(service.queryById(modId));
+    }
+
+    @Log(title = "现场修改", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmSiteModBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "现场修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmSiteModBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "现场修改", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{modIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] modIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(modIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmSiteModVo>> all(RmSiteModBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmSiteModMediaController.java

@@ -0,0 +1,54 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmSiteModMediaBo;
+import com.ruoyi.rm.domain.vo.RmSiteModMediaVo;
+import com.ruoyi.rm.service.IRmSiteModMediaService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/siteModMedia")
+public class RmSiteModMediaController extends BaseController {
+
+    private final IRmSiteModMediaService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmSiteModMediaVo> list(RmSiteModMediaBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{mediaId}")
+    public R<RmSiteModMediaVo> getInfo(@PathVariable @NotNull Long mediaId) {
+        return R.ok(service.queryById(mediaId));
+    }
+
+    @Log(title = "现场修改多媒体", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmSiteModMediaBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "现场修改多媒体", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{mediaIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] mediaIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(mediaIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmSiteModMediaVo>> all(RmSiteModMediaBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechPlanItemController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmTechPlanItemBo;
+import com.ruoyi.rm.domain.vo.RmTechPlanItemVo;
+import com.ruoyi.rm.service.IRmTechPlanItemService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/techPlan")
+public class RmTechPlanItemController extends BaseController {
+
+    private final IRmTechPlanItemService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmTechPlanItemVo> list(RmTechPlanItemBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{planItemId}")
+    public R<RmTechPlanItemVo> getInfo(@PathVariable @NotNull Long planItemId) {
+        return R.ok(service.queryById(planItemId));
+    }
+
+    @Log(title = "技术方案确定", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmTechPlanItemBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "技术方案确定", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmTechPlanItemBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "技术方案确定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{planItemIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] planItemIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(planItemIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmTechPlanItemVo>> all(RmTechPlanItemBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechReviewItemController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmTechReviewItemBo;
+import com.ruoyi.rm.domain.vo.RmTechReviewItemVo;
+import com.ruoyi.rm.service.IRmTechReviewItemService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/techReview")
+public class RmTechReviewItemController extends BaseController {
+
+    private final IRmTechReviewItemService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmTechReviewItemVo> list(RmTechReviewItemBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{reviewItemId}")
+    public R<RmTechReviewItemVo> getInfo(@PathVariable @NotNull Long reviewItemId) {
+        return R.ok(service.queryById(reviewItemId));
+    }
+
+    @Log(title = "技术审查", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmTechReviewItemBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "技术审查", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmTechReviewItemBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "技术审查", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{reviewItemIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] reviewItemIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(reviewItemIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<java.util.List<RmTechReviewItemVo>> all(RmTechReviewItemBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceChecklistBo.java

@@ -0,0 +1,16 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmAcceptanceChecklistBo extends BaseEntity {
+    private Long checkId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmAcceptanceItemBo.java

@@ -0,0 +1,24 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmAcceptanceItemBo extends BaseEntity {
+    private Long acceptItemId;
+    private Long projectId;
+    private String itemName;
+    private String requirement;
+    private String actualValue;
+    private String result;
+    private String notes;
+    private String inspector;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inspectDate;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmBudgetBo.java

@@ -0,0 +1,22 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmBudgetBo extends BaseEntity {
+
+    private Long budgetId;
+    private Long projectId;
+    private String category;
+    private String item;
+    private BigDecimal budgetAmount;
+    private BigDecimal spentAmount;
+    private String status;
+    private String archiveBatch;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmColorCardBo.java

@@ -0,0 +1,22 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmColorCardBo extends BaseEntity {
+
+    private Long colorCardId;
+    private Long projectId;
+    private String colorName;
+    private String hexValue;
+    private String standard;
+    private String standardLabel;
+    private String category;
+    private String usageDesc;
+    private String description;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningChecklistBo.java

@@ -0,0 +1,16 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmCommissioningChecklistBo extends BaseEntity {
+    private Long checkId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningClauseBo.java

@@ -0,0 +1,18 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmCommissioningClauseBo extends BaseEntity {
+    private Long clauseId;
+    private Long projectId;
+    private String clause;
+    private String standard;
+    private String result;
+    private String passFlag;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDocLibBo.java

@@ -0,0 +1,24 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmDocLibBo extends BaseEntity {
+    private Long docId;
+    private Long projectId;
+    private String docName;
+    private String category;
+    private String version;
+    private String uploader;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String fileUrl;
+    private String description;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingCompareBo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmDrawingCompareBo extends BaseEntity {
+    private Long compareId;
+    private Long projectId;
+    private String drawingName;
+    private String oldVersion;
+    private String newVersion;
+    private String optimizer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date compareDate;
+    private String status;
+    private String beforeDesc;
+    private String afterDesc;
+    private String diffNotes;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingDesignBo.java

@@ -0,0 +1,28 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmDrawingDesignBo extends BaseEntity {
+
+    private Long drawingId;
+    private Long projectId;
+    private String drawingName;
+    private String drawingNo;
+    private String version;
+    private String drawingType;
+    private String drawer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+    private String fileUrl;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingReviewBo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmDrawingReviewBo extends BaseEntity {
+
+    private Long reviewId;
+    private Long projectId;
+    private Long drawingId;
+    private String drawingName;
+    private String drawingNo;
+    private String version;
+    private String fileUrl;
+    private String status;
+    private String reviewer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reviewDate;
+    private String reviewOpinion;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallFeedbackBo.java

@@ -0,0 +1,25 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmInstallFeedbackBo extends BaseEntity {
+    private Long feedbackId;
+    private Long projectId;
+    private String title;
+    private String location;
+    private String proposer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date feedbackDate;
+    private String issueDesc;
+    private String solution;
+    private String preventAction;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPersonnelBo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmInstallPersonnelBo extends BaseEntity {
+    private Long personnelId;
+    private Long projectId;
+    private String name;
+    private String nameEn;
+    private String position;
+    private String positionEn;
+    private String planIn;
+    private String planOut;
+    private Integer days;
+    private BigDecimal dailyRate;
+    private BigDecimal totalWages;
+    private String duty;
+    private String qualification;
+    private String phone;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallPrecisionBo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmInstallPrecisionBo extends BaseEntity {
+    private Long precisionId;
+    private Long projectId;
+    private String systemName;
+    private String itemName;
+    private String nameEn;
+    private String targetValue;
+    private String unit;
+    private String importance;
+    private String tool;
+    private String methodDesc;
+    private String standardRef;
+    private String requirement;
+    private String actualValue;
+    private String isQualified;
+    private String photos;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallProgressBo.java

@@ -0,0 +1,30 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmInstallProgressBo extends BaseEntity {
+
+    private Long progressId;
+    private Long projectId;
+    private String itemName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualEnd;
+    private String status;
+    private String delayReason;
+    private String images;
+    private String videos;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallToolBo.java

@@ -0,0 +1,31 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmInstallToolBo extends BaseEntity {
+    private Long toolId;
+    private Long projectId;
+    private String name;
+    private String nameEn;
+    private String spec;
+    private Integer qty;
+    private String unit;
+    private BigDecimal unitPrice;
+    private BigDecimal totalPrice;
+    private String priority;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date arrivalDate;
+    private String purpose;
+    private String responsible;
+    private String status;
+    private String category;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmLayoutFileBo.java

@@ -0,0 +1,24 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmLayoutFileBo extends BaseEntity {
+
+    private Long layoutFileId;
+    private Long projectId;
+    private String fileName;
+    private String version;
+    private String fileType;
+    private String fileUrl;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmManualBo.java

@@ -0,0 +1,23 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmManualBo extends BaseEntity {
+    private Long manualId;
+    private Long projectId;
+    private String manualName;
+    private String docType;
+    private String version;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String fileUrl;
+    private String description;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgDeviceBo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmMfgDeviceBo extends BaseEntity {
+
+    private Long deviceId;
+    private Long projectId;
+    private String deviceName;
+    private String spec;
+    private String supplierName;
+    private String contractNo;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date orderDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date deliveryDate;
+    private BigDecimal penaltyRate;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgStageBo.java

@@ -0,0 +1,35 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmMfgStageBo extends BaseEntity {
+
+    private Long stageId;
+    private Long deviceId;
+    private String stageKey;
+    private String stageName;
+    private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date submittedDate;
+    private String manufacturingPhotos;
+    private String manufacturingVideo;
+    private String materialReport;
+    private String precisionReport;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementContractBo.java

@@ -0,0 +1,28 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmProcurementContractBo extends BaseEntity {
+
+    private Long contractId;
+    private Long projectId;
+    private String contractNo;
+    private String contractName;
+    private String supplierName;
+    private BigDecimal totalAmount;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date signDate;
+    private String fileUrl;
+    private String status;
+    private String clauses;
+    private String penaltyClause;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementProgressBo.java

@@ -0,0 +1,30 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmProcurementProgressBo extends BaseEntity {
+
+    private Long progressId;
+    private Long projectId;
+    private String itemName;
+    private String supplierName;
+    private String contractNo;
+    private BigDecimal amount;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date orderDate;
+    private String currentStage;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expectDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualDate;
+    private String stages;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementQuoteBo.java

@@ -0,0 +1,33 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmProcurementQuoteBo extends BaseEntity {
+
+    private Long quoteId;
+    private Long projectId;
+    private String supplierName;
+    private String itemName;
+    private String spec;
+    private Integer qty;
+    private String unit;
+    private BigDecimal unitPrice;
+    private BigDecimal totalPrice;
+    private Integer deliveryDays;
+    private Integer warrantyMonths;
+    private BigDecimal scorePrice;
+    private BigDecimal scoreDelivery;
+    private BigDecimal scoreWarranty;
+    private BigDecimal scoreTotal;
+    private Integer scoreRank;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmProjectBo extends BaseEntity {
+
+    private Long projectId;
+    private String projectName;
+    private String projectNo;
+    private String clientName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+    private String manager;
+    private Long managerId;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectMemberBo.java

@@ -0,0 +1,14 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmProjectMemberBo extends BaseEntity {
+    private Long memberId;
+    private Long projectId;
+    private Long userId;
+    private String role;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingChecklistBo.java

@@ -0,0 +1,16 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmShippingChecklistBo extends BaseEntity {
+    private Long checklistId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmShippingItemBo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmShippingItemBo extends BaseEntity {
+    private Long itemId;
+    private Long projectId;
+    private String deviceName;
+    private String spec;
+    private Integer qty;
+    private String packed;
+    private String photos;
+    private String note;
+    private String destination;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date shipDate;
+    private String status;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModBo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmSiteModBo extends BaseEntity {
+    private Long modId;
+    private Long projectId;
+    private String deviceName;
+    private String location;
+    private String modReason;
+    private String solution;
+    private String modPerson;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date modDate;
+    private String status;
+    private String preventAction;
+    private String drawingUpdated;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmSiteModMediaBo.java

@@ -0,0 +1,17 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmSiteModMediaBo extends BaseEntity {
+    private Long mediaId;
+    private Long modId;
+    private String mediaType;
+    private String fileName;
+    private String fileUrl;
+    private Long fileSize;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechPlanItemBo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmTechPlanItemBo extends BaseEntity {
+
+    private Long planItemId;
+    private Long projectId;
+    private String itemName;
+    private String status;
+    private String description;
+    private String owner;
+    private String attachmentUrl;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechReviewItemBo.java

@@ -0,0 +1,25 @@
+package com.ruoyi.rm.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RmTechReviewItemBo extends BaseEntity {
+
+    private Long reviewItemId;
+    private Long projectId;
+    private String reviewType;
+    private String itemName;
+    private String conclusion;
+    private String reviewer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reviewDate;
+    private String reviewOpinion;
+    private String thinking;
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceChecklist.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_acceptance_checklist")
+public class RmAcceptanceChecklist extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long checkId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmAcceptanceItem.java

@@ -0,0 +1,34 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_acceptance_item")
+public class RmAcceptanceItem extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long acceptItemId;
+    private Long projectId;
+    private String itemName;
+    private String requirement;
+    private String actualValue;
+    private String result;
+    private String notes;
+    private String inspector;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inspectDate;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmBudget.java

@@ -0,0 +1,31 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_budget")
+public class RmBudget extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long budgetId;
+    private Long projectId;
+    private String category;
+    private String item;
+    private BigDecimal budgetAmount;
+    private BigDecimal spentAmount;
+    private String status;
+    private String archiveBatch;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmColorCard.java

@@ -0,0 +1,32 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_color_card")
+public class RmColorCard extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long colorCardId;
+    private Long projectId;
+    private String colorName;
+    private String hexValue;
+    private String standard;
+    private String standardLabel;
+    private String category;
+    private String usageDesc;
+    private String description;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningChecklist.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_commissioning_checklist")
+public class RmCommissioningChecklist extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long checkId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioningClause.java

@@ -0,0 +1,29 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_commissioning_clause")
+public class RmCommissioningClause extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long clauseId;
+    private Long projectId;
+    private String clause;
+    private String standard;
+    private String result;
+    private String passFlag;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDocLib.java

@@ -0,0 +1,34 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_doc_lib")
+public class RmDocLib extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long docId;
+    private Long projectId;
+    private String docName;
+    private String category;
+    private String version;
+    private String uploader;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String fileUrl;
+    private String description;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingCompare.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_drawing_compare")
+public class RmDrawingCompare extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long compareId;
+    private Long projectId;
+    private String drawingName;
+    private String oldVersion;
+    private String newVersion;
+    private String optimizer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date compareDate;
+    private String status;
+    private String beforeDesc;
+    private String afterDesc;
+    private String diffNotes;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingDesign.java

@@ -0,0 +1,37 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_drawing_design")
+public class RmDrawingDesign extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long drawingId;
+    private Long projectId;
+    private String drawingName;
+    private String drawingNo;
+    private String version;
+    private String drawingType;
+    private String drawer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+    private String fileUrl;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingReview.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_drawing_review")
+public class RmDrawingReview extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long reviewId;
+    private Long projectId;
+    private Long drawingId;
+    private String drawingName;
+    private String drawingNo;
+    private String version;
+    private String fileUrl;
+    private String status;
+    private String reviewer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reviewDate;
+    private String reviewOpinion;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallFeedback.java

@@ -0,0 +1,35 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_install_feedback")
+public class RmInstallFeedback extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long feedbackId;
+    private Long projectId;
+    private String title;
+    private String location;
+    private String proposer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date feedbackDate;
+    private String issueDesc;
+    private String solution;
+    private String preventAction;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPersonnel.java

@@ -0,0 +1,37 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_install_personnel")
+public class RmInstallPersonnel extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long personnelId;
+    private Long projectId;
+    private String name;
+    private String nameEn;
+    private String position;
+    private String positionEn;
+    private String planIn;
+    private String planOut;
+    private Integer days;
+    private BigDecimal dailyRate;
+    private BigDecimal totalWages;
+    private String duty;
+    private String qualification;
+    private String phone;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallPrecision.java

@@ -0,0 +1,37 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_install_precision")
+public class RmInstallPrecision extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long precisionId;
+    private Long projectId;
+    private String systemName;
+    private String itemName;
+    private String nameEn;
+    private String targetValue;
+    private String unit;
+    private String importance;
+    private String tool;
+    private String methodDesc;
+    private String standardRef;
+    private String requirement;
+    private String actualValue;
+    private String isQualified;
+    private String photos;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallProgress.java

@@ -0,0 +1,39 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_install_progress")
+public class RmInstallProgress extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long progressId;
+    private Long projectId;
+    private String itemName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualEnd;
+    private String status;
+    private String delayReason;
+    private String images;
+    private String videos;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallTool.java

@@ -0,0 +1,41 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_install_tool")
+public class RmInstallTool extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long toolId;
+    private Long projectId;
+    private String name;
+    private String nameEn;
+    private String spec;
+    private Integer qty;
+    private String unit;
+    private BigDecimal unitPrice;
+    private BigDecimal totalPrice;
+    private String priority;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date arrivalDate;
+    private String purpose;
+    private String responsible;
+    private String status;
+    private String category;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmLayoutFile.java

@@ -0,0 +1,33 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_layout_file")
+public class RmLayoutFile extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long layoutFileId;
+    private Long projectId;
+    private String fileName;
+    private String version;
+    private String fileType;
+    private String fileUrl;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmManual.java

@@ -0,0 +1,33 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_manual")
+public class RmManual extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long manualId;
+    private Long projectId;
+    private String manualName;
+    private String docType;
+    private String version;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date uploadDate;
+    private String fileUrl;
+    private String description;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgDevice.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_mfg_device")
+public class RmMfgDevice extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long deviceId;
+    private Long projectId;
+    private String deviceName;
+    private String spec;
+    private String supplierName;
+    private String contractNo;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date orderDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date deliveryDate;
+    private BigDecimal penaltyRate;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgStage.java

@@ -0,0 +1,44 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_mfg_stage")
+public class RmMfgStage extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long stageId;
+    private Long deviceId;
+    private String stageKey;
+    private String stageName;
+    private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualStart;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date submittedDate;
+    private String manufacturingPhotos;
+    private String manufacturingVideo;
+    private String materialReport;
+    private String precisionReport;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementContract.java

@@ -0,0 +1,37 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_procurement_contract")
+public class RmProcurementContract extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long contractId;
+    private Long projectId;
+    private String contractNo;
+    private String contractName;
+    private String supplierName;
+    private BigDecimal totalAmount;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date signDate;
+    private String fileUrl;
+    private String status;
+    private String clauses;
+    private String penaltyClause;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementProgress.java

@@ -0,0 +1,39 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_procurement_progress")
+public class RmProcurementProgress extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long progressId;
+    private Long projectId;
+    private String itemName;
+    private String supplierName;
+    private String contractNo;
+    private BigDecimal amount;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date orderDate;
+    private String currentStage;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expectDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actualDate;
+    private String stages;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementQuote.java

@@ -0,0 +1,40 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_procurement_quote")
+public class RmProcurementQuote extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long quoteId;
+    private Long projectId;
+    private String supplierName;
+    private String itemName;
+    private String spec;
+    private Integer qty;
+    private String unit;
+    private BigDecimal unitPrice;
+    private BigDecimal totalPrice;
+    private Integer deliveryDays;
+    private Integer warrantyMonths;
+    private BigDecimal scorePrice;
+    private BigDecimal scoreDelivery;
+    private BigDecimal scoreWarranty;
+    private BigDecimal scoreTotal;
+    private Integer scoreRank;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_project")
+public class RmProject extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long projectId;
+    private String projectName;
+    private String projectNo;
+    private String clientName;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+    private String manager;
+    private Long managerId;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProjectMember.java

@@ -0,0 +1,25 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_project_member")
+public class RmProjectMember extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long memberId;
+    private Long projectId;
+    private Long userId;
+    private String role;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingChecklist.java

@@ -0,0 +1,27 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_shipping_checklist")
+public class RmShippingChecklist extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long checklistId;
+    private Long projectId;
+    private String itemText;
+    private String isChecked;
+    private Integer sortOrder;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmShippingItem.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_shipping_item")
+public class RmShippingItem extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long itemId;
+    private Long projectId;
+    private String deviceName;
+    private String spec;
+    private Integer qty;
+    private String packed;
+    private String photos;
+    private String note;
+    private String destination;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date shipDate;
+    private String status;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteMod.java

@@ -0,0 +1,36 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_site_mod")
+public class RmSiteMod extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long modId;
+    private Long projectId;
+    private String deviceName;
+    private String location;
+    private String modReason;
+    private String solution;
+    private String modPerson;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date modDate;
+    private String status;
+    private String preventAction;
+    private String drawingUpdated;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmSiteModMedia.java

@@ -0,0 +1,28 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_site_mod_media")
+public class RmSiteModMedia extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long mediaId;
+    private Long modId;
+    private String mediaType;
+    private String fileName;
+    private String fileUrl;
+    private Long fileSize;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechPlanItem.java

@@ -0,0 +1,29 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_tech_plan_item")
+public class RmTechPlanItem extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long planItemId;
+    private Long projectId;
+    private String itemName;
+    private String status;
+    private String description;
+    private String owner;
+    private String attachmentUrl;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechReviewItem.java

@@ -0,0 +1,34 @@
+package com.ruoyi.rm.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fad_rm_tech_review_item")
+public class RmTechReviewItem extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Long reviewItemId;
+    private Long projectId;
+    private String reviewType;
+    private String itemName;
+    private String conclusion;
+    private String reviewer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reviewDate;
+    private String reviewOpinion;
+    private String thinking;
+    private String remark;
+    @TableLogic
+    private Integer delFlag;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceChecklistVo.java

@@ -0,0 +1,29 @@
+package com.ruoyi.rm.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RmAcceptanceChecklistVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "检查项ID")
+    private Long checkId;
+
+    @Excel(name = "项目ID")
+    private Long projectId;
+
+    @Excel(name = "检查项内容")
+    private String itemText;
+
+    @Excel(name = "是否完成")
+    private String isChecked;
+
+    @Excel(name = "排序号")
+    private Integer sortOrder;
+
+    @Excel(name = "备注")
+    private String remark;
+}

fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmAcceptanceItemVo.java

@@ -0,0 +1,41 @@
+package com.ruoyi.rm.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class RmAcceptanceItemVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "验收项ID")
+    private Long acceptItemId;
+
+    @Excel(name = "项目ID")
+    private Long projectId;
+
+    @Excel(name = "验收项目")
+    private String itemName;
+
+    @Excel(name = "要求值")
+    private String requirement;
+
+    @Excel(name = "实测值")
+    private String actualValue;
+
+    @Excel(name = "结果")
+    private String result;
+
+    @Excel(name = "备注")
+    private String notes;
+
+    @Excel(name = "验收人")
+    private String inspector;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "验收日期", width = 15)
+    private Date inspectDate;
+}