代码优化

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActClassificationController.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.controller;
 import java.util.List;
 
 import com.ruoyi.system.domain.ActClassification;
-import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.service.IActClassificationService;
 import com.ruoyi.system.web.ServiceCode;
 import org.springframework.security.access.prepost.PreAuthorize;

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesAccountController.java

 package com.ruoyi.system.controller;
 
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.ActDispensing;
-import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.service.IActSuppliesAccountService;
-import com.ruoyi.system.service.IActSuppliesService;
-import com.ruoyi.system.web.ServiceCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -3,10 +3,8 @@ package com.ruoyi.system.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.service.IActSuppliesService;
@@ -15,10 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 物料总分类管理Controller

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertController.java

@@ -10,11 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+
 
 /**
  * 模板转换页面接口

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertroleController.java

@@ -2,8 +2,6 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java

@@ -4,10 +4,8 @@ package com.ruoyi.system.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java

 package com.ruoyi.system.controller;
 
-import java.lang.reflect.Array;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -11,11 +7,8 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
 import com.ruoyi.system.web.ServiceCode;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -25,7 +18,6 @@ import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.service.IActSuppliesRoleService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.context.request.WebRequest;
 
 /**
  * 导入规则Controller

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java

@@ -2,8 +2,6 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 
-
-import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActClassificationMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.system.domain.ActClassification;
-import com.ruoyi.system.domain.ActSupplies;
 import org.springframework.stereotype.Repository;
 
 /**

ruoyi-supplies/src/main/java/com/ruoyi/system/service/ActSuppliesTemplateService.java

@@ -66,12 +66,12 @@ public interface ActSuppliesTemplateService
      * @param id 导入规则
      * @return 导入规则集合
      */
-    public List<ActSuppliesRole> selectActSuppliesRoleList(Integer id);
+     List<ActSuppliesRole> selectActSuppliesRoleList(Integer id);
     /**
      * 修改导入规则
      *
      * @param actSuppliesRole 导入规则
      * @return 结果
      */
-    public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
+     int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActClassificationService.java

@@ -2,7 +2,6 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActClassification;
-import com.ruoyi.system.domain.ActSupplies;
 import io.lettuce.core.dynamic.annotation.Param;
 
 /**
@@ -19,7 +18,7 @@ public interface IActClassificationService
      * @param id 分配信息ID
      * @return 分配信息
      */
-    public ActClassification selectActClassificationById(Long id);
+     ActClassification selectActClassificationById(Long id);
 
     /**
      * 查询分配信息列表
@@ -27,7 +26,7 @@ public interface IActClassificationService
      * @param actClassification 分配信息
      * @return 分配信息集合
      */
-    public List<ActClassification> selectActClassificationList(ActClassification actClassification);
+     List<ActClassification> selectActClassificationList(ActClassification actClassification);
 
     /**
      * 新增分配信息
@@ -35,7 +34,7 @@ public interface IActClassificationService
      * @param actClassification 分配信息
      * @return 结果
      */
-    public int insertActClassification(ActClassification actClassification);
+     int insertActClassification(ActClassification actClassification);
 
     /**
      * 修改分配信息
@@ -43,7 +42,7 @@ public interface IActClassificationService
      * @param actClassification 分配信息
      * @return 结果
      */
-    public int updateActClassification(ActClassification actClassification);
+     int updateActClassification(ActClassification actClassification);
 
     /**
      * 批量删除分配信息
@@ -51,7 +50,7 @@ public interface IActClassificationService
      * @param ids 需要删除的分配信息ID
      * @return 结果
      */
-    public int deleteActClassificationByIds(Long[] ids);
+     int deleteActClassificationByIds(Long[] ids);
 
     /**
      * 删除分配信息信息
@@ -59,7 +58,7 @@ public interface IActClassificationService
      * @param id 分配信息ID
      * @return 结果
      */
-    public int deleteActClassificationById(Long id);
+     int deleteActClassificationById(Long id);
 
     List<Integer> findId(Long id);
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesConvertroleService.java

@@ -18,7 +18,7 @@ public interface IActSuppliesConvertroleService
      * @param id 通用规则ID
      * @return 通用规则
      */
