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; inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/dto/CopperInsOrderDto.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/dto/IfsStockQueryDTO.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.basic.dto; package com.ruoyi.inspect.dto; import lombok.Data;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/mapper/RawMaterialOrderTemplateMapper.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; /** inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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.*; inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedRetestProduct.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/pojo/RawMaterialOrderTemplate.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderTemplateService.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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; inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderTemplateServiceImpl.java
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
文件名从 inspect-server/src/main/java/com/ruoyi/basic/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;
