1.清理无效依赖项

2.修复阅读计划查询结果错误的bug
3.增加ws本地调试环境
4.修改生产环境ws客户端访问地址

src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Id;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java

@@ -1,10 +1,8 @@
 package com.dsic.gj_erp.bean.jcsj;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
 import com.dsic.gj_erp.bean.jhgk.excel.ZrcAndPlb;
 import com.dsic.gj_erp.exception.ServiceException;
 import io.swagger.annotations.ApiModel;

src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java

@@ -1,20 +1,9 @@
 package com.dsic.gj_erp.bean.jcsj;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java

@@ -1,6 +1,9 @@
 package com.dsic.gj_erp.bean.jcsj;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java

@@ -1,9 +1,7 @@
 package com.dsic.gj_erp.bean.jcsj;
 
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java

@@ -1,10 +1,8 @@
 package com.dsic.gj_erp.bean.jcsj;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java

@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import java.io.Serializable;
 
 /**

src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java

@@ -13,7 +13,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java

@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import java.io.Serializable;
 
 /**

src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java

@@ -1,8 +1,6 @@
 package com.dsic.gj_erp.bean.jhgk;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
 
 import java.io.Serializable;
 

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java

@@ -1,12 +1,7 @@
 package com.dsic.gj_erp.bean.jhgk;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 

src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java

@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.bean.jhgk;
 
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.bean.jhgk.dto;
 
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java

@@ -1,11 +1,8 @@
 package com.dsic.gj_erp.bean.jhgk.dto;
 
 import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class Pldto extends DmCzplpNew {
 

src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java

@@ -4,7 +4,6 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data

src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java

@@ -3,15 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java

@@ -3,14 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java

@@ -1,9 +1,7 @@
 package com.dsic.gj_erp.bean.jhgk.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java

@@ -7,8 +7,6 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Random;
-
 @Getter
 @Setter
 @TableName("im_slxx")

src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java

@@ -1,8 +1,6 @@
 package com.dsic.gj_erp.bean.kc;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java

@@ -1,17 +1,15 @@
 package com.dsic.gj_erp.bean.pgd;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java

@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java

@@ -1,12 +1,12 @@
 package com.dsic.gj_erp.bean.pgd;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.bean.sy;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -12,7 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java

@@ -3,7 +3,6 @@ package com.dsic.gj_erp.bean.sy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-
 import com.dsic.gj_erp.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java

@@ -1,42 +1,25 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
-import com.dsic.gj_erp.bean.jcsj.EmGcrl;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
-import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
-import com.dsic.gj_erp.bean.jhgk.DmQfxq;
-import com.dsic.gj_erp.bean.jhgk.DmSygd;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
-import com.dsic.gj_erp.handler.ComputePlan;
 import com.dsic.gj_erp.listeners.ExcelJhxfListener;
-import com.dsic.gj_erp.listeners.ExcelPlListener;
-import com.dsic.gj_erp.pc.Manager;
-import com.dsic.gj_erp.pc.排产;
 import com.dsic.gj_erp.service.jcsj.EmGcrlService;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
-import com.dsic.gj_erp.service.sy.SYService;
-import com.sun.org.apache.bcel.internal.generic.RETURN;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.Semaphore;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
@@ -46,6 +47,7 @@ public class 中日程批量表合并导入控制器 {
     private final DmZrcjhOldService oldService;
 
     @PostMapping("upload")
+    @AuthFunction
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<?> upload(@RequestParam("file") MultipartFile file,String dcCh, HttpServletRequest req) throws IOException {
         ExcelZrcAndPlb excelZrcAndPlb = new ExcelZrcAndPlb();
@@ -75,15 +77,16 @@ public class 中日程批量表合并导入控制器 {
                     if (ObjectUtil.isNotEmpty(dmZrcjhOne)) {
                         //存进备份表
                         DmZrcjhOld old=  BeanUtil.copyProperties(dmZrcjhOne, DmZrcjhOld.class);
+                        old.setXh(null);
                         oldService.save(old);
                         String dmZrcjhOneBzr = dmZrcjhOne.getBzr();
                         String dmZrcjhOneBzrq = dmZrcjhOne.getBzrq();
                         if (!dmZrcjhOneBzr.contains(bzr)) {
                             dmZrcjh.setBzr(StrUtil.format("{}@{}",dmZrcjhOneBzr , bzr));
                             dmZrcjh.setBzrq(StrUtil.format("{}@{}",dmZrcjhOneBzrq , day));
-                            dmZrcjh.setXh(dmZrcjhOne.getXh());
                         }
-                        zrcjhService.updateById(dmZrcjh);
+                        dmZrcjh.setXh(dmZrcjhOne.getXh());
+                        zrcjhList.add(dmZrcjh);
                     } else {
                         dmZrcjh.setBzr(bzr);
                         dmZrcjh.setBzrq(day);
@@ -99,8 +102,8 @@ public class 中日程批量表合并导入控制器 {
                             fdList.stream().filter(fst -> plb.getDcPl().equals(fst.getDcPl()))
                                     .findFirst().ifPresent(it->updateCzPlp(plb,it));
                         }catch (Exception ignored){}
-                    }
                         plList.add(plb);
+                    }
 
                     //旧表数据,仅当首次导入时写入即可
                     if (!remove){
@@ -111,7 +114,7 @@ public class 中日程批量表合并导入控制器 {
                 }
             }
         }
-        zrcjhService.saveBatch(zrcjhList,500);
+        zrcjhService.saveOrUpdateBatch(zrcjhList,500);
 
         if (!plList.isEmpty()) {
             czplpNewService.saveBatch(plList,500);
@@ -139,7 +142,7 @@ public class 中日程批量表合并导入控制器 {
             dmCzplpService.saveBatch(dmCzplpList);
         }
 
-        return new ResultBean<>();
+        return new ResultBean<>(zrcjhList);
     }
 
     private  void updateCzPlp(DmCzplpNew czplpNew,DmCzplpNew czplp){

src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.dao.jcsj;
 
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.dao.jcsj;
 
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
-import com.dsic.gj_erp.bean.sy.Dm_zhbmlbp;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java

@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.dao.jcsj;
 
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbrydyp;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.dao.jhgk;
 
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java

@@ -1,18 +1,10 @@
 package com.dsic.gj_erp.mapper.jcsj;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
-import org.mapstruct.Mapper;
 
-import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.jcsj;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 
 /**

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java

@@ -3,7 +3,6 @@ package com.dsic.gj_erp.mapper.jhgk;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import io.lettuce.core.dynamic.annotation.Param;
 
 import java.util.List;
 

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java

@@ -2,10 +2,8 @@ package com.dsic.gj_erp.mapper.jhgk;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.pgd;
 
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 import java.util.List;

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdDh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdDh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdDmjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdDmjh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdPkjh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java

@@ -1,9 +1,8 @@
 package com.dsic.gj_erp.mapper.pgd;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.pgd.Qmqz;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdSljh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdSljh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.mapper.txzz;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.bean.jt.应付账款;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.mapper.txzz;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.bean.jt.盘点;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.mapper.txzz;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.bean.jt.退货;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.mapper.txzz;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.bean.jt.采购订单;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dsic/gj_erp/pc/DataFactory.java

@@ -19,7 +19,10 @@ import com.dsic.gj_erp.pc.dto.data.钢料需求;
 import com.dsic.gj_erp.pc.dto.gx.*;
 import com.dsic.gj_erp.pc.dto.sb.*;
 import com.dsic.gj_erp.pc.dto.tlt.*;
-import com.dsic.gj_erp.pc.dto.*;
+import com.dsic.gj_erp.pc.dto.套料图工序;
+import com.dsic.gj_erp.pc.dto.工序产能;
+import com.dsic.gj_erp.pc.dto.设备;
+import com.dsic.gj_erp.pc.dto.资源;
 import com.dsic.gj_erp.pc.service.工序CD接口;
 import com.dsic.gj_erp.pc.service.订货计划滚动信息接口;
 import com.dsic.gj_erp.pc.service.设备产能接口;

src/main/java/com/dsic/gj_erp/pc/Manager.java

@@ -3,7 +3,6 @@ package com.dsic.gj_erp.pc;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.pc.dto.data.Bom;
-import com.dsic.gj_erp.pc.dto.data.钢料需求;
 import com.dsic.gj_erp.pc.dto.资源;
 
 import java.util.ArrayList;

src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java

@@ -6,8 +6,6 @@ import com.dsic.gj_erp.pc.service.工序排产处理接口;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedDeque;

src/main/java/com/dsic/gj_erp/pc/dto/资源.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.dto;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.pc.Constant;
 import com.dsic.gj_erp.pc.dto.data.Bom;

src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.service;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.bean.ResultBean;
@@ -15,7 +14,6 @@ import com.dsic.gj_erp.pc.Manager;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
-import com.dsic.gj_erp.service.jhgk.impl.DmSygdMxLjServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.pc.service;
 
 import com.dsic.gj_erp.pc.工序CD;
-import com.dsic.gj_erp.pc.设备产能;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;

src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java

@@ -1,7 +1,5 @@
 package com.dsic.gj_erp.pc.service;
 
-import com.dsic.gj_erp.bean.jhgk.DmSygd;
-import com.dsic.gj_erp.pc.工序CD;
 import com.dsic.gj_erp.pc.订货计划;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;

src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java

@@ -8,7 +8,10 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 
 @Service
 @AllArgsConstructor

src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java

@@ -4,7 +4,6 @@ package com.dsic.gj_erp.service.jcsj;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 
 import java.util.List;
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dsic.gj_erp.bean.ResultBean;
@@ -18,14 +17,9 @@ import com.dsic.gj_erp.service.jcsj.*;
 import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import com.dsic.gj_erp.service.sy.SYService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.script.ScriptException;

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java

@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -12,7 +11,6 @@ import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java

@@ -1,29 +1,24 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository;
 import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
 import com.dsic.gj_erp.service.jcsj.EmGcrlService;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.time.Period;
-import java.time.Year;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.WeekFields;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java

@@ -1,10 +1,8 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 import com.dsic.gj_erp.dao.jcsj.EmSbjbbRepository;

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java

@@ -1,22 +1,12 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
-import com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper;
 import com.dsic.gj_erp.mapper.jcsj.EmSbjgryMapper;
-import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  *  服务实现类

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java

@@ -15,7 +15,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -26,7 +26,6 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jhgk.*;
 import com.dsic.gj_erp.util.MyString;
-import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -912,6 +911,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
         List<DmYdjhxf> list2=new ArrayList<>();
         //按批次合并为一行
         collect.forEach((key,val)->{
+            List<String> tzbhList=new ArrayList<>();
             Set<String> plSet=new HashSet<>();
             DmYdjhxf dmYdjhxf = new DmYdjhxf();
             dmYdjhxf.setDcCh(key.split("_")[0]);
@@ -927,6 +927,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             AtomicReference<Integer> skbs= new AtomicReference<>(0);
             AtomicReference<Integer> skbs2= new AtomicReference<>(0);
             val.forEach(item-> {
+                if (tzbhList.contains(item.getTzbh())){
+                    return;
+                }
+                tzbhList.add(item.getTzbh());
                 plSet.add(item.getDcFd());
                 if (slkw.contains(item.getKw())){
                     bs.updateAndGet(v -> v + 1);

src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.service.pgd;
 
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 
 /**

src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java

@@ -1,8 +1,7 @@
 package com.dsic.gj_erp.service.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdDh;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
+import com.dsic.gj_erp.bean.pgd.PgdDh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java

@@ -1,10 +1,8 @@
 package com.dsic.gj_erp.service.pgd;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdDmjh;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.dsic.gj_erp.bean.pgd.Qmqz;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java

@@ -1,9 +1,8 @@
 package com.dsic.gj_erp.service.pgd;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java

@@ -1,8 +1,7 @@
 package com.dsic.gj_erp.service.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdDh;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java

@@ -1,8 +1,7 @@
 package com.dsic.gj_erp.service.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java

@@ -1,9 +1,8 @@
 package com.dsic.gj_erp.service.pgd;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java

@@ -1,8 +1,7 @@
 package com.dsic.gj_erp.service.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdSljh;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
+import com.dsic.gj_erp.bean.pgd.PgdSljh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.service.pgd;
 
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java

@@ -1,17 +1,15 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.pgd.PgdDh;
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.mapper.pgd.PgdDhMapper;
 import com.dsic.gj_erp.service.pgd.PgdDhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java

@@ -1,15 +1,12 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdDmjh;
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.mapper.pgd.PgdDmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdDmjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.service.sy.SYService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java

@@ -1,14 +1,12 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
-import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.mapper.pgd.PgdPkjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdPkjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.service.sy.SYService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java

@@ -1,11 +1,10 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.pgd.PgdPwjh;
-import com.dsic.gj_erp.bean.pgd.PgdSljh;
 import com.dsic.gj_erp.mapper.pgd.PgdPwjhMapper;
 import com.dsic.gj_erp.service.pgd.PgdPwjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java

@@ -1,12 +1,10 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.pgd.PgdQgjh;
-import com.dsic.gj_erp.bean.pgd.PgdSljh;
 import com.dsic.gj_erp.mapper.pgd.PgdQgjhMapper;
 import com.dsic.gj_erp.service.pgd.PgdQgjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java

@@ -4,15 +4,13 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
 import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdQmjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.service.sy.SYService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java

@@ -2,14 +2,10 @@ package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
-import com.dsic.gj_erp.bean.pgd.PgdDh;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.pgd.PgdSljh;
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.mapper.pgd.PgdSljhMapper;
-import com.dsic.gj_erp.pc.Manager;
 import com.dsic.gj_erp.service.pgd.PgdSljhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -19,9 +15,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.dsic.gj_erp.pc.Manager.from;
-import static com.dsic.gj_erp.pc.Manager.to;
-
 /**
  * <p>
  *  服务实现类

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java

@@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.pgd.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
 import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
@@ -10,10 +11,7 @@ import com.dsic.gj_erp.mapper.pgd.PgdTzjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmBchxjbpService;
 import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
 import com.dsic.gj_erp.service.pgd.PgdTzjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/dsic/gj_erp/service/sy/SYService.java

@@ -6,29 +6,24 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsic.gj_erp.bean.sy.*;
 import com.dsic.gj_erp.dao.sy.*;
 import com.dsic.gj_erp.mapper.SyuserMapper;
-import com.dsic.gj_erp.util.MD5Util;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.PostConstruct;
 import javax.persistence.EntityManager;
-import javax.xml.bind.DatatypeConverter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.alibaba.excel.util.StringUtils.isEmpty;
-
 /**
  * 系统安全子系统处理逻辑
  */