-    public ActSuppliesConvertrole selectActSuppliesConvertById(Long id);
+     ActSuppliesConvertrole selectActSuppliesConvertById(Long id);
 
     /**
      * 查询通用规则列表
@@ -26,7 +26,7 @@ public interface IActSuppliesConvertroleService
      * @param actSuppliesConvertrole 通用规则
      * @return 通用规则集合
      */
-    public List<ActSuppliesConvertrole> selectActSuppliesConvertList(ActSuppliesConvertrole actSuppliesConvertrole);
+     List<ActSuppliesConvertrole> selectActSuppliesConvertList(ActSuppliesConvertrole actSuppliesConvertrole);
 
     /**
      * 新增通用规则
@@ -34,7 +34,7 @@ public interface IActSuppliesConvertroleService
      * @param actSuppliesConvertrole 通用规则
      * @return 结果
      */
-    public int insertActSuppliesConvert(ActSuppliesConvertrole actSuppliesConvertrole);
+     int insertActSuppliesConvert(ActSuppliesConvertrole actSuppliesConvertrole);
 
     /**
      * 修改通用规则
@@ -42,7 +42,7 @@ public interface IActSuppliesConvertroleService
      * @param actSuppliesConvertrole 通用规则
      * @return 结果
      */
-    public int updateActSuppliesConvert(ActSuppliesConvertrole actSuppliesConvertrole);
+     int updateActSuppliesConvert(ActSuppliesConvertrole actSuppliesConvertrole);
 
     /**
      * 批量删除通用规则
@@ -50,7 +50,7 @@ public interface IActSuppliesConvertroleService
      * @param ids 需要删除的通用规则ID
      * @return 结果
      */
-    public int deleteActSuppliesConvertByIds(Long[] ids);
+     int deleteActSuppliesConvertByIds(Long[] ids);
 
     /**
      * 删除通用规则信息
@@ -58,7 +58,7 @@ public interface IActSuppliesConvertroleService
      * @param id 通用规则ID
      * @return 结果
      */
-    public int deleteActSuppliesConvertById(Long id);
+     int deleteActSuppliesConvertById(Long id);
 
     List<ActSuppliesTemplate> selectActSuppliesConvertListTemp();
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java

@@ -22,7 +22,7 @@ public interface IActSuppliesDetailsService
      * @param id 物料细分类管理ID
      * @return 物料细分类管理
      */
-    public ActSuppliesDetails selectActSuppliesDetailsById(Long id);
+     ActSuppliesDetails selectActSuppliesDetailsById(Long id);
 
     /**
      * 查询物料细分类管理列表
@@ -30,9 +30,9 @@ public interface IActSuppliesDetailsService
      * @param actSuppliesDetails 物料细分类管理
      * @return 物料细分类管理集合
      */
-    public List<ActSuppliesDetails> selectActSuppliesDetailsList(ActSuppliesDetails actSuppliesDetails);
+     List<ActSuppliesDetails> selectActSuppliesDetailsList(ActSuppliesDetails actSuppliesDetails);
 
-    public List<ActSuppliesDetails> selectActSuppliesDetailsMaterialList(ActSuppliesDetails actSuppliesDetails);
+     List<ActSuppliesDetails> selectActSuppliesDetailsMaterialList(ActSuppliesDetails actSuppliesDetails);
 
     /**
      * 新增物料细分类管理
@@ -40,7 +40,7 @@ public interface IActSuppliesDetailsService
      * @param actSuppliesDetails 物料细分类管理
      * @return 结果
      */
-    public int insertActSuppliesDetails(ActSuppliesDetails actSuppliesDetails);
+     int insertActSuppliesDetails(ActSuppliesDetails actSuppliesDetails);
 
     /**
      * 修改物料细分类管理
@@ -48,7 +48,7 @@ public interface IActSuppliesDetailsService
      * @param actSuppliesDetails 物料细分类管理
      * @return 结果
      */
-    public int updateActSuppliesDetails(ActSuppliesDetails actSuppliesDetails);
+     int updateActSuppliesDetails(ActSuppliesDetails actSuppliesDetails);
 
     /**
      * 批量删除物料细分类管理
@@ -56,7 +56,7 @@ public interface IActSuppliesDetailsService
      * @param ids 需要删除的物料细分类管理ID
      * @return 结果
      */
