Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/GjErpApplication.java

@@ -7,18 +7,14 @@ import com.jcraft.jsch.Session;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-import javax.annotation.PostConstruct;
 import javax.persistence.EntityManager;
 import java.util.Properties;
 

src/main/java/com/dsic/gj_erp/Test.java

@@ -1,24 +1,16 @@
 package com.dsic.gj_erp;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.springframework.boot.SpringApplication;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.Period;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class Test {
     public static void main(String[] args) throws IOException {
 
-        System.out.println(StrUtil.padPre("1",3,"0"));
+        System.out.println(DateUtil.thisYear());
+
+//        System.out.println(StrUtil.padPre("1",3,"0"));
         //String aaa="gagagag";
         //System.out.println(aaa.split("@")[0]);
 

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;
@@ -174,6 +172,8 @@ public class DmCzplpNew implements Serializable {
 
     private String xfqLqb1;
 
+    private int dataOrder;
+
     public static DmCzplpNew createByExcel(String dcCh, String fd, ZrcAndPlb item){
         DmCzplpNew plp = new DmCzplpNew();
         plp.setDcCh(dcCh);
@@ -193,6 +193,7 @@ public class DmCzplpNew implements Serializable {
         plp.setXfqDhqd(item.getDhqd());
         plp.setBcdq(item.getGldq());
         plp.setZt("0");
+        plp.setDataOrder(item.getDataOrder());
         return plp;
     }
 }

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

@@ -6,6 +6,7 @@ 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.jcsj.DmBom;
 import com.dsic.gj_erp.pc.Constant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * <p>
@@ -318,4 +318,51 @@ public class DmSygdMx implements Serializable {
         return mx;
     }
 
+    public void setBomData(DmBom bom){
+        this.lqlb=bom.getLqlb();
+        this.tzbh=bom.getTzbh();
+        this.wpgg=bom.getWpgg();
+        this.wpxh=bom.getWpcz();
+        try {
+            this.hxcd=bom.getHxcd().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.dmcd=bom.getDmcd().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.qgcd=bom.getQgcd().doubleValue();
+        }catch (Exception ignored){}
+        this.qbs=bom.getQbs();
+        try {
+            this.pklx=Double.valueOf(bom.getPklx());
+        }catch (Exception ignored){}
+        try {
+            this.pkcd=bom.getPkcd().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.ljsl=bom.getLjsl().doubleValue();
+        }catch (Exception ignored){}
+        this.zl=bom.getZl();
+        try {
+            this.xcms=bom.getXcshms().doubleValue();
+        }catch (Exception ignored){}
+        this.kw=bom.getKw();
+        this.dcFd=bom.getFd();
+        try {
+            this.bclqzl=bom.getBclqzl().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.bcshzl=bom.getBcshzl().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.bcylzl=bom.getBcylzl().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.bcljtlzl=bom.getBcljtlzl().doubleValue();
+        }catch (Exception ignored){}
+        try {
+            this.bcqpyld=bom.getBcqpyld().doubleValue();
+        }catch (Exception ignored){}
+        this.ylbhgg=bom.getYlbhgg();
+    }
 }

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;
@@ -53,6 +51,6 @@ public class DmXbjh implements Serializable {
     @ApiModelProperty(value = "船号")
     private String dcCh;
 
-
+    private int version;
 
 }

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/jhgk/excel/ZrcAndPlb.java

@@ -37,4 +37,6 @@ public class ZrcAndPlb {
 
     @ExcelProperty(value = "备注")
     public String bz;
+
+    public int dataOrder;
 }

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/ApiController.java

@@ -1,15 +1,11 @@
 package com.dsic.gj_erp.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.request.LoginBean;
-import com.dsic.gj_erp.bean.sy.User;
-import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.SyuserMapper;
 import com.dsic.gj_erp.service.ApiService;
 import com.dsic.gj_erp.service.sy.SYService;
-import com.dsic.gj_erp.util.IPUtils;
 import com.dsic.gj_erp.util.MD5Util;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
 import java.util.Map;
 
 @Api(tags = "系统级API")

src/main/java/com/dsic/gj_erp/controller/SYController.java

@@ -1,12 +1,9 @@
 package com.dsic.gj_erp.controller;
 
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jhgk.DmQfxq;
 import com.dsic.gj_erp.bean.sy.*;
 import com.dsic.gj_erp.service.sy.SYService;
 import io.swagger.annotations.Api;
@@ -14,7 +11,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java

@@ -6,7 +6,6 @@ import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.fd.DmXqdwcjcd;
 import com.dsic.gj_erp.service.fd.DmXqdwcjcdService;
-import io.swagger.annotations.Authorization;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java

@@ -24,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java

@@ -6,29 +6,19 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmBom;
-import com.dsic.gj_erp.bean.jcsj.DmTltpdf;
-import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
 import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
-import com.dsic.gj_erp.service.jcsj.DmTltpdfService;
 import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
 import com.dsic.gj_erp.service.sy.SYService;
-import com.dsic.gj_erp.util.FileUtil;
 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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java

@@ -7,11 +7,9 @@ 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.DmBzry;
-import com.dsic.gj_erp.bean.jcsj.DmBzzz;
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
 import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.service.jcsj.DmBzryService;
-import com.dsic.gj_erp.service.jcsj.DmBzzzService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.service.jcsj.EmGcrlService;
-import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java

@@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
-import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
-import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
-import com.dsic.gj_erp.service.jcsj.EmSbwxjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java

@@ -5,7 +5,6 @@ import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
-import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
 import com.dsic.gj_erp.service.jcsj.EmSbjbbService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 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/controller/jcsj/EmSbjgryController.java

@@ -1,16 +1,11 @@
 package com.dsic.gj_erp.controller.jcsj;
 
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-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.EmSbcnp;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
-import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbwxjhController.java

@@ -3,15 +3,11 @@ package com.dsic.gj_erp.controller.jcsj;
 
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
-import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
-import com.dsic.gj_erp.service.jcsj.EmSbjbbService;
 import com.dsic.gj_erp.service.jcsj.EmSbwxjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.aspectj.lang.annotation.Around;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
 import com.dsic.gj_erp.service.jhgk.DmDhqdpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import com.dsic.gj_erp.service.jhgk.DmJtsyjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -2,24 +2,19 @@ package com.dsic.gj_erp.controller.jhgk;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
-import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 import com.dsic.gj_erp.bean.jhgk.DmQfxq;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel1;
-import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.listeners.ExcelGdxq1Listener;
 import com.dsic.gj_erp.listeners.ExcelGdxqListener;
-import com.dsic.gj_erp.listeners.ExcelQFListener;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,7 +100,8 @@ public class DmQfxqController {
                 list2.add(qfxq);
             }
         }
-        service.generateYdjh(list2);
+        //下面代码注释是因为不再根据前方需求导入时生成作业计划,改为月度计划审批时生成
+//        service.generateYdjh(list2);
 
         return new ResultBean(list2);
     }

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

