diff --git a/fad-rolling-mill/pom.xml b/fad-rolling-mill/pom.xml new file mode 100644 index 0000000..4aeda47 --- /dev/null +++ b/fad-rolling-mill/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + com.ruoyi + ruoyi-flowable-plus + 0.8.3 + + fad-rolling-mill + fad-rolling-mill + 连轧机/可逆轧机设备总包项目管理系统 + + + + com.ruoyi + ruoyi-common + + + com.ruoyi + ruoyi-system + + + org.projectlombok + lombok + provided + + + com.baomidou + mybatis-plus-annotation + 3.5.9 + compile + + + com.alibaba.fastjson2 + fastjson2 + 2.0.35 + + + diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmBudgetController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmBudgetController.java new file mode 100644 index 0000000..769e68a --- /dev/null +++ b/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 list(RmBudgetBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{budgetId}") + public R getInfo(@PathVariable @NotNull Long budgetId) { + return R.ok(service.queryById(budgetId)); + } + + @Log(title = "项目预算", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmBudgetBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "项目预算", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmBudgetBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "项目预算", businessType = BusinessType.DELETE) + @DeleteMapping("/{budgetIds}") + public R remove(@PathVariable @NotEmpty Long[] budgetIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(budgetIds), true)); + } + + @GetMapping("/all") + public R> all(RmBudgetBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmColorCardController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmColorCardController.java new file mode 100644 index 0000000..d158a41 --- /dev/null +++ b/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 list(RmColorCardBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{colorCardId}") + public R getInfo(@PathVariable @NotNull Long colorCardId) { + return R.ok(service.queryById(colorCardId)); + } + + @Log(title = "色卡管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmColorCardBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "色卡管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmColorCardBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "色卡管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{colorCardIds}") + public R remove(@PathVariable @NotEmpty Long[] colorCardIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(colorCardIds), true)); + } + + @GetMapping("/all") + public R> all(RmColorCardBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingDesignController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingDesignController.java new file mode 100644 index 0000000..234b62b --- /dev/null +++ b/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 list(RmDrawingDesignBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{drawingId}") + public R getInfo(@PathVariable @NotNull Long drawingId) { + return R.ok(service.queryById(drawingId)); + } + + @Log(title = "图纸详细设计", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmDrawingDesignBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "图纸详细设计", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmDrawingDesignBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "图纸详细设计", businessType = BusinessType.DELETE) + @DeleteMapping("/{drawingIds}") + public R remove(@PathVariable @NotEmpty Long[] drawingIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(drawingIds), true)); + } + + @GetMapping("/all") + public R> all(RmDrawingDesignBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingReviewController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDrawingReviewController.java new file mode 100644 index 0000000..e320fb5 --- /dev/null +++ b/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 list(RmDrawingReviewBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{reviewId}") + public R getInfo(@PathVariable @NotNull Long reviewId) { + return R.ok(service.queryById(reviewId)); + } + + @Log(title = "图纸审查", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmDrawingReviewBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "图纸审查", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmDrawingReviewBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "图纸审查", businessType = BusinessType.DELETE) + @DeleteMapping("/{reviewIds}") + public R remove(@PathVariable @NotEmpty Long[] reviewIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(reviewIds), true)); + } + + @GetMapping("/all") + public R> all(RmDrawingReviewBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmLayoutFileController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmLayoutFileController.java new file mode 100644 index 0000000..d729121 --- /dev/null +++ b/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 list(RmLayoutFileBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{layoutFileId}") + public R getInfo(@PathVariable @NotNull Long layoutFileId) { + return R.ok(service.queryById(layoutFileId)); + } + + @Log(title = "布局图确定", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmLayoutFileBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "布局图确定", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmLayoutFileBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "布局图确定", businessType = BusinessType.DELETE) + @DeleteMapping("/{layoutFileIds}") + public R remove(@PathVariable @NotEmpty Long[] layoutFileIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(layoutFileIds), true)); + } + + @GetMapping("/all") + public R> all(RmLayoutFileBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgDeviceController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgDeviceController.java new file mode 100644 index 0000000..78f1449 --- /dev/null +++ b/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 list(RmMfgDeviceBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{deviceId}") + public R getInfo(@PathVariable @NotNull Long deviceId) { + return R.ok(service.queryById(deviceId)); + } + + @Log(title = "设备制造", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmMfgDeviceBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "设备制造", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmMfgDeviceBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "设备制造", businessType = BusinessType.DELETE) + @DeleteMapping("/{deviceIds}") + public R remove(@PathVariable @NotEmpty Long[] deviceIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(deviceIds), true)); + } + + @GetMapping("/all") + public R> all(RmMfgDeviceBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgStageController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmMfgStageController.java new file mode 100644 index 0000000..e0fda91 --- /dev/null +++ b/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 list(RmMfgStageBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{stageId}") + public R getInfo(@PathVariable @NotNull Long stageId) { + return R.ok(service.queryById(stageId)); + } + + @Log(title = "制造阶段", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmMfgStageBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "制造阶段", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmMfgStageBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "制造阶段", businessType = BusinessType.DELETE) + @DeleteMapping("/{stageIds}") + public R remove(@PathVariable @NotEmpty Long[] stageIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(stageIds), true)); + } + + @GetMapping("/all") + public R> all(RmMfgStageBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementContractController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementContractController.java new file mode 100644 index 0000000..33b4c2a --- /dev/null +++ b/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 list(RmProcurementContractBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{contractId}") + public R getInfo(@PathVariable @NotNull Long contractId) { + return R.ok(service.queryById(contractId)); + } + + @Log(title = "合同管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmProcurementContractBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "合同管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmProcurementContractBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "合同管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{contractIds}") + public R remove(@PathVariable @NotEmpty Long[] contractIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(contractIds), true)); + } + + @GetMapping("/all") + public R> all(RmProcurementContractBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementProgressController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementProgressController.java new file mode 100644 index 0000000..71f199d --- /dev/null +++ b/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 list(RmProcurementProgressBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{progressId}") + public R getInfo(@PathVariable @NotNull Long progressId) { + return R.ok(service.queryById(progressId)); + } + + @Log(title = "采购进度", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmProcurementProgressBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "采购进度", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmProcurementProgressBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "采购进度", businessType = BusinessType.DELETE) + @DeleteMapping("/{progressIds}") + public R remove(@PathVariable @NotEmpty Long[] progressIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(progressIds), true)); + } + + @GetMapping("/all") + public R> all(RmProcurementProgressBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementQuoteController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProcurementQuoteController.java new file mode 100644 index 0000000..afff7e7 --- /dev/null +++ b/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 list(RmProcurementQuoteBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{quoteId}") + public R getInfo(@PathVariable @NotNull Long quoteId) { + return R.ok(service.queryById(quoteId)); + } + + @Log(title = "报价管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmProcurementQuoteBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "报价管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmProcurementQuoteBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "报价管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{quoteIds}") + public R remove(@PathVariable @NotEmpty Long[] quoteIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(quoteIds), true)); + } + + @GetMapping("/all") + public R> all(RmProcurementQuoteBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmProjectController.java new file mode 100644 index 0000000..a5c9f2b --- /dev/null +++ b/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 list(RmProjectBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{projectId}") + public R getInfo(@PathVariable @NotNull Long projectId) { + return R.ok(service.queryById(projectId)); + } + + @Log(title = "轧机项目管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmProjectBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "轧机项目管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmProjectBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "轧机项目管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{projectIds}") + public R remove(@PathVariable @NotEmpty Long[] projectIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(projectIds), true)); + } + + @GetMapping("/all") + public R> all(RmProjectBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechPlanItemController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechPlanItemController.java new file mode 100644 index 0000000..81811f0 --- /dev/null +++ b/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 list(RmTechPlanItemBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{planItemId}") + public R getInfo(@PathVariable @NotNull Long planItemId) { + return R.ok(service.queryById(planItemId)); + } + + @Log(title = "技术方案确定", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmTechPlanItemBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "技术方案确定", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmTechPlanItemBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "技术方案确定", businessType = BusinessType.DELETE) + @DeleteMapping("/{planItemIds}") + public R remove(@PathVariable @NotEmpty Long[] planItemIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(planItemIds), true)); + } + + @GetMapping("/all") + public R> all(RmTechPlanItemBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechReviewItemController.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmTechReviewItemController.java new file mode 100644 index 0000000..470d33e --- /dev/null +++ b/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 list(RmTechReviewItemBo bo, PageQuery pageQuery) { + return service.queryPageList(bo, pageQuery); + } + + @GetMapping("/{reviewItemId}") + public R getInfo(@PathVariable @NotNull Long reviewItemId) { + return R.ok(service.queryById(reviewItemId)); + } + + @Log(title = "技术审查", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody RmTechReviewItemBo bo) { + return toAjax(service.insertByBo(bo)); + } + + @Log(title = "技术审查", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody RmTechReviewItemBo bo) { + return toAjax(service.updateByBo(bo)); + } + + @Log(title = "技术审查", businessType = BusinessType.DELETE) + @DeleteMapping("/{reviewItemIds}") + public R remove(@PathVariable @NotEmpty Long[] reviewItemIds) { + return toAjax(service.deleteWithValidByIds(Arrays.asList(reviewItemIds), true)); + } + + @GetMapping("/all") + public R> all(RmTechReviewItemBo bo) { + return R.ok(service.queryList(bo)); + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmBudgetBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmBudgetBo.java new file mode 100644 index 0000000..f096e3e --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmColorCardBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmColorCardBo.java new file mode 100644 index 0000000..218763c --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingDesignBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingDesignBo.java new file mode 100644 index 0000000..8f59341 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingReviewBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmDrawingReviewBo.java new file mode 100644 index 0000000..25ba2d2 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmLayoutFileBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmLayoutFileBo.java new file mode 100644 index 0000000..c016a0e --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgDeviceBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgDeviceBo.java new file mode 100644 index 0000000..9a3f456 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgStageBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmMfgStageBo.java new file mode 100644 index 0000000..7bf0d76 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementContractBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementContractBo.java new file mode 100644 index 0000000..9fc6f1f --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementProgressBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementProgressBo.java new file mode 100644 index 0000000..cbecf5a --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementQuoteBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProcurementQuoteBo.java new file mode 100644 index 0000000..0ce404a --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.java new file mode 100644 index 0000000..4c921c2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmProjectBo.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 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 String status; + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechPlanItemBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechPlanItemBo.java new file mode 100644 index 0000000..df44b2e --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechReviewItemBo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechReviewItemBo.java new file mode 100644 index 0000000..9d148b2 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmBudget.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmBudget.java new file mode 100644 index 0000000..5d8521d --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmColorCard.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmColorCard.java new file mode 100644 index 0000000..74fd3a0 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingDesign.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingDesign.java new file mode 100644 index 0000000..12b5dbd --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingReview.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmDrawingReview.java new file mode 100644 index 0000000..603443f --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmLayoutFile.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmLayoutFile.java new file mode 100644 index 0000000..8a2d20a --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgDevice.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgDevice.java new file mode 100644 index 0000000..2460933 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgStage.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmMfgStage.java new file mode 100644 index 0000000..5cba0b8 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementContract.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementContract.java new file mode 100644 index 0000000..a532a8c --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementProgress.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementProgress.java new file mode 100644 index 0000000..5a1850d --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementQuote.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProcurementQuote.java new file mode 100644 index 0000000..630ed91 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java new file mode 100644 index 0000000..5c882f6 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmProject.java @@ -0,0 +1,35 @@ +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 String status; + private String remark; + @TableLogic + private Integer delFlag; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechPlanItem.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechPlanItem.java new file mode 100644 index 0000000..8a42435 --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechReviewItem.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechReviewItem.java new file mode 100644 index 0000000..6296f3b --- /dev/null +++ b/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; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmBudgetVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmBudgetVo.java new file mode 100644 index 0000000..f19b76c --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmBudgetVo.java @@ -0,0 +1,39 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class RmBudgetVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "预算ID") + private Long budgetId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "科目类别") + private String category; + + @Excel(name = "项目名称") + private String item; + + @Excel(name = "预算金额") + private BigDecimal budgetAmount; + + @Excel(name = "已支出") + private BigDecimal spentAmount; + + @Excel(name = "状态") + private String status; + + @Excel(name = "归档批次") + private String archiveBatch; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmColorCardVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmColorCardVo.java new file mode 100644 index 0000000..f6916be --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmColorCardVo.java @@ -0,0 +1,44 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmColorCardVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "色卡ID") + private Long colorCardId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "色名") + private String colorName; + + @Excel(name = "HEX值") + private String hexValue; + + @Excel(name = "标准色号") + private String standard; + + @Excel(name = "标准类型") + private String standardLabel; + + @Excel(name = "分类") + private String category; + + @Excel(name = "用途说明") + private String usageDesc; + + @Excel(name = "详细描述") + private String description; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingDesignVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingDesignVo.java new file mode 100644 index 0000000..1759ab7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingDesignVo.java @@ -0,0 +1,51 @@ +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 RmDrawingDesignVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "图纸ID") + private Long drawingId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "图纸名称") + private String drawingName; + + @Excel(name = "图号") + private String drawingNo; + + @Excel(name = "版本") + private String version; + + @Excel(name = "图纸类型") + private String drawingType; + + @Excel(name = "制图人") + private String drawer; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始日期", width = 15) + private Date startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "完成日期", width = 15) + private Date endDate; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "状态") + private String status; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingReviewVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingReviewVo.java new file mode 100644 index 0000000..0d1fa74 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmDrawingReviewVo.java @@ -0,0 +1,48 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmDrawingReviewVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "审查ID") + private Long reviewId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "关联图纸ID") + private Long drawingId; + + @Excel(name = "图纸名称") + private String drawingName; + + @Excel(name = "图号") + private String drawingNo; + + @Excel(name = "版本") + private String version; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "状态") + private String status; + + @Excel(name = "审核人") + private String reviewer; + + @Excel(name = "审核日期") + private Date reviewDate; + + @Excel(name = "审核意见") + private String reviewOpinion; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmLayoutFileVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmLayoutFileVo.java new file mode 100644 index 0000000..e38eae7 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmLayoutFileVo.java @@ -0,0 +1,39 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class RmLayoutFileVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "文件ID") + private Long layoutFileId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "文件名") + private String fileName; + + @Excel(name = "版本号") + private String version; + + @Excel(name = "文件类型") + private String fileType; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "上传日期") + private Date uploadDate; + + @Excel(name = "状态") + private String status; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgDeviceVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgDeviceVo.java new file mode 100644 index 0000000..e997fa8 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgDeviceVo.java @@ -0,0 +1,46 @@ +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.math.BigDecimal; +import java.util.Date; + +@Data +public class RmMfgDeviceVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "设备ID") + private Long deviceId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "设备名称") + private String deviceName; + + @Excel(name = "规格型号") + private String spec; + + @Excel(name = "供应商") + private String supplierName; + + @Excel(name = "合同编号") + private String contractNo; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "下单日期", width = 15) + private Date orderDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "交货日期", width = 15) + private Date deliveryDate; + + @Excel(name = "逾期罚款(元/天)") + private BigDecimal penaltyRate; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgStageVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgStageVo.java new file mode 100644 index 0000000..d754ecc --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmMfgStageVo.java @@ -0,0 +1,66 @@ +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 RmMfgStageVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "阶段ID") + private Long stageId; + + @Excel(name = "设备ID") + private Long deviceId; + + @Excel(name = "阶段标识") + private String stageKey; + + @Excel(name = "阶段名称") + private String stageName; + + @Excel(name = "状态") + private String status; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划开始", width = 15) + private Date planStartDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划结束", width = 15) + private Date planEndDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际开始", width = 15) + private Date actualStart; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际结束", width = 15) + private Date actualEnd; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提交日期", width = 15) + private Date submittedDate; + + @Excel(name = "制造照片") + private String manufacturingPhotos; + + @Excel(name = "制造视频") + private String manufacturingVideo; + + @Excel(name = "材质报告") + private String materialReport; + + @Excel(name = "精度报告") + private String precisionReport; + + @Excel(name = "排序号") + private Integer sortOrder; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementContractVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementContractVo.java new file mode 100644 index 0000000..8b8a37d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementContractVo.java @@ -0,0 +1,51 @@ +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.math.BigDecimal; +import java.util.Date; + +@Data +public class RmProcurementContractVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "合同ID") + private Long contractId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "合同编号") + private String contractNo; + + @Excel(name = "合同名称") + private String contractName; + + @Excel(name = "供应商") + private String supplierName; + + @Excel(name = "合同金额") + private BigDecimal totalAmount; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "签订日期", width = 15) + private Date signDate; + + @Excel(name = "文件路径") + private String fileUrl; + + @Excel(name = "状态") + private String status; + + @Excel(name = "合同条款") + private String clauses; + + @Excel(name = "违约罚款条款") + private String penaltyClause; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementProgressVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementProgressVo.java new file mode 100644 index 0000000..54529d6 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementProgressVo.java @@ -0,0 +1,53 @@ +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.math.BigDecimal; +import java.util.Date; + +@Data +public class RmProcurementProgressVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "进度ID") + private Long progressId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "采购项") + private String itemName; + + @Excel(name = "供应商") + private String supplierName; + + @Excel(name = "合同编号") + private String contractNo; + + @Excel(name = "合同金额") + private BigDecimal amount; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "下单日期", width = 15) + private Date orderDate; + + @Excel(name = "当前阶段") + private String currentStage; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "预计到货", width = 15) + private Date expectDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际到货", width = 15) + private Date actualDate; + + @Excel(name = "阶段JSON") + private String stages; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementQuoteVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementQuoteVo.java new file mode 100644 index 0000000..7faf08c --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProcurementQuoteVo.java @@ -0,0 +1,66 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class RmProcurementQuoteVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "报价ID") + private Long quoteId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "供应商") + private String supplierName; + + @Excel(name = "设备项") + private String itemName; + + @Excel(name = "规格型号") + private String spec; + + @Excel(name = "数量") + private Integer qty; + + @Excel(name = "单位") + private String unit; + + @Excel(name = "单价") + private BigDecimal unitPrice; + + @Excel(name = "总价") + private BigDecimal totalPrice; + + @Excel(name = "交货期(天)") + private Integer deliveryDays; + + @Excel(name = "质保期(月)") + private Integer warrantyMonths; + + @Excel(name = "价格评分") + private BigDecimal scorePrice; + + @Excel(name = "交货评分") + private BigDecimal scoreDelivery; + + @Excel(name = "质保评分") + private BigDecimal scoreWarranty; + + @Excel(name = "综合评分") + private BigDecimal scoreTotal; + + @Excel(name = "排名") + private Integer scoreRank; + + @Excel(name = "状态") + private String status; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java new file mode 100644 index 0000000..466c56e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmProjectVo.java @@ -0,0 +1,42 @@ +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 RmProjectVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "项目编号") + private String projectNo; + + @Excel(name = "客户名称") + private String clientName; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始日期") + private Date startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束日期") + private Date endDate; + + @Excel(name = "项目经理") + private String manager; + + @Excel(name = "状态") + private String status; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechPlanItemVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechPlanItemVo.java new file mode 100644 index 0000000..6b311f2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechPlanItemVo.java @@ -0,0 +1,35 @@ +package com.ruoyi.rm.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RmTechPlanItemVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "方案项ID") + private Long planItemId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "方案项名称") + private String itemName; + + @Excel(name = "状态") + private String status; + + @Excel(name = "方案描述") + private String description; + + @Excel(name = "负责人") + private String owner; + + @Excel(name = "附件路径") + private String attachmentUrl; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechReviewItemVo.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechReviewItemVo.java new file mode 100644 index 0000000..01deb4d --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechReviewItemVo.java @@ -0,0 +1,44 @@ +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 RmTechReviewItemVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "审查项ID") + private Long reviewItemId; + + @Excel(name = "项目ID") + private Long projectId; + + @Excel(name = "专业类型") + private String reviewType; + + @Excel(name = "审查项名称") + private String itemName; + + @Excel(name = "结论") + private String conclusion; + + @Excel(name = "审查人") + private String reviewer; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "审查日期", width = 15) + private Date reviewDate; + + @Excel(name = "审查意见") + private String reviewOpinion; + + @Excel(name = "思维导入") + private String thinking; + + @Excel(name = "备注") + private String remark; +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmBudgetMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmBudgetMapper.java new file mode 100644 index 0000000..4caf73e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmBudgetMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmBudget; +import com.ruoyi.rm.domain.vo.RmBudgetVo; + +public interface RmBudgetMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmColorCardMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmColorCardMapper.java new file mode 100644 index 0000000..85d53be --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmColorCardMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmColorCard; +import com.ruoyi.rm.domain.vo.RmColorCardVo; + +public interface RmColorCardMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingDesignMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingDesignMapper.java new file mode 100644 index 0000000..b16e4c9 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingDesignMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmDrawingDesign; +import com.ruoyi.rm.domain.vo.RmDrawingDesignVo; + +public interface RmDrawingDesignMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingReviewMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingReviewMapper.java new file mode 100644 index 0000000..6fa032b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmDrawingReviewMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmDrawingReview; +import com.ruoyi.rm.domain.vo.RmDrawingReviewVo; + +public interface RmDrawingReviewMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmLayoutFileMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmLayoutFileMapper.java new file mode 100644 index 0000000..cd473cf --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmLayoutFileMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmLayoutFile; +import com.ruoyi.rm.domain.vo.RmLayoutFileVo; + +public interface RmLayoutFileMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgDeviceMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgDeviceMapper.java new file mode 100644 index 0000000..922f112 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgDeviceMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmMfgDevice; +import com.ruoyi.rm.domain.vo.RmMfgDeviceVo; + +public interface RmMfgDeviceMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgStageMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgStageMapper.java new file mode 100644 index 0000000..ef20bdc --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmMfgStageMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmMfgStage; +import com.ruoyi.rm.domain.vo.RmMfgStageVo; + +public interface RmMfgStageMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementContractMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementContractMapper.java new file mode 100644 index 0000000..13db7ad --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementContractMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmProcurementContract; +import com.ruoyi.rm.domain.vo.RmProcurementContractVo; + +public interface RmProcurementContractMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementProgressMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementProgressMapper.java new file mode 100644 index 0000000..0ae0ae2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementProgressMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmProcurementProgress; +import com.ruoyi.rm.domain.vo.RmProcurementProgressVo; + +public interface RmProcurementProgressMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementQuoteMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementQuoteMapper.java new file mode 100644 index 0000000..7f45d5f --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProcurementQuoteMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmProcurementQuote; +import com.ruoyi.rm.domain.vo.RmProcurementQuoteVo; + +public interface RmProcurementQuoteMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMapper.java new file mode 100644 index 0000000..9a4feb0 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmProjectMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmProject; +import com.ruoyi.rm.domain.vo.RmProjectVo; + +public interface RmProjectMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechPlanItemMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechPlanItemMapper.java new file mode 100644 index 0000000..cc0f31f --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechPlanItemMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmTechPlanItem; +import com.ruoyi.rm.domain.vo.RmTechPlanItemVo; + +public interface RmTechPlanItemMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechReviewItemMapper.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechReviewItemMapper.java new file mode 100644 index 0000000..50cd4eb --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmTechReviewItemMapper.java @@ -0,0 +1,8 @@ +package com.ruoyi.rm.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.rm.domain.entity.RmTechReviewItem; +import com.ruoyi.rm.domain.vo.RmTechReviewItemVo; + +public interface RmTechReviewItemMapper extends BaseMapperPlus { +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmBudgetService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmBudgetService.java new file mode 100644 index 0000000..116d767 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmBudgetService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmBudgetBo; +import com.ruoyi.rm.domain.vo.RmBudgetVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmBudgetService { + + RmBudgetVo queryById(Long budgetId); + + TableDataInfo queryPageList(RmBudgetBo bo, PageQuery pageQuery); + + List queryList(RmBudgetBo bo); + + Boolean insertByBo(RmBudgetBo bo); + + Boolean updateByBo(RmBudgetBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmColorCardService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmColorCardService.java new file mode 100644 index 0000000..6ca1960 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmColorCardService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmColorCardBo; +import com.ruoyi.rm.domain.vo.RmColorCardVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmColorCardService { + + RmColorCardVo queryById(Long colorCardId); + + TableDataInfo queryPageList(RmColorCardBo bo, PageQuery pageQuery); + + List queryList(RmColorCardBo bo); + + Boolean insertByBo(RmColorCardBo bo); + + Boolean updateByBo(RmColorCardBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingDesignService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingDesignService.java new file mode 100644 index 0000000..7600214 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingDesignService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmDrawingDesignBo; +import com.ruoyi.rm.domain.vo.RmDrawingDesignVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmDrawingDesignService { + + RmDrawingDesignVo queryById(Long drawingId); + + TableDataInfo queryPageList(RmDrawingDesignBo bo, PageQuery pageQuery); + + List queryList(RmDrawingDesignBo bo); + + Boolean insertByBo(RmDrawingDesignBo bo); + + Boolean updateByBo(RmDrawingDesignBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingReviewService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingReviewService.java new file mode 100644 index 0000000..0aaa4ba --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDrawingReviewService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmDrawingReviewBo; +import com.ruoyi.rm.domain.vo.RmDrawingReviewVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmDrawingReviewService { + + RmDrawingReviewVo queryById(Long reviewId); + + TableDataInfo queryPageList(RmDrawingReviewBo bo, PageQuery pageQuery); + + List queryList(RmDrawingReviewBo bo); + + Boolean insertByBo(RmDrawingReviewBo bo); + + Boolean updateByBo(RmDrawingReviewBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmLayoutFileService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmLayoutFileService.java new file mode 100644 index 0000000..b5bc918 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmLayoutFileService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmLayoutFileBo; +import com.ruoyi.rm.domain.vo.RmLayoutFileVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmLayoutFileService { + + RmLayoutFileVo queryById(Long layoutFileId); + + TableDataInfo queryPageList(RmLayoutFileBo bo, PageQuery pageQuery); + + List queryList(RmLayoutFileBo bo); + + Boolean insertByBo(RmLayoutFileBo bo); + + Boolean updateByBo(RmLayoutFileBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgDeviceService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgDeviceService.java new file mode 100644 index 0000000..64de133 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgDeviceService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmMfgDeviceBo; +import com.ruoyi.rm.domain.vo.RmMfgDeviceVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmMfgDeviceService { + + RmMfgDeviceVo queryById(Long deviceId); + + TableDataInfo queryPageList(RmMfgDeviceBo bo, PageQuery pageQuery); + + List queryList(RmMfgDeviceBo bo); + + Boolean insertByBo(RmMfgDeviceBo bo); + + Boolean updateByBo(RmMfgDeviceBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgStageService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgStageService.java new file mode 100644 index 0000000..6cd1f57 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmMfgStageService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmMfgStageBo; +import com.ruoyi.rm.domain.vo.RmMfgStageVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmMfgStageService { + + RmMfgStageVo queryById(Long stageId); + + TableDataInfo queryPageList(RmMfgStageBo bo, PageQuery pageQuery); + + List queryList(RmMfgStageBo bo); + + Boolean insertByBo(RmMfgStageBo bo); + + Boolean updateByBo(RmMfgStageBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementContractService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementContractService.java new file mode 100644 index 0000000..7ed1eb5 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementContractService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmProcurementContractBo; +import com.ruoyi.rm.domain.vo.RmProcurementContractVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmProcurementContractService { + + RmProcurementContractVo queryById(Long contractId); + + TableDataInfo queryPageList(RmProcurementContractBo bo, PageQuery pageQuery); + + List queryList(RmProcurementContractBo bo); + + Boolean insertByBo(RmProcurementContractBo bo); + + Boolean updateByBo(RmProcurementContractBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementProgressService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementProgressService.java new file mode 100644 index 0000000..aacb97e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementProgressService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmProcurementProgressBo; +import com.ruoyi.rm.domain.vo.RmProcurementProgressVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmProcurementProgressService { + + RmProcurementProgressVo queryById(Long progressId); + + TableDataInfo queryPageList(RmProcurementProgressBo bo, PageQuery pageQuery); + + List queryList(RmProcurementProgressBo bo); + + Boolean insertByBo(RmProcurementProgressBo bo); + + Boolean updateByBo(RmProcurementProgressBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementQuoteService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementQuoteService.java new file mode 100644 index 0000000..c23decf --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProcurementQuoteService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmProcurementQuoteBo; +import com.ruoyi.rm.domain.vo.RmProcurementQuoteVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmProcurementQuoteService { + + RmProcurementQuoteVo queryById(Long quoteId); + + TableDataInfo queryPageList(RmProcurementQuoteBo bo, PageQuery pageQuery); + + List queryList(RmProcurementQuoteBo bo); + + Boolean insertByBo(RmProcurementQuoteBo bo); + + Boolean updateByBo(RmProcurementQuoteBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectService.java new file mode 100644 index 0000000..2f3046c --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmProjectService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmProjectBo; +import com.ruoyi.rm.domain.vo.RmProjectVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmProjectService { + + RmProjectVo queryById(Long projectId); + + TableDataInfo queryPageList(RmProjectBo bo, PageQuery pageQuery); + + List queryList(RmProjectBo bo); + + Boolean insertByBo(RmProjectBo bo); + + Boolean updateByBo(RmProjectBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechPlanItemService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechPlanItemService.java new file mode 100644 index 0000000..c4d7d36 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechPlanItemService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmTechPlanItemBo; +import com.ruoyi.rm.domain.vo.RmTechPlanItemVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmTechPlanItemService { + + RmTechPlanItemVo queryById(Long planItemId); + + TableDataInfo queryPageList(RmTechPlanItemBo bo, PageQuery pageQuery); + + List queryList(RmTechPlanItemBo bo); + + Boolean insertByBo(RmTechPlanItemBo bo); + + Boolean updateByBo(RmTechPlanItemBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechReviewItemService.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechReviewItemService.java new file mode 100644 index 0000000..d5b6fbd --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmTechReviewItemService.java @@ -0,0 +1,24 @@ +package com.ruoyi.rm.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.bo.RmTechReviewItemBo; +import com.ruoyi.rm.domain.vo.RmTechReviewItemVo; + +import java.util.Collection; +import java.util.List; + +public interface IRmTechReviewItemService { + + RmTechReviewItemVo queryById(Long reviewItemId); + + TableDataInfo queryPageList(RmTechReviewItemBo bo, PageQuery pageQuery); + + List queryList(RmTechReviewItemBo bo); + + Boolean insertByBo(RmTechReviewItemBo bo); + + Boolean updateByBo(RmTechReviewItemBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmBudgetServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmBudgetServiceImpl.java new file mode 100644 index 0000000..db5a697 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmBudgetServiceImpl.java @@ -0,0 +1,75 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmBudget; +import com.ruoyi.rm.domain.bo.RmBudgetBo; +import com.ruoyi.rm.domain.vo.RmBudgetVo; +import com.ruoyi.rm.mapper.RmBudgetMapper; +import com.ruoyi.rm.service.IRmBudgetService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmBudgetServiceImpl implements IRmBudgetService { + + private final RmBudgetMapper baseMapper; + + @Override + public RmBudgetVo queryById(Long budgetId) { + return baseMapper.selectVoById(budgetId); + } + + @Override + public TableDataInfo queryPageList(RmBudgetBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmBudgetBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmBudgetBo bo) { + RmBudget add = BeanUtil.toBean(bo, RmBudget.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmBudgetBo bo) { + RmBudget update = BeanUtil.toBean(bo, RmBudget.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmBudgetBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmBudget::getProjectId, bo.getProjectId()); + lqw.like(bo.getCategory() != null, RmBudget::getCategory, bo.getCategory()); + lqw.like(bo.getItem() != null, RmBudget::getItem, bo.getItem()); + lqw.eq(bo.getStatus() != null, RmBudget::getStatus, bo.getStatus()); + lqw.eq(bo.getArchiveBatch() != null, RmBudget::getArchiveBatch, bo.getArchiveBatch()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmColorCardServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmColorCardServiceImpl.java new file mode 100644 index 0000000..8d6892e --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmColorCardServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmColorCard; +import com.ruoyi.rm.domain.bo.RmColorCardBo; +import com.ruoyi.rm.domain.vo.RmColorCardVo; +import com.ruoyi.rm.mapper.RmColorCardMapper; +import com.ruoyi.rm.service.IRmColorCardService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmColorCardServiceImpl implements IRmColorCardService { + + private final RmColorCardMapper baseMapper; + + @Override + public RmColorCardVo queryById(Long colorCardId) { + return baseMapper.selectVoById(colorCardId); + } + + @Override + public TableDataInfo queryPageList(RmColorCardBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmColorCardBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmColorCardBo bo) { + RmColorCard add = BeanUtil.toBean(bo, RmColorCard.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmColorCardBo bo) { + RmColorCard update = BeanUtil.toBean(bo, RmColorCard.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmColorCardBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmColorCard::getProjectId, bo.getProjectId()); + lqw.eq(bo.getCategory() != null, RmColorCard::getCategory, bo.getCategory()); + lqw.like(bo.getColorName() != null, RmColorCard::getColorName, bo.getColorName()); + lqw.orderByAsc(RmColorCard::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingDesignServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingDesignServiceImpl.java new file mode 100644 index 0000000..fec4311 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingDesignServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmDrawingDesign; +import com.ruoyi.rm.domain.bo.RmDrawingDesignBo; +import com.ruoyi.rm.domain.vo.RmDrawingDesignVo; +import com.ruoyi.rm.mapper.RmDrawingDesignMapper; +import com.ruoyi.rm.service.IRmDrawingDesignService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmDrawingDesignServiceImpl implements IRmDrawingDesignService { + + private final RmDrawingDesignMapper baseMapper; + + @Override + public RmDrawingDesignVo queryById(Long drawingId) { + return baseMapper.selectVoById(drawingId); + } + + @Override + public TableDataInfo queryPageList(RmDrawingDesignBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmDrawingDesignBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmDrawingDesignBo bo) { + RmDrawingDesign add = BeanUtil.toBean(bo, RmDrawingDesign.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmDrawingDesignBo bo) { + RmDrawingDesign update = BeanUtil.toBean(bo, RmDrawingDesign.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmDrawingDesignBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmDrawingDesign::getProjectId, bo.getProjectId()); + lqw.like(bo.getDrawingName() != null, RmDrawingDesign::getDrawingName, bo.getDrawingName()); + lqw.eq(bo.getDrawingType() != null, RmDrawingDesign::getDrawingType, bo.getDrawingType()); + lqw.eq(bo.getStatus() != null, RmDrawingDesign::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingReviewServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingReviewServiceImpl.java new file mode 100644 index 0000000..17191b0 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDrawingReviewServiceImpl.java @@ -0,0 +1,75 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmDrawingReview; +import com.ruoyi.rm.domain.bo.RmDrawingReviewBo; +import com.ruoyi.rm.domain.vo.RmDrawingReviewVo; +import com.ruoyi.rm.mapper.RmDrawingReviewMapper; +import com.ruoyi.rm.service.IRmDrawingReviewService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmDrawingReviewServiceImpl implements IRmDrawingReviewService { + + private final RmDrawingReviewMapper baseMapper; + + @Override + public RmDrawingReviewVo queryById(Long reviewId) { + return baseMapper.selectVoById(reviewId); + } + + @Override + public TableDataInfo queryPageList(RmDrawingReviewBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmDrawingReviewBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmDrawingReviewBo bo) { + RmDrawingReview add = BeanUtil.toBean(bo, RmDrawingReview.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmDrawingReviewBo bo) { + RmDrawingReview update = BeanUtil.toBean(bo, RmDrawingReview.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmDrawingReviewBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmDrawingReview::getProjectId, bo.getProjectId()); + lqw.like(bo.getDrawingName() != null, RmDrawingReview::getDrawingName, bo.getDrawingName()); + lqw.like(bo.getDrawingNo() != null, RmDrawingReview::getDrawingNo, bo.getDrawingNo()); + lqw.eq(bo.getStatus() != null, RmDrawingReview::getStatus, bo.getStatus()); + lqw.eq(bo.getReviewer() != null, RmDrawingReview::getReviewer, bo.getReviewer()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmLayoutFileServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmLayoutFileServiceImpl.java new file mode 100644 index 0000000..c9f3a55 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmLayoutFileServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmLayoutFile; +import com.ruoyi.rm.domain.bo.RmLayoutFileBo; +import com.ruoyi.rm.domain.vo.RmLayoutFileVo; +import com.ruoyi.rm.mapper.RmLayoutFileMapper; +import com.ruoyi.rm.service.IRmLayoutFileService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmLayoutFileServiceImpl implements IRmLayoutFileService { + + private final RmLayoutFileMapper baseMapper; + + @Override + public RmLayoutFileVo queryById(Long layoutFileId) { + return baseMapper.selectVoById(layoutFileId); + } + + @Override + public TableDataInfo queryPageList(RmLayoutFileBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmLayoutFileBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmLayoutFileBo bo) { + RmLayoutFile add = BeanUtil.toBean(bo, RmLayoutFile.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmLayoutFileBo bo) { + RmLayoutFile update = BeanUtil.toBean(bo, RmLayoutFile.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmLayoutFileBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmLayoutFile::getProjectId, bo.getProjectId()); + lqw.like(bo.getFileName() != null, RmLayoutFile::getFileName, bo.getFileName()); + lqw.eq(bo.getFileType() != null, RmLayoutFile::getFileType, bo.getFileType()); + lqw.eq(bo.getStatus() != null, RmLayoutFile::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgDeviceServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgDeviceServiceImpl.java new file mode 100644 index 0000000..78f08c4 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgDeviceServiceImpl.java @@ -0,0 +1,73 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmMfgDevice; +import com.ruoyi.rm.domain.bo.RmMfgDeviceBo; +import com.ruoyi.rm.domain.vo.RmMfgDeviceVo; +import com.ruoyi.rm.mapper.RmMfgDeviceMapper; +import com.ruoyi.rm.service.IRmMfgDeviceService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmMfgDeviceServiceImpl implements IRmMfgDeviceService { + + private final RmMfgDeviceMapper baseMapper; + + @Override + public RmMfgDeviceVo queryById(Long deviceId) { + return baseMapper.selectVoById(deviceId); + } + + @Override + public TableDataInfo queryPageList(RmMfgDeviceBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmMfgDeviceBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmMfgDeviceBo bo) { + RmMfgDevice add = BeanUtil.toBean(bo, RmMfgDevice.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmMfgDeviceBo bo) { + RmMfgDevice update = BeanUtil.toBean(bo, RmMfgDevice.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmMfgDeviceBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmMfgDevice::getProjectId, bo.getProjectId()); + lqw.like(bo.getDeviceName() != null, RmMfgDevice::getDeviceName, bo.getDeviceName()); + lqw.like(bo.getSupplierName() != null, RmMfgDevice::getSupplierName, bo.getSupplierName()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgStageServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgStageServiceImpl.java new file mode 100644 index 0000000..b5b80a8 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmMfgStageServiceImpl.java @@ -0,0 +1,72 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmMfgStage; +import com.ruoyi.rm.domain.bo.RmMfgStageBo; +import com.ruoyi.rm.domain.vo.RmMfgStageVo; +import com.ruoyi.rm.mapper.RmMfgStageMapper; +import com.ruoyi.rm.service.IRmMfgStageService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmMfgStageServiceImpl implements IRmMfgStageService { + + private final RmMfgStageMapper baseMapper; + + @Override + public RmMfgStageVo queryById(Long stageId) { + return baseMapper.selectVoById(stageId); + } + + @Override + public TableDataInfo queryPageList(RmMfgStageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmMfgStageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmMfgStageBo bo) { + RmMfgStage add = BeanUtil.toBean(bo, RmMfgStage.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmMfgStageBo bo) { + RmMfgStage update = BeanUtil.toBean(bo, RmMfgStage.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmMfgStageBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getDeviceId() != null, RmMfgStage::getDeviceId, bo.getDeviceId()); + lqw.orderByAsc(RmMfgStage::getSortOrder); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementContractServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementContractServiceImpl.java new file mode 100644 index 0000000..dea8f4b --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementContractServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmProcurementContract; +import com.ruoyi.rm.domain.bo.RmProcurementContractBo; +import com.ruoyi.rm.domain.vo.RmProcurementContractVo; +import com.ruoyi.rm.mapper.RmProcurementContractMapper; +import com.ruoyi.rm.service.IRmProcurementContractService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmProcurementContractServiceImpl implements IRmProcurementContractService { + + private final RmProcurementContractMapper baseMapper; + + @Override + public RmProcurementContractVo queryById(Long contractId) { + return baseMapper.selectVoById(contractId); + } + + @Override + public TableDataInfo queryPageList(RmProcurementContractBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmProcurementContractBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmProcurementContractBo bo) { + RmProcurementContract add = BeanUtil.toBean(bo, RmProcurementContract.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmProcurementContractBo bo) { + RmProcurementContract update = BeanUtil.toBean(bo, RmProcurementContract.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmProcurementContractBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmProcurementContract::getProjectId, bo.getProjectId()); + lqw.like(bo.getContractNo() != null, RmProcurementContract::getContractNo, bo.getContractNo()); + lqw.like(bo.getSupplierName() != null, RmProcurementContract::getSupplierName, bo.getSupplierName()); + lqw.eq(bo.getStatus() != null, RmProcurementContract::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementProgressServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementProgressServiceImpl.java new file mode 100644 index 0000000..b6b2656 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementProgressServiceImpl.java @@ -0,0 +1,73 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmProcurementProgress; +import com.ruoyi.rm.domain.bo.RmProcurementProgressBo; +import com.ruoyi.rm.domain.vo.RmProcurementProgressVo; +import com.ruoyi.rm.mapper.RmProcurementProgressMapper; +import com.ruoyi.rm.service.IRmProcurementProgressService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmProcurementProgressServiceImpl implements IRmProcurementProgressService { + + private final RmProcurementProgressMapper baseMapper; + + @Override + public RmProcurementProgressVo queryById(Long progressId) { + return baseMapper.selectVoById(progressId); + } + + @Override + public TableDataInfo queryPageList(RmProcurementProgressBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmProcurementProgressBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmProcurementProgressBo bo) { + RmProcurementProgress add = BeanUtil.toBean(bo, RmProcurementProgress.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmProcurementProgressBo bo) { + RmProcurementProgress update = BeanUtil.toBean(bo, RmProcurementProgress.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmProcurementProgressBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmProcurementProgress::getProjectId, bo.getProjectId()); + lqw.like(bo.getItemName() != null, RmProcurementProgress::getItemName, bo.getItemName()); + lqw.like(bo.getSupplierName() != null, RmProcurementProgress::getSupplierName, bo.getSupplierName()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementQuoteServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementQuoteServiceImpl.java new file mode 100644 index 0000000..5e390f2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProcurementQuoteServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmProcurementQuote; +import com.ruoyi.rm.domain.bo.RmProcurementQuoteBo; +import com.ruoyi.rm.domain.vo.RmProcurementQuoteVo; +import com.ruoyi.rm.mapper.RmProcurementQuoteMapper; +import com.ruoyi.rm.service.IRmProcurementQuoteService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmProcurementQuoteServiceImpl implements IRmProcurementQuoteService { + + private final RmProcurementQuoteMapper baseMapper; + + @Override + public RmProcurementQuoteVo queryById(Long quoteId) { + return baseMapper.selectVoById(quoteId); + } + + @Override + public TableDataInfo queryPageList(RmProcurementQuoteBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmProcurementQuoteBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmProcurementQuoteBo bo) { + RmProcurementQuote add = BeanUtil.toBean(bo, RmProcurementQuote.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmProcurementQuoteBo bo) { + RmProcurementQuote update = BeanUtil.toBean(bo, RmProcurementQuote.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmProcurementQuoteBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmProcurementQuote::getProjectId, bo.getProjectId()); + lqw.like(bo.getItemName() != null, RmProcurementQuote::getItemName, bo.getItemName()); + lqw.like(bo.getSupplierName() != null, RmProcurementQuote::getSupplierName, bo.getSupplierName()); + lqw.eq(bo.getStatus() != null, RmProcurementQuote::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java new file mode 100644 index 0000000..4ad3dd2 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmProjectServiceImpl.java @@ -0,0 +1,75 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmProject; +import com.ruoyi.rm.domain.bo.RmProjectBo; +import com.ruoyi.rm.domain.vo.RmProjectVo; +import com.ruoyi.rm.mapper.RmProjectMapper; +import com.ruoyi.rm.service.IRmProjectService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmProjectServiceImpl implements IRmProjectService { + + private final RmProjectMapper baseMapper; + + @Override + public RmProjectVo queryById(Long projectId) { + return baseMapper.selectVoById(projectId); + } + + @Override + public TableDataInfo queryPageList(RmProjectBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmProjectBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmProjectBo bo) { + RmProject add = BeanUtil.toBean(bo, RmProject.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmProjectBo bo) { + RmProject update = BeanUtil.toBean(bo, RmProject.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmProjectBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.like(bo.getProjectName() != null, RmProject::getProjectName, bo.getProjectName()); + lqw.eq(bo.getProjectNo() != null, RmProject::getProjectNo, bo.getProjectNo()); + lqw.eq(bo.getClientName() != null, RmProject::getClientName, bo.getClientName()); + lqw.eq(bo.getManager() != null, RmProject::getManager, bo.getManager()); + lqw.eq(bo.getStatus() != null, RmProject::getStatus, bo.getStatus()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechPlanItemServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechPlanItemServiceImpl.java new file mode 100644 index 0000000..c116dd3 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechPlanItemServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmTechPlanItem; +import com.ruoyi.rm.domain.bo.RmTechPlanItemBo; +import com.ruoyi.rm.domain.vo.RmTechPlanItemVo; +import com.ruoyi.rm.mapper.RmTechPlanItemMapper; +import com.ruoyi.rm.service.IRmTechPlanItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmTechPlanItemServiceImpl implements IRmTechPlanItemService { + + private final RmTechPlanItemMapper baseMapper; + + @Override + public RmTechPlanItemVo queryById(Long planItemId) { + return baseMapper.selectVoById(planItemId); + } + + @Override + public TableDataInfo queryPageList(RmTechPlanItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmTechPlanItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmTechPlanItemBo bo) { + RmTechPlanItem add = BeanUtil.toBean(bo, RmTechPlanItem.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmTechPlanItemBo bo) { + RmTechPlanItem update = BeanUtil.toBean(bo, RmTechPlanItem.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmTechPlanItemBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmTechPlanItem::getProjectId, bo.getProjectId()); + lqw.like(bo.getItemName() != null, RmTechPlanItem::getItemName, bo.getItemName()); + lqw.eq(bo.getStatus() != null, RmTechPlanItem::getStatus, bo.getStatus()); + lqw.eq(bo.getOwner() != null, RmTechPlanItem::getOwner, bo.getOwner()); + return lqw; + } +} diff --git a/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechReviewItemServiceImpl.java b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechReviewItemServiceImpl.java new file mode 100644 index 0000000..7ef5d58 --- /dev/null +++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmTechReviewItemServiceImpl.java @@ -0,0 +1,74 @@ +package com.ruoyi.rm.service.impl; + +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.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.rm.domain.entity.RmTechReviewItem; +import com.ruoyi.rm.domain.bo.RmTechReviewItemBo; +import com.ruoyi.rm.domain.vo.RmTechReviewItemVo; +import com.ruoyi.rm.mapper.RmTechReviewItemMapper; +import com.ruoyi.rm.service.IRmTechReviewItemService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class RmTechReviewItemServiceImpl implements IRmTechReviewItemService { + + private final RmTechReviewItemMapper baseMapper; + + @Override + public RmTechReviewItemVo queryById(Long reviewItemId) { + return baseMapper.selectVoById(reviewItemId); + } + + @Override + public TableDataInfo queryPageList(RmTechReviewItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(RmTechReviewItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(RmTechReviewItemBo bo) { + RmTechReviewItem add = BeanUtil.toBean(bo, RmTechReviewItem.class); + return baseMapper.insert(add) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(RmTechReviewItemBo bo) { + RmTechReviewItem update = BeanUtil.toBean(bo, RmTechReviewItem.class); + return baseMapper.updateById(update) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } + + private LambdaQueryWrapper buildQueryWrapper(RmTechReviewItemBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (bo == null) return lqw; + lqw.eq(bo.getProjectId() != null, RmTechReviewItem::getProjectId, bo.getProjectId()); + lqw.eq(bo.getReviewType() != null, RmTechReviewItem::getReviewType, bo.getReviewType()); + lqw.like(bo.getItemName() != null, RmTechReviewItem::getItemName, bo.getItemName()); + lqw.eq(bo.getConclusion() != null, RmTechReviewItem::getConclusion, bo.getConclusion()); + return lqw; + } +} diff --git a/pom.xml b/pom.xml index a184fa1..3620a69 100644 --- a/pom.xml +++ b/pom.xml @@ -385,6 +385,11 @@ fad-hrm ${ruoyi-flowable-plus.version} + + com.ruoyi + fad-rolling-mill + ${ruoyi-flowable-plus.version} + @@ -405,6 +410,7 @@ fad-app fad-export fad-hrm + fad-rolling-mill pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 531b378..40789dc 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -106,6 +106,11 @@ fad-hrm + + com.ruoyi + fad-rolling-mill + + org.springframework.boot spring-boot-starter-test diff --git a/ruoyi-ui/src/api/oa/arrivalDetail.js b/ruoyi-ui/src/api/oa/arrivalDetail.js new file mode 100644 index 0000000..06b5f78 --- /dev/null +++ b/ruoyi-ui/src/api/oa/arrivalDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询到货明细列表 +export function listArrivalDetail(query) { + return request({ + url: '/oa/arrivalDetail/list', + method: 'get', + params: query + }) +} + +// 查询到货明细详细 +export function getArrivalDetail(detailId) { + return request({ + url: '/oa/arrivalDetail/' + detailId, + method: 'get' + }) +} + +// 新增到货明细 +export function addArrivalDetail(data) { + return request({ + url: '/oa/arrivalDetail', + method: 'post', + data: data + }) +} + +// 修改到货明细 +export function updateArrivalDetail(data) { + return request({ + url: '/oa/arrivalDetail', + method: 'put', + data: data + }) +} + +// 删除到货明细 +export function delArrivalDetail(detailId) { + return request({ + url: '/oa/arrivalDetail/' + detailId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/rm/budget.js b/ruoyi-ui/src/api/rm/budget.js new file mode 100644 index 0000000..2596fd3 --- /dev/null +++ b/ruoyi-ui/src/api/rm/budget.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询预算列表 +export function listBudget(query) { + return request({ + url: '/rm/budget/list', + method: 'get', + params: query + }) +} + +// 查询预算详细 +export function getBudget(budgetId) { + return request({ + url: `/rm/budget/${budgetId}`, + method: 'get' + }) +} + +// 新增预算 +export function addBudget(data) { + return request({ + url: '/rm/budget', + method: 'post', + data + }) +} + +// 修改预算 +export function updateBudget(data) { + return request({ + url: '/rm/budget', + method: 'put', + data + }) +} + +// 删除预算 +export function delBudget(budgetIds) { + return request({ + url: `/rm/budget/${budgetIds}`, + method: 'delete' + }) +} + +// 全部预算列表（不分页） +export function allBudget(query) { + return request({ + url: '/rm/budget/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/colorCard.js b/ruoyi-ui/src/api/rm/colorCard.js new file mode 100644 index 0000000..4fdc1e2 --- /dev/null +++ b/ruoyi-ui/src/api/rm/colorCard.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function listColorCard(query) { + return request({ + url: '/rm/colorCard/list', + method: 'get', + params: query + }) +} + +export function getColorCard(colorCardId) { + return request({ + url: `/rm/colorCard/${colorCardId}`, + method: 'get' + }) +} + +export function addColorCard(data) { + return request({ + url: '/rm/colorCard', + method: 'post', + data + }) +} + +export function updateColorCard(data) { + return request({ + url: '/rm/colorCard', + method: 'put', + data + }) +} + +export function delColorCard(colorCardIds) { + return request({ + url: `/rm/colorCard/${colorCardIds}`, + method: 'delete' + }) +} + +export function listColorCardAll(query) { + return request({ + url: '/rm/colorCard/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/contract.js b/ruoyi-ui/src/api/rm/contract.js new file mode 100644 index 0000000..2757805 --- /dev/null +++ b/ruoyi-ui/src/api/rm/contract.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +export function listContract(query) { + return request({ url: '/rm/contract/list', method: 'get', params: query }) +} +export function getContract(contractId) { + return request({ url: `/rm/contract/${contractId}`, method: 'get' }) +} +export function addContract(data) { + return request({ url: '/rm/contract', method: 'post', data }) +} +export function updateContract(data) { + return request({ url: '/rm/contract', method: 'put', data }) +} +export function delContract(contractIds) { + return request({ url: `/rm/contract/${contractIds}`, method: 'delete' }) +} +export function listContractAll(query) { + return request({ url: '/rm/contract/all', method: 'get', params: query }) +} diff --git a/ruoyi-ui/src/api/rm/drawingDesign.js b/ruoyi-ui/src/api/rm/drawingDesign.js new file mode 100644 index 0000000..32ea950 --- /dev/null +++ b/ruoyi-ui/src/api/rm/drawingDesign.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function listDrawingDesign(query) { + return request({ + url: '/rm/drawingDesign/list', + method: 'get', + params: query + }) +} + +export function getDrawingDesign(drawingId) { + return request({ + url: `/rm/drawingDesign/${drawingId}`, + method: 'get' + }) +} + +export function addDrawingDesign(data) { + return request({ + url: '/rm/drawingDesign', + method: 'post', + data + }) +} + +export function updateDrawingDesign(data) { + return request({ + url: '/rm/drawingDesign', + method: 'put', + data + }) +} + +export function delDrawingDesign(drawingIds) { + return request({ + url: `/rm/drawingDesign/${drawingIds}`, + method: 'delete' + }) +} + +export function listDrawingDesignAll(query) { + return request({ + url: '/rm/drawingDesign/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/drawingReview.js b/ruoyi-ui/src/api/rm/drawingReview.js new file mode 100644 index 0000000..d1dc77c --- /dev/null +++ b/ruoyi-ui/src/api/rm/drawingReview.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listDrawingReview(query) { + return request({ + url: '/rm/drawingReview/list', + method: 'get', + params: query + }) +} + +export function getDrawingReview(reviewId) { + return request({ + url: `/rm/drawingReview/${reviewId}`, + method: 'get' + }) +} + +export function addDrawingReview(data) { + return request({ + url: '/rm/drawingReview', + method: 'post', + data + }) +} + +export function updateDrawingReview(data) { + return request({ + url: '/rm/drawingReview', + method: 'put', + data + }) +} + +export function delDrawingReview(reviewIds) { + return request({ + url: `/rm/drawingReview/${reviewIds}`, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/rm/layoutFile.js b/ruoyi-ui/src/api/rm/layoutFile.js new file mode 100644 index 0000000..0fe9a9c --- /dev/null +++ b/ruoyi-ui/src/api/rm/layoutFile.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listLayoutFile(query) { + return request({ + url: '/rm/layout/list', + method: 'get', + params: query + }) +} + +export function getLayoutFile(layoutFileId) { + return request({ + url: `/rm/layout/${layoutFileId}`, + method: 'get' + }) +} + +export function addLayoutFile(data) { + return request({ + url: '/rm/layout', + method: 'post', + data + }) +} + +export function updateLayoutFile(data) { + return request({ + url: '/rm/layout', + method: 'put', + data + }) +} + +export function delLayoutFile(layoutFileIds) { + return request({ + url: `/rm/layout/${layoutFileIds}`, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/rm/mfgDevice.js b/ruoyi-ui/src/api/rm/mfgDevice.js new file mode 100644 index 0000000..bf247f9 --- /dev/null +++ b/ruoyi-ui/src/api/rm/mfgDevice.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listMfgDevice(query) { + return request({ url: '/rm/mfgDevice/list', method: 'get', params: query }) +} +export function getMfgDevice(deviceId) { + return request({ url: `/rm/mfgDevice/${deviceId}`, method: 'get' }) +} +export function addMfgDevice(data) { + return request({ url: '/rm/mfgDevice', method: 'post', data }) +} +export function updateMfgDevice(data) { + return request({ url: '/rm/mfgDevice', method: 'put', data }) +} +export function delMfgDevice(deviceIds) { + return request({ url: `/rm/mfgDevice/${deviceIds}`, method: 'delete' }) +} +export function listMfgDeviceAll(query) { + return request({ url: '/rm/mfgDevice/all', method: 'get', params: query }) +} + +export function listMfgStage(query) { + return request({ url: '/rm/mfgStage/list', method: 'get', params: query }) +} +export function getMfgStage(stageId) { + return request({ url: `/rm/mfgStage/${stageId}`, method: 'get' }) +} +export function addMfgStage(data) { + return request({ url: '/rm/mfgStage', method: 'post', data }) +} +export function updateMfgStage(data) { + return request({ url: '/rm/mfgStage', method: 'put', data }) +} +export function delMfgStage(stageIds) { + return request({ url: `/rm/mfgStage/${stageIds}`, method: 'delete' }) +} +export function listMfgStageAll(query) { + return request({ url: '/rm/mfgStage/all', method: 'get', params: query }) +} diff --git a/ruoyi-ui/src/api/rm/procProgress.js b/ruoyi-ui/src/api/rm/procProgress.js new file mode 100644 index 0000000..947b983 --- /dev/null +++ b/ruoyi-ui/src/api/rm/procProgress.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +export function listProcProgress(query) { + return request({ url: '/rm/procProgress/list', method: 'get', params: query }) +} +export function getProcProgress(progressId) { + return request({ url: `/rm/procProgress/${progressId}`, method: 'get' }) +} +export function addProcProgress(data) { + return request({ url: '/rm/procProgress', method: 'post', data }) +} +export function updateProcProgress(data) { + return request({ url: '/rm/procProgress', method: 'put', data }) +} +export function delProcProgress(progressIds) { + return request({ url: `/rm/procProgress/${progressIds}`, method: 'delete' }) +} +export function listProcProgressAll(query) { + return request({ url: '/rm/procProgress/all', method: 'get', params: query }) +} diff --git a/ruoyi-ui/src/api/rm/project.js b/ruoyi-ui/src/api/rm/project.js new file mode 100644 index 0000000..d39e9e7 --- /dev/null +++ b/ruoyi-ui/src/api/rm/project.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询项目列表 +export function listProject(query) { + return request({ + url: '/rm/project/list', + method: 'get', + params: query + }) +} + +// 查询项目详细 +export function getProject(projectId) { + return request({ + url: `/rm/project/${projectId}`, + method: 'get' + }) +} + +// 新增项目 +export function addProject(data) { + return request({ + url: '/rm/project', + method: 'post', + data + }) +} + +// 修改项目 +export function updateProject(data) { + return request({ + url: '/rm/project', + method: 'put', + data + }) +} + +// 删除项目 +export function delProject(projectIds) { + return request({ + url: `/rm/project/${projectIds}`, + method: 'delete' + }) +} + +// 获取所有项目列表（不分页） +export function allProject(query) { + return request({ + url: '/rm/project/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/rm/quote.js b/ruoyi-ui/src/api/rm/quote.js new file mode 100644 index 0000000..a90ba72 --- /dev/null +++ b/ruoyi-ui/src/api/rm/quote.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +export function listQuote(query) { + return request({ url: '/rm/quote/list', method: 'get', params: query }) +} +export function getQuote(quoteId) { + return request({ url: `/rm/quote/${quoteId}`, method: 'get' }) +} +export function addQuote(data) { + return request({ url: '/rm/quote', method: 'post', data }) +} +export function updateQuote(data) { + return request({ url: '/rm/quote', method: 'put', data }) +} +export function delQuote(quoteIds) { + return request({ url: `/rm/quote/${quoteIds}`, method: 'delete' }) +} +export function listQuoteAll(query) { + return request({ url: '/rm/quote/all', method: 'get', params: query }) +} diff --git a/ruoyi-ui/src/api/rm/techPlan.js b/ruoyi-ui/src/api/rm/techPlan.js new file mode 100644 index 0000000..693c2a1 --- /dev/null +++ b/ruoyi-ui/src/api/rm/techPlan.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listTechPlan(query) { + return request({ + url: '/rm/techPlan/list', + method: 'get', + params: query + }) +} + +export function getTechPlan(planItemId) { + return request({ + url: `/rm/techPlan/${planItemId}`, + method: 'get' + }) +} + +export function addTechPlan(data) { + return request({ + url: '/rm/techPlan', + method: 'post', + data + }) +} + +export function updateTechPlan(data) { + return request({ + url: '/rm/techPlan', + method: 'put', + data + }) +} + +export function delTechPlan(planItemIds) { + return request({ + url: `/rm/techPlan/${planItemIds}`, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/rm/techReview.js b/ruoyi-ui/src/api/rm/techReview.js new file mode 100644 index 0000000..fe581bf --- /dev/null +++ b/ruoyi-ui/src/api/rm/techReview.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function listTechReview(query) { + return request({ + url: '/rm/techReview/list', + method: 'get', + params: query + }) +} + +export function getTechReview(reviewItemId) { + return request({ + url: `/rm/techReview/${reviewItemId}`, + method: 'get' + }) +} + +export function addTechReview(data) { + return request({ + url: '/rm/techReview', + method: 'post', + data + }) +} + +export function updateTechReview(data) { + return request({ + url: '/rm/techReview', + method: 'put', + data + }) +} + +export function delTechReview(reviewItemIds) { + return request({ + url: `/rm/techReview/${reviewItemIds}`, + method: 'delete' + }) +} + +export function listTechReviewAll(query) { + return request({ + url: '/rm/techReview/all', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/oa/arrivalDetail/index.vue b/ruoyi-ui/src/views/oa/arrivalDetail/index.vue new file mode 100644 index 0000000..6d15750 --- /dev/null +++ b/ruoyi-ui/src/views/oa/arrivalDetail/index.vue @@ -0,0 +1,464 @@ + + + diff --git a/ruoyi-ui/src/views/rm/budget/index.vue b/ruoyi-ui/src/views/rm/budget/index.vue new file mode 100644 index 0000000..bf845b0 --- /dev/null +++ b/ruoyi-ui/src/views/rm/budget/index.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/drawingDesign/index.vue b/ruoyi-ui/src/views/rm/drawingDesign/index.vue new file mode 100644 index 0000000..924a5a7 --- /dev/null +++ b/ruoyi-ui/src/views/rm/drawingDesign/index.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/drawingReview/index.vue b/ruoyi-ui/src/views/rm/drawingReview/index.vue new file mode 100644 index 0000000..e63ae27 --- /dev/null +++ b/ruoyi-ui/src/views/rm/drawingReview/index.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/layout/index.vue b/ruoyi-ui/src/views/rm/layout/index.vue new file mode 100644 index 0000000..e883173 --- /dev/null +++ b/ruoyi-ui/src/views/rm/layout/index.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/manufacturing/index.vue b/ruoyi-ui/src/views/rm/manufacturing/index.vue new file mode 100644 index 0000000..8aed71d --- /dev/null +++ b/ruoyi-ui/src/views/rm/manufacturing/index.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/procurement/index.vue b/ruoyi-ui/src/views/rm/procurement/index.vue new file mode 100644 index 0000000..dd52e8f --- /dev/null +++ b/ruoyi-ui/src/views/rm/procurement/index.vue @@ -0,0 +1,426 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/project/index.vue b/ruoyi-ui/src/views/rm/project/index.vue new file mode 100644 index 0000000..166cc1f --- /dev/null +++ b/ruoyi-ui/src/views/rm/project/index.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/techPlan/index.vue b/ruoyi-ui/src/views/rm/techPlan/index.vue new file mode 100644 index 0000000..cbd08ee --- /dev/null +++ b/ruoyi-ui/src/views/rm/techPlan/index.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/ruoyi-ui/src/views/rm/techReview/index.vue b/ruoyi-ui/src/views/rm/techReview/index.vue new file mode 100644 index 0000000..e930c47 --- /dev/null +++ b/ruoyi-ui/src/views/rm/techReview/index.vue @@ -0,0 +1,336 @@ + + + + +