-    public List<Long> deleteActSuppliesDetailsByIds(Long[] ids);
+     List<Long> deleteActSuppliesDetailsByIds(Long[] ids);
 
     /**
      * 删除物料细分类管理信息
@@ -64,7 +64,7 @@ public interface IActSuppliesDetailsService
      * @param id 物料细分类管理ID
      * @return 结果
      */
-    public int deleteActSuppliesDetailsById(Long id);
+     int deleteActSuppliesDetailsById(Long id);
 
     List<ActSupplies> saveSid();
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesHistorydataService.java

@@ -19,7 +19,7 @@ public interface IActSuppliesHistorydataService
      * @param id  历史数据ID
      * @return  历史数据
      */
-    public ActSuppliesHistorydata selectActSuppliesHistorydataById(Long id);
+     ActSuppliesHistorydata selectActSuppliesHistorydataById(Long id);
 
     /**
      * 查询 历史数据列表
@@ -27,7 +27,7 @@ public interface IActSuppliesHistorydataService
      * @param actSuppliesHistorydata  历史数据
      * @return  历史数据集合
      */
-    public List<ActSuppliesHistorydata> selectActSuppliesHistorydataList(ActSuppliesHistorydata actSuppliesHistorydata);
+     List<ActSuppliesHistorydata> selectActSuppliesHistorydataList(ActSuppliesHistorydata actSuppliesHistorydata);
 
     /**
      * 新增 历史数据
@@ -35,7 +35,7 @@ public interface IActSuppliesHistorydataService
      * @param actSuppliesHistorydata  历史数据
      * @return 结果
      */
-    public int insertActSuppliesHistorydata(List<ActSuppliesHistorydata> actSuppliesHistorydata);
+     int insertActSuppliesHistorydata(List<ActSuppliesHistorydata> actSuppliesHistorydata);
 
     /**
      * 修改 历史数据
@@ -43,7 +43,7 @@ public interface IActSuppliesHistorydataService
      * @param actSuppliesHistorydata  历史数据
      * @return 结果
      */
-    public int updateActSuppliesHistorydata(ActSuppliesHistorydata actSuppliesHistorydata);
+     int updateActSuppliesHistorydata(ActSuppliesHistorydata actSuppliesHistorydata);
 
     /**
      * 批量删除 历史数据
@@ -51,7 +51,7 @@ public interface IActSuppliesHistorydataService
      * @param ids 需要删除的 历史数据ID
      * @return 结果
      */
-    public int deleteActSuppliesHistorydataByIds(Long[] ids);
+     int deleteActSuppliesHistorydataByIds(Long[] ids);
 
     /**
      * 删除 历史数据信息
@@ -59,7 +59,7 @@ public interface IActSuppliesHistorydataService
      * @param id  历史数据ID
      * @return 结果
      */
-    public int deleteActSuppliesHistorydataById(Long id);
+     int deleteActSuppliesHistorydataById(Long id);
 
     int addInsertActSuppliesHistorydata(List<ActSuppliesHistorydata> actSuppliesHistorydata);
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleDetailService.java

@@ -2,8 +2,6 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 
-
-import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 
@@ -22,7 +20,7 @@ public interface IActSuppliesRoleDetailService
      * @param id 规则详情ID
      * @return 规则详情
      */
-    public ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
+     ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
 
     /**
      * 查询规则详情列表
@@ -30,7 +28,7 @@ public interface IActSuppliesRoleDetailService
      * @param actSuppliesRoleDetail 规则详情
      * @return 规则详情集合
      */
-    public List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(ActSuppliesRoleDetail actSuppliesRoleDetail);
+     List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(ActSuppliesRoleDetail actSuppliesRoleDetail);
 
     /**
      * 新增规则详情
@@ -38,7 +36,7 @@ public interface IActSuppliesRoleDetailService
      * @param actSuppliesRoleDetail 规则详情
      * @return 结果
      */
-    public int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
+     int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
 
     /**
      * 修改规则详情
@@ -46,7 +44,7 @@ public interface IActSuppliesRoleDetailService
      * @param actSuppliesRoleDetail 规则详情
      * @return 结果
      */
-    public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
+     int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
 
     /**
      * 批量删除规则详情
@@ -54,7 +52,7 @@ public interface IActSuppliesRoleDetailService
      * @param ids 需要删除的规则详情ID
      * @return 结果
      */