src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java

@@ -9,8 +9,8 @@ import com.dsic.gj_erp.service.sy.SyDictItemService;
 import com.dsic.gj_erp.util.CacheConstant;
 import com.dsic.gj_erp.util.ConditionSelect;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java

@@ -7,9 +7,9 @@ import com.dsic.gj_erp.bean.sy.SyDict;
 import com.dsic.gj_erp.bean.tree.ProjectTreeVo;
 import com.dsic.gj_erp.mapper.SyDictMapper;
 import com.dsic.gj_erp.service.sy.SyDictService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

src/main/java/com/dsic/gj_erp/util/ExcelUtil.java

@@ -1,9 +1,6 @@
 package com.dsic.gj_erp.util;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -13,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;

src/main/java/com/dsic/gj_erp/util/FileUtil.java

@@ -10,7 +10,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class FileUtil {

src/main/java/com/dsic/gj_erp/util/IPUtils.java

@@ -1,15 +1,17 @@
     package com.dsic.gj_erp.util;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+    import org.apache.commons.lang3.StringUtils;
+    import org.slf4j.Logger;
+    import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.*;
-import java.util.Enumeration;
+    import javax.servlet.http.HttpServletRequest;
+    import java.io.BufferedReader;
+    import java.io.IOException;
+    import java.io.InputStreamReader;
+    import java.net.Inet4Address;
+    import java.net.InetAddress;
+    import java.net.NetworkInterface;
+    import java.util.Enumeration;
 
     /**
  * IP地址