@@ -1,26 +1,17 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.EmGcrl;
+import com.dsic.gj_erp.bean.jhgk.DmSygd;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
-import com.dsic.gj_erp.bean.jhgk.*;
-import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
 import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
 import com.dsic.gj_erp.exception.CustomException;
-import com.dsic.gj_erp.listeners.ExcelQFListener;
 import com.dsic.gj_erp.listeners.ExcelSYListener;
-import com.dsic.gj_erp.service.jcsj.EmGcrlService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
-import com.dsic.gj_erp.service.sy.SYService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,7 +20,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -47,28 +37,12 @@ public class DmSygdController {
     DmSygdService service;
     @Resource
     DmSygdMxService mxService;
-    @Autowired
+
-    private EmGcrlService gcrlService;
     @RequestMapping("/getList")
     @AuthFunction
     public ResultBean getList(@RequestBody DmSygd sygd){
-//        List<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
+        List<DmYdjhxf> list= mxService.tqSygd2(sygd.getBeginTime(),sygd.getEndTime(),sygd.getGdZt());
-//                                .eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt())
+        return new ResultBean(list);
-//                .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime())
-//                .le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime())
-//                .orderByAsc("sl_sj,dc_ch,dc_pl")
-//        );
-        List<DmYdjhxf> list= mxService.tqSygd1(sygd.getBeginTime(),sygd.getEndTime());
-        Map map=new HashMap();
-//        if (list.size()>0){
-//            String beginTime=list.get(0).getGjjsXz();
-//            String endTime=list.get(list.size()-1).getGjjsXz();
-//            List<EmGcrl> emGcrls= gcrlService.list(new QueryWrapper<EmGcrl>().select("gl").between("gl",beginTime,endTime).eq("xxr","0"));
-//            List<String> gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList());
-//            map.put("gcrl",gcrl);
-//        }
-        map.put("list",list);
-        return new ResultBean(map);
     }
 
     @PostMapping("/upload")
@@ -91,15 +65,15 @@ public class DmSygdController {
     @PostMapping("/tj")
     @AuthFunction
     @ResponseBody
-    public ResultBean tj(@RequestBody List<DmSygd> list){
+    public ResultBean tj(String from,String to){
-        service.tj(list);
+        mxService.tj(from,to);
         return new ResultBean();
     }
 
     @ApiOperation(value = "批量审核")
     @PostMapping(value = "/sh")
-    public ResultBean sh(@RequestBody List<DmSygd> dmSygds) {
+    public ResultBean sh(String from,String to) {
-        service.sh(dmSygds);
+        mxService.sh(from,to);
         return new ResultBean();
     }
 

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/DmSygdxqController.java

@@ -3,14 +3,11 @@ package com.dsic.gj_erp.controller.jhgk;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jhgk.DmQfxq;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel1;
@@ -22,11 +19,10 @@ import com.dsic.gj_erp.service.jhgk.DmSygdxqService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.spring.web.json.Json;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
 
 /**
  * <p>
@@ -52,7 +48,8 @@ public class DmSygdxqController {
                         .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
                 .ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("beginTime"))))
                 .le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", DateUtil.endOfMonth(DateUtil.parseDate(map.get("endTime"))))
-                .orderByAsc("dc_ch, cast(dc_pl as int),xzglxq"));
+//                .orderByAsc("dc_ch, cast(dc_pl as int),xzglxq"));
+                .orderByAsc("dc_ch, dc_pl,xzglxq"));
         return new ResultBean(list);
     }
 

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

@@ -4,10 +4,7 @@ package com.dsic.gj_erp.controller.jhgk;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
 import com.dsic.gj_erp.bean.jhgk.DmTzjh;
-import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
-import com.dsic.gj_erp.service.jcsj.EmSbwxjhService;
 import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

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

@@ -1,11 +1,12 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jhgk.DmTzjh;
 import com.dsic.gj_erp.bean.jhgk.DmXbjh;
-import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import com.dsic.gj_erp.service.jhgk.DmXbjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -46,6 +50,16 @@ public class DmXbjhController {
         return new ResultBean(dmXbjhs);
     }
 
+    @GetMapping("getVersion")
+    public ResultBean<?> getVersion(String nf){
+        return new ResultBean<>(dmXbjhService.getVersion(nf));
+    }
+
+    @GetMapping("getByVersion")
+    public ResultBean<?> getByVersion(String nf,String version){
+        return new ResultBean<>(dmXbjhService.getByVersion(nf,version));
+    }
+
     @ApiOperation(value = "批量保存")
     @PostMapping(value = "/save")
     public ResultBean save(@RequestBody JSONObject dmXbjhs) {
@@ -59,5 +73,6 @@ public class DmXbjhController {
         dmXbjhService.tj(dmXbjhs);
         return new ResultBean();
     }
+
 }
 

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

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.controller.jhgk;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,12 +14,9 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
-import com.dsic.gj_erp.service.jcsj.DmCzplpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.service.kc.ImCkwpkwpService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.sis.internal.jaxb.metadata.EX_Extent;
-import org.mapstruct.factory.Mappers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +27,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>

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

@@ -4,10 +4,7 @@ package com.dsic.gj_erp.controller.jhgk;
 import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jhgk.DmTzjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
-import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import com.dsic.gj_erp.service.jhgk.DmZrcjhService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java

@@ -11,7 +11,10 @@ import com.dsic.gj_erp.pc.service.设备产能接口;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.stream.Collectors;
 
@@ -49,7 +52,7 @@ public class 三月滚动排产控制器 {
         } catch (RuntimeException e) {
             e.printStackTrace();
             ResultBean<?> resultBean = new ResultBean<>();
-            resultBean.setStatus(10000);
+            resultBean.setStatus(10001);
             resultBean.setSuccess(false);
             resultBean.setMessage(e.getMessage());
             return resultBean;
@@ -69,17 +72,18 @@ public class 三月滚动排产控制器 {
 
         HashMap<Object, Object> map = new HashMap<>();
         if (from.equals(Manager.from)&&to.equals(Manager.to)){
-            semaphore.release();
             map.put("zy",Manager.资源池);
+            semaphore.release();
             return new ResultBean<>(map);
         }
 
         try {
             排产.execute(from,to);
+            map.put("zy",Manager.资源池);
         }finally {
             semaphore.release();
         }
-        map.put("zy",Manager.资源池);
+
         return new ResultBean<>(map);
     }
 

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();
@@ -59,6 +61,9 @@ public class 中日程批量表合并导入控制器 {
         String bzr = (String) req.getAttribute("yhms");
         String day=DateUtil.date().toString("yyyy/MM/dd");
         for(ZrcAndPlb item:objList){
+            if (item.getMfd()==null){
+                continue;
+            }
             String[] fds = item.getMfd().split("/");
             List<DmCzplpNew> fdList = czplpNewService.list(new QueryWrapper<DmCzplpNew>().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh));
             boolean remove = czplpNewService.remove(new QueryWrapper<DmCzplpNew>().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh));
@@ -75,15 +80,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);
@@ -111,7 +117,7 @@ public class 中日程批量表合并导入控制器 {
                 }
             }
         }
-        zrcjhService.saveBatch(zrcjhList,500);
+        zrcjhService.saveOrUpdateBatch(zrcjhList,500);
 
         if (!plList.isEmpty()) {
             czplpNewService.saveBatch(plList,500);
@@ -139,7 +145,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/controller/kban/KbanController.java

@@ -3,12 +3,8 @@ package com.dsic.gj_erp.controller.kban;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmBzry;
-import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.service.jcsj.DmBzryService;
-import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
-import com.google.common.collect.ImmutableMap;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/dsic/gj_erp/controller/pbsc/MpYlxxpController.java

@@ -6,11 +6,9 @@ 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.DmBchxylp;
-import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.jcsj.DmBchxylpMapper;
-import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
 import com.dsic.gj_erp.service.pgsc.MpYlxxpService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/pbsc/PbPwjhController.java

@@ -1,20 +1,11 @@
 package com.dsic.gj_erp.controller.pbsc;
 
 
-import cn.hutool.core.util.StrUtil;
-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.pgd.PgdPwjh;
-import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.pgd.PgdPwjhService;
 import com.dsic.gj_erp.service.pgsc.impl.PbscServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java

@@ -2,12 +2,9 @@ package com.dsic.gj_erp.controller.pgd;
 
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.DmPpxxb;
 import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
@@ -17,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java

@@ -6,7 +6,6 @@ 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.pgd.PgdDh;
-import com.dsic.gj_erp.bean.pgd.PgdDh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.pgd.PgdDhService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java

@@ -6,8 +6,6 @@ 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.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.PgdDmjh;
-import com.dsic.gj_erp.bean.pgd.PgdDmjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdDmjhService;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java

@@ -6,8 +6,6 @@ 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.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
-import com.dsic.gj_erp.bean.pgd.PgdPkjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdPkjhService;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java

@@ -6,7 +6,6 @@ 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.pgd.PgdPwjh;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.pgd.PgdPwjhService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java

@@ -6,7 +6,6 @@ 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.pgd.PgdQgjh;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.pgd.PgdQgjhService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java

@@ -1,15 +1,11 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 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.jhgk.DmYdjhLj;
-import com.dsic.gj_erp.bean.pgd.PgdQgjh;
-import com.dsic.gj_erp.bean.pgd.PgdQmjh;
-import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -9,21 +9,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.fd.DmCzjbb;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
 import com.dsic.gj_erp.bean.kc.SlKc;
-import com.dsic.gj_erp.bean.pgd.PgdPwjh;
 import com.dsic.gj_erp.bean.pgd.PgdSljh;
-import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
 import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.exception.ServiceException;
 import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper;
-import com.dsic.gj_erp.service.fd.DmCzjbbService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.service.kc.ImCkwpkwpService;

src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java

@@ -1,20 +1,22 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.*;
+import com.dsic.gj_erp.bean.jcsj.DmBzry;
-import com.dsic.gj_erp.bean.jhgk.DmTzjh;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
+import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
 import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.exception.CustomException;
-import com.dsic.gj_erp.service.jcsj.*;
+import com.dsic.gj_erp.service.jcsj.DmBzryService;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
+import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
 import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
 import com.dsic.gj_erp.service.pgd.PgdTzjhService;
 import com.dsic.gj_erp.service.sy.SYService;
@@ -23,8 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/controller/sy/SyDictItemController.java

@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.SyDictItem;
 import com.dsic.gj_erp.service.sy.SyDictItemService;
-
 import com.dsic.gj_erp.util.CacheConstant;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java

@@ -6,16 +6,12 @@ import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.SyUserLog;
 import com.dsic.gj_erp.util.IPUtils;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
 
 @RestController
 @RequestMapping("userLog")

src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java

@@ -2,14 +2,12 @@ package com.dsic.gj_erp.controller.txzz.jhgl;
 
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsic.gj_erp.bean.txzz.DmMateria;
 import com.dsic.gj_erp.annotation.Authorization;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.SyDictItem;
-import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.bean.txzz.DmMateria;
 import com.dsic.gj_erp.service.sy.SyDictItemService;
 import com.dsic.gj_erp.service.txzz.DmMateriaService;
 import io.swagger.annotations.Api;
@@ -17,10 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java

@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.controller.txzz.jhgl;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.Authorization;
@@ -16,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/dsic/gj_erp/controller/txzz/供应商管理Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.供应商管理;
 import com.dsic.gj_erp.service.txzz.I供应商管理Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/入库Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.service.txzz.I入库Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/出库Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.出库;
 import com.dsic.gj_erp.service.txzz.I出库Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/发票管理Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.发票管理;
 import com.dsic.gj_erp.service.txzz.I发票管理Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/应付账款Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.应付账款;
 import com.dsic.gj_erp.service.txzz.I应付账款Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/应收账款Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.应收账款;
 import com.dsic.gj_erp.service.txzz.I应收账款Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/盘点Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.盘点;
 import com.dsic.gj_erp.service.txzz.I盘点Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/退货Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.退货;
 import com.dsic.gj_erp.service.txzz.I退货Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/txzz/采购订单Controller.java

@@ -1,20 +1,13 @@
 package com.dsic.gj_erp.controller.txzz;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jt.采购订单;
 import com.dsic.gj_erp.service.txzz.I采购订单Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.PutMapping;
+import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 【请填写功能名称】Controller

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -294,6 +294,15 @@ public class ZyjhController {
         return new ResultBean<>();
     }
 
+    /**
+     * 报工数据查看控制器
+     * 可根据配置情况控制是否根据上道序报工后下道序才可查看到作业计划数据
+     */
+    @PostMapping("bgControl")
+    public ResultBean<?> bgControl(String gx){
+        return new ResultBean<>(zyjhService.cacheable(gx));
+    }
+
     @PostMapping("test")
     public ResultBean<?> test(@RequestBody Message msg){
         wsHandler.tip(msg.toJson());

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/datasync/Config.java

@@ -2,8 +2,6 @@ package com.dsic.gj_erp.datasync;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/dsic/gj_erp/datasync/DataHandler.java

@@ -7,7 +7,6 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
 
 import java.util.Map;
 

src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java

@@ -8,15 +8,18 @@ import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Getter
 public class ExcelZrcAndPlb extends AnalysisEventListener<ZrcAndPlb> {
 
     private List<ZrcAndPlb> list;
+    private final AtomicInteger dataOrder=new AtomicInteger(0);
 
     @Override
     public void invoke(ZrcAndPlb zrcAndPlb, AnalysisContext analysisContext) {
         zrcAndPlb.setDcPl(StrUtil.padPre(zrcAndPlb.getDcPl(),3,"0"));
+        zrcAndPlb.setDataOrder(dataOrder.getAndIncrement());
         list.add(zrcAndPlb);
     }
 

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;