-    public int deleteActSuppliesRoleDetailByIds(Integer[] ids);
+     int deleteActSuppliesRoleDetailByIds(Integer[] ids);
 
     /**
      * 删除规则详情信息
@@ -62,7 +60,7 @@ public interface IActSuppliesRoleDetailService
      * @param id 规则详情ID
      * @return 结果
      */
-    public int deleteActSuppliesRoleDetailById(Integer id);
+     int deleteActSuppliesRoleDetailById(Integer id);
 
     List<ActSuppliesRole> saveSid();
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleService.java

@@ -21,7 +21,7 @@ public interface IActSuppliesRoleService
      * @param id 导入规则ID
      * @return 导入规则
      */
-    public ActSuppliesRole selectActSuppliesRoleById(Integer id);
+     ActSuppliesRole selectActSuppliesRoleById(Integer id);
 
     /**
      * 查询导入规则列表
@@ -29,7 +29,7 @@ public interface IActSuppliesRoleService
      * @param actSuppliesRole 导入规则
      * @return 导入规则集合
      */
-    public List<ActSuppliesRole> selectActSuppliesRoleList(ActSuppliesRole actSuppliesRole);
+     List<ActSuppliesRole> selectActSuppliesRoleList(ActSuppliesRole actSuppliesRole);
 
     /**
      * 查询规则详情
@@ -37,7 +37,7 @@ public interface IActSuppliesRoleService
      * @param id 规则详情ID
      * @return 规则详情
      */
-    public ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
+     ActSuppliesRoleDetail selectActSuppliesRoleDetailById(Integer id);
 
     /**
      * 查询规则详情列表
@@ -45,7 +45,7 @@ public interface IActSuppliesRoleService
      * @param id 规则详情
      * @return 规则详情集合
      */
-    public List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(Integer id);
+     List<ActSuppliesRoleDetail> selectActSuppliesRoleDetailList(Integer id);
 
     /**
      * 新增导入规则
@@ -53,7 +53,7 @@ public interface IActSuppliesRoleService
      * @param actSuppliesRole 导入规则
      * @return 结果
      */
-    public int insertActSuppliesRole(ActSuppliesRole actSuppliesRole);
+     int insertActSuppliesRole(ActSuppliesRole actSuppliesRole);
 
     /**
      * 修改导入规则
@@ -61,9 +61,9 @@ public interface IActSuppliesRoleService
      * @param actSuppliesRole 导入规则
      * @return 结果
      */
-    public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
+     int updateActSuppliesRole(ActSuppliesRole actSuppliesRole);
 
-    public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
+     int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail);
 
     /**
      * 批量删除导入规则
@@ -79,7 +79,7 @@ public interface IActSuppliesRoleService
      * @param id 导入规则ID
      * @return 结果
      */
-    public int deleteActSuppliesRoleById(Integer id);
+     int deleteActSuppliesRoleById(Integer id);
 
     List<ActSuppliesTemplate> saveSid();
     /**

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesService.java

@@ -2,7 +2,6 @@ package com.ruoyi.system.service;
 
 import com.ruoyi.system.domain.ActSupplies;
 import io.lettuce.core.dynamic.annotation.Param;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -21,7 +20,7 @@ public interface IActSuppliesService
      * @param id 物料总分类管理ID
      * @return 物料总分类管理
      */
-    public ActSupplies selectActSuppliesById(Long id);
+     ActSupplies selectActSuppliesById(Long id);
 
     /**
      * 查询物料总分类管理列表
@@ -29,7 +28,7 @@ public interface IActSuppliesService
      * @param actSupplies 物料总分类管理
      * @return 物料总分类管理集合
      */
-    public List<ActSupplies> selectActSuppliesList(ActSupplies actSupplies);
+     List<ActSupplies> selectActSuppliesList(ActSupplies actSupplies);
 
     /**
      * 新增物料总分类管理
@@ -37,7 +36,7 @@ public interface IActSuppliesService
      * @param actSupplies 物料总分类管理
      * @return 结果
      */
-    public int insertActSupplies(ActSupplies actSupplies);
+     int insertActSupplies(ActSupplies actSupplies);
 
     /**
      * 修改物料总分类管理
@@ -45,7 +44,7 @@ public interface IActSuppliesService
      * @param actSupplies 物料总分类管理
      * @return 结果
      */
