From 97e2cfcd1ce62781c1ccee05ea51ef791957d8d2 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期一, 17 二月 2025 14:59:36 +0800 Subject: [PATCH] 修改模块名 --- inspect-server/src/main/java/com/ruoyi/inspect/pojo/RawMaterialOrderTemplate.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/dto/CopperInsOrderDto.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 10 ++-- cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 0 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java | 4 + inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderTemplateService.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderUpdateDto.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 8 ++-- inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/mapper/RawMaterialOrderTemplateMapper.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderTemplateServiceImpl.java | 8 ++-- inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 12 +++-- inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto.java | 6 +- inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/dto/IfsStockQueryDTO.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java | 4 +- inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java | 2 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java | 7 ++- 25 files changed, 54 insertions(+), 47 deletions(-) diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java index 80f9f06..c72a092 100644 --- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java +++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeCalibrationScheduleServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; -import com.ruoyi.basic.util.HackLoopTableRenderPolicy; +import com.ruoyi.inspect.util.HackLoopTableRenderPolicy; import com.ruoyi.require.mapper.FeCalibrationScheduleMapper; import com.ruoyi.require.pojo.FeCalibrationSchedule; import com.ruoyi.require.service.FeCalibrationScheduleService; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java similarity index 100% rename from inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java rename to inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java diff --git a/inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java similarity index 96% rename from inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java rename to inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java index 0a5e48c..40bdd0d 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java @@ -1,17 +1,19 @@ -package com.ruoyi.basic.controller; +package com.ruoyi.inspect.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.pojo.IfsInventoryQuantity; -import com.ruoyi.basic.pojo.InsOrder; -import com.ruoyi.basic.pojo.RawMaterialOrderTemplate; -import com.ruoyi.basic.service.RawMaterialOrderService; -import com.ruoyi.basic.service.RawMaterialOrderTemplateService; +import com.ruoyi.inspect.dto.SampleProductDto; +import com.ruoyi.inspect.pojo.InsOrder; +import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate; +import com.ruoyi.inspect.service.RawMaterialOrderService; +import com.ruoyi.inspect.service.RawMaterialOrderTemplateService; import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.utils.JackSonUtil; import com.ruoyi.common.utils.WxCpUtils; +import com.ruoyi.inspect.dto.CopperInsOrderDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/CopperInsOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CopperInsOrderDto.java similarity index 91% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/CopperInsOrderDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/CopperInsOrderDto.java index 328126f..7c913d7 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/CopperInsOrderDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CopperInsOrderDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.basic.pojo.InsOrder; +import com.ruoyi.inspect.pojo.InsOrder; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java similarity index 98% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/CostStatisticsDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java index 904619b..c48c862 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/CostStatisticsDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/IfsStockQueryDTO.java similarity index 98% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/IfsStockQueryDTO.java index da1294c..0091e69 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/IfsStockQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/InsOrderUpdateDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderUpdateDto.java similarity index 83% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/InsOrderUpdateDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderUpdateDto.java index 45c53f5..7f7b369 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/InsOrderUpdateDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderUpdateDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; -import com.ruoyi.basic.pojo.InsOrder; +import com.ruoyi.inspect.pojo.InsOrder; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/InsulatingDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java similarity index 77% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/InsulatingDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java index 53ced02..641f499 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/InsulatingDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; -import com.ruoyi.basic.pojo.InsProduct; +import com.ruoyi.inspect.pojo.InsProduct; import lombok.Data; import java.util.List; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/RawMaterialStandardTreeDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java similarity index 84% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/RawMaterialStandardTreeDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java index 28fbe65..c1aa3b1 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/RawMaterialStandardTreeDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java @@ -1,5 +1,7 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; +import com.ruoyi.basic.dto.ModelDto; +import com.ruoyi.basic.dto.SampleDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java similarity index 96% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/SampleOrderDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java index 299b09b..1f61c32 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleOrderDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java @@ -1,9 +1,9 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; -import com.ruoyi.basic.pojo.InsOrder; +import com.ruoyi.inspect.pojo.InsOrder; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto.java similarity index 84% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto.java index a651523..1ccf266 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; -import com.ruoyi.basic.pojo.InsProduct; -import com.ruoyi.basic.pojo.InsSample; +import com.ruoyi.inspect.pojo.InsProduct; +import com.ruoyi.inspect.pojo.InsSample; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java similarity index 98% rename from inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto2.java rename to inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java index 7abb63b..aa371ce 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/dto/SampleProductDto2.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleProductDto2.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.dto; +package com.ruoyi.inspect.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/mapper/RawMaterialOrderTemplateMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/RawMaterialOrderTemplateMapper.java similarity index 75% rename from inspect-server/src/main/java/com/ruoyi/basic/mapper/RawMaterialOrderTemplateMapper.java rename to inspect-server/src/main/java/com/ruoyi/inspect/mapper/RawMaterialOrderTemplateMapper.java index e4e78f2..cd455ed 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/mapper/RawMaterialOrderTemplateMapper.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/RawMaterialOrderTemplateMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.basic.mapper; +package com.ruoyi.inspect.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.basic.pojo.RawMaterialOrderTemplate; +import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate; import org.apache.ibatis.annotations.Mapper; /** diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java similarity index 99% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsOrder.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java index 7d3f20f..629ed12 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsOrder.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java similarity index 99% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProduct.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java index fae198f..ba9cb6a 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProduct.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.*; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProductResult.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java similarity index 97% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProductResult.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java index 15a5598..e95dc19 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsProductResult.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java similarity index 98% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java index fc15a45..f3657e4 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsUnqualifiedRetestProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java similarity index 98% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsUnqualifiedRetestProduct.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java index d45a196..4545acc 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsUnqualifiedRetestProduct.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/RawMaterialOrderTemplate.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/RawMaterialOrderTemplate.java similarity index 96% rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/RawMaterialOrderTemplate.java rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/RawMaterialOrderTemplate.java index 72fcf37..a50b9b3 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/RawMaterialOrderTemplate.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/RawMaterialOrderTemplate.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.pojo; +package com.ruoyi.inspect.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java similarity index 94% rename from inspect-server/src/main/java/com/ruoyi/basic/service/InsOrderService.java rename to inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java index f36d69a..07dd05d 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/service/InsOrderService.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java @@ -1,11 +1,11 @@ -package com.ruoyi.basic.service; +package com.ruoyi.inspect.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.basic.dto.*; -import com.ruoyi.basic.pojo.InsOrder; -import com.ruoyi.basic.pojo.InsUnqualifiedRetestProduct; +import com.ruoyi.inspect.pojo.InsOrder; +import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct; +import com.ruoyi.inspect.dto.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java similarity index 94% rename from inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java rename to inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java index 1662a1d..9881b40 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java @@ -1,10 +1,13 @@ -package com.ruoyi.basic.service; +package com.ruoyi.inspect.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.pojo.IfsInventoryQuantity; -import com.ruoyi.basic.pojo.InsOrder; +import com.ruoyi.inspect.dto.SampleProductDto; +import com.ruoyi.inspect.pojo.InsOrder; +import com.ruoyi.inspect.dto.CopperInsOrderDto; +import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderTemplateService.java similarity index 85% rename from inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java rename to inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderTemplateService.java index 71572e0..0f3ee5b 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderTemplateService.java @@ -1,7 +1,7 @@ -package com.ruoyi.basic.service; +package com.ruoyi.inspect.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.basic.pojo.RawMaterialOrderTemplate; +import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate; import java.util.List; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java similarity index 99% rename from inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java rename to inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java index 8bc4ca6..4c81840 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.basic.service.impl; +package com.ruoyi.inspect.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; @@ -17,13 +17,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.FactoryDto; import com.ruoyi.basic.dto.LaboratoryDto; -import com.ruoyi.basic.dto.RawMaterialStandardTreeDto; +import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto; import com.ruoyi.basic.dto.SampleTypeDto; import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper; import com.ruoyi.basic.mapper.StandardTreeMapper; -import com.ruoyi.basic.pojo.InsOrder; -import com.ruoyi.basic.service.InsOrderService; -import com.ruoyi.basic.service.RawMaterialOrderService; +import com.ruoyi.inspect.pojo.InsOrder; +import com.ruoyi.inspect.service.InsOrderService; +import com.ruoyi.inspect.service.RawMaterialOrderService; import com.ruoyi.common.numgen.NumberGenerator; import com.ruoyi.framework.exception.ErrorException; import com.ruoyi.system.mapper.UserMapper; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderTemplateServiceImpl.java similarity index 88% rename from inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java rename to inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderTemplateServiceImpl.java index d959998..afd3ac3 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderTemplateServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.basic.service.impl; +package com.ruoyi.inspect.service.impl; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.basic.mapper.RawMaterialOrderTemplateMapper; -import com.ruoyi.basic.pojo.RawMaterialOrderTemplate; -import com.ruoyi.basic.service.RawMaterialOrderTemplateService; +import com.ruoyi.inspect.mapper.RawMaterialOrderTemplateMapper; +import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate; +import com.ruoyi.inspect.service.RawMaterialOrderTemplateService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java similarity index 99% rename from inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java rename to inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java index 482f920..9343a26 100644 --- a/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ruoyi.basic.util; +package com.ruoyi.inspect.util; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.exception.RenderException; -- Gitblit v1.9.3