-    public int updateActSupplies(ActSupplies actSupplies);
+     int updateActSupplies(ActSupplies actSupplies);
 
     /**
      * 批量删除物料总分类管理
@@ -53,7 +52,7 @@ public interface IActSuppliesService
      * @param ids 需要删除的物料总分类管理ID
      * @return 结果
      */
-    public int deleteActSuppliesByIds(Long[] ids);
+     int deleteActSuppliesByIds(Long[] ids);
 
     /**
      * 删除物料总分类管理信息
@@ -61,7 +60,7 @@ public interface IActSuppliesService
      * @param id 物料总分类管理ID
      * @return 结果
      */
-    public int deleteActSuppliesById(Long id);
+     int deleteActSuppliesById(Long id);
 
     List<ActSupplies> options();
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActClassificationServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.Map;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.ActClassification;
-import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.mapper.ActClassificationMapper;
 import com.ruoyi.system.service.IActClassificationService;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertroleServiceImpl.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java

@@ -4,12 +4,10 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.domain.ActClassification;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.mapper.ActSuppliesDetailsMapper;
 import com.ruoyi.system.service.IActSuppliesDetailsService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

 package com.ruoyi.system.service.impl;
 
-import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -16,7 +12,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
 import com.ruoyi.system.mapper.ActSuppliesDetailsMapper;
-import com.sun.javafx.collections.MappingChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesHistorydataMapper;
@@ -659,10 +654,15 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                         mapcode.put(key,values);
                     }
 
+                    Map<String, String> resultMap = new HashMap<>();
+                    for (ActSuppliesDetails entity : actSuppliesDetails1) {
+                        resultMap.put(entity.getCode(), entity.getCodes());
+                    }
+
                     //获取导入excel表数据存储到生成表实体类中
                     for (int x = (int)parse.getJSONObject(0).get("HeaderRow"); x < actOperation2s.get(i).getActOperation2().length; x++) {
                         //判断数据是否为空，为空结束循环
-                        
+
                         String[] s1 = mapcode.get(String.valueOf(x));
 
                         if (actOperation2s.get(i).getActOperation2()[x]!=null){
@@ -724,6 +724,17 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                                     if(parse.getJSONObject(0).get("DateColumn").hashCode()>0){
                                         actSuppliesImportCleaningAcc.setDateColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DateColumn") - 1)].getV());
                                     }
+
+                                    String codeColumn = actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("CodeColumn") - 1)].getV();
+                                    if (resultMap.containsKey(codeColumn.substring(0,6))){
+                                        actSuppliesImportCleaningAcc.setCategories(resultMap.get(codeColumn.substring(0,6)));
+                                    }else if (resultMap.containsKey(codeColumn.substring(0,4))){
+                                        actSuppliesImportCleaningAcc.setCategories(resultMap.get(codeColumn.substring(0,4)));
+                                    }else if (resultMap.containsKey(codeColumn.substring(0,2))){
+                                        actSuppliesImportCleaningAcc.setCategories(resultMap.get(codeColumn.substring(0,2)));
+                                    }else {
+                                        actSuppliesImportCleaningAcc.setCategories("10");
+                                    }
                                     //actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][JSON.parseObject(actOperation2s.get(i).getHistoryRole()).getInteger("DateColumn")].getV());
                                     //新增一条生成表数据（筛选）
                                     actSuppliesCleaningRuleMapper.addActSuppliesImportCleaningAcc(actSuppliesImportCleaningAcc);

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleServiceImpl.java

@@ -9,10 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.*;
-import com.ruoyi.system.ex.ServiceException;
 import com.ruoyi.system.mapper.ActSuppliesRoleDetailMapper;
-import com.ruoyi.system.web.ServiceCode;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -4,22 +4,15 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.ActSupplies;
-import com.ruoyi.system.ex.ServiceException;
 import com.ruoyi.system.mapper.ActSuppliesMapper;
 import com.ruoyi.system.service.IActSuppliesService;
-import com.ruoyi.system.web.ServiceCode;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.sql.rowset.serial.SerialException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE;
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
 
 /**
  * 物料总分类管理Service业务层处理

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesTemplateServiceImpl.java

 package com.ruoyi.system.service.impl;
 
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 /**