diff --git a/src/main/java/com/dsic/gj_erp/GjErpApplication.java b/src/main/java/com/dsic/gj_erp/GjErpApplication.java
index ec6c1b8..9da305f 100644
--- a/src/main/java/com/dsic/gj_erp/GjErpApplication.java
+++ b/src/main/java/com/dsic/gj_erp/GjErpApplication.java
@@ -10,10 +10,8 @@ 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.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import javax.persistence.EntityManager;
diff --git a/src/main/java/com/dsic/gj_erp/Test.java b/src/main/java/com/dsic/gj_erp/Test.java
index cebc834..b27af88 100644
--- a/src/main/java/com/dsic/gj_erp/Test.java
+++ b/src/main/java/com/dsic/gj_erp/Test.java
@@ -6,25 +6,19 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.PDFTextStripperByArea;
 
-import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Test {
     public static void main(String[] args) throws IOException {
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
index 7022714..93bd591 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
@@ -148,6 +148,20 @@ public class YdjhImportNew {
 
     private String bzrq;
 
+    private String shry;
+
+    private String shrq;
+
+    public void updateToBz(String bzr,String bzrq){
+        this.bzr=bzr;
+        this.bzrq=bzrq;
+    }
+
+    public void updateToSh(String shr,String shrq){
+        this.shry =shr;
+        this.shrq=shrq;
+    }
+
     public void tj(){
         this.zt=ZtEnum.TJ.ordinal()+"";
     }
diff --git a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
index 7afb13d..5ac062e 100644
--- a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
+++ b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
@@ -3,7 +3,6 @@ package com.dsic.gj_erp.config;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/com/dsic/gj_erp/config/JapConfig.java b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
index 9ade5b0..0624541 100644
--- a/src/main/java/com/dsic/gj_erp/config/JapConfig.java
+++ b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
@@ -11,8 +11,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
index f715a66..febe204 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
@@ -12,7 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
index fbb8ee5..be30e52 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
@@ -12,7 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
index 0052d7b..063cd19 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
@@ -1,13 +1,10 @@
 package com.dsic.gj_erp.controller.jcsj;
 
 import cn.hutool.core.date.DateUtil;
-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.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.sy.Dm_zhbmp;
 import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
 import com.dsic.gj_erp.exception.CustomException;
@@ -16,17 +13,13 @@ 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 lombok.extern.slf4j.Slf4j;
-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.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
index 454940b..f11cdc5 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
@@ -7,7 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.jcsj.*;
+import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
+import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
 import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
@@ -31,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
index d43efcb..80a01dc 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
@@ -17,9 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
index dd21fb3..d6d060b 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
@@ -1,17 +1,13 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-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.DmCzplpNew;
 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.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
@@ -28,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/YdjhImportNewController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/YdjhImportNewController.java
index ae6f61e..cbe75bb 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/YdjhImportNewController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/YdjhImportNewController.java
@@ -8,7 +8,6 @@ import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
 import com.dsic.gj_erp.listeners.ExcelYdjhImportNewListener;
 import com.dsic.gj_erp.service.jhgk.impl.YdjhImportNewService;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -28,8 +27,8 @@ public class YdjhImportNewController {
     private final YdjhImportNewService ydjhImportNewService;
 
     @GetMapping("listByFileName")
-    public ResultBean<?> listByFileName(String fileName) {
-        return new ResultBean<>(ydjhImportNewService.listByFileName(fileName));
+    public ResultBean<?> listByFileName(String fileName,String zt) {
+        return new ResultBean<>(ydjhImportNewService.listByFileName(fileName,zt));
     }
 
     @RequestMapping("/getFileNameList")
@@ -58,8 +57,10 @@ public class YdjhImportNewController {
     }
 
     @GetMapping("/sh")
-    public ResultBean<?> sh(String fileName) {
-        ydjhImportNewService.sh(fileName);
+    @AuthFunction
+    public ResultBean<?> sh(String fileName,HttpServletRequest request) {
+        String yhms = (String) request.getAttribute("yhms");
+        ydjhImportNewService.sh(fileName,yhms);
         return new ResultBean<>();
     }
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
index bfb8758..d02354c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
@@ -1,20 +1,10 @@
 package com.dsic.gj_erp.controller.kban;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+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.bean.ResultBean;
@@ -27,13 +17,16 @@ import com.dsic.gj_erp.service.jcsj.DmBzryService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.sy.impl.SyMsgService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
+import java.io.File;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 各作业区划分规则
diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
index a326b75..e18bff6 100644
--- a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
@@ -2,10 +2,8 @@ package com.dsic.gj_erp.controller.pgd;
 
 
 import cn.hutool.core.date.DateUtil;
-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.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.zyjh.DmYppyz;
 import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
index af0f4fb..048c84c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
@@ -21,7 +21,6 @@ import com.dsic.gj_erp.controller.zyjh.dto.PwExportExcel;
 import com.dsic.gj_erp.controller.zyjh.dto.PwpgDto;
 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.jcsj.DmCbxxpService;
@@ -42,8 +41,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
index 0494d8c..81fa753 100644
--- a/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
+++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
-import com.dsic.gj_erp.util.ObjConvertUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelYdjhImportNewListener.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelYdjhImportNewListener.java
index fdc02e8..0c211cd 100644
--- a/src/main/java/com/dsic/gj_erp/listeners/ExcelYdjhImportNewListener.java
+++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelYdjhImportNewListener.java
@@ -3,12 +3,10 @@ package com.dsic.gj_erp.listeners;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
-import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
 import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Excel通用监听器
diff --git a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
index cdf5761..ab26736 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
@@ -1,13 +1,12 @@
 package com.dsic.gj_erp.mapper;
 
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import org.apache.ibatis.annotations.Mapper;
+
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-
 @Mapper
 public interface KbanMapper {
 
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java
index 4f3f3ee..02b0b9a 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java
@@ -24,5 +24,5 @@ public interface DmBomMapper extends BaseMapper<DmBom> {
 
     int insertFile(@Param("filepath")String filepath,@Param("yhdm") String yhdm);
 
-    List<DmBom> getBomUni(String dcCh,String dcPl);
+    List<DmBom> getBomUni(String dcCh,String dcPl,String kw);
 }
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportNewMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportNewMapper.java
index b169def..c99a72f 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportNewMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportNewMapper.java
@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.mapper.jhgk;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsic.gj_erp.bean.jhgk.YdjhImport;
 import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
index b808d67..76666dc 100644
--- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
+++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
@@ -5,9 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 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.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
 import com.dsic.gj_erp.bean.jhgk.DmSygd;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;
diff --git a/src/main/java/com/dsic/gj_erp/service/KbanService.java b/src/main/java/com/dsic/gj_erp/service/KbanService.java
index 0ab7476..7b0e759 100644
--- a/src/main/java/com/dsic/gj_erp/service/KbanService.java
+++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java
@@ -1,23 +1,20 @@
 package com.dsic.gj_erp.service;
 
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.xiaochi.Device;
+import com.dsic.gj_erp.mapper.KbanMapper;
 import com.dsic.gj_erp.mapper.xiaochi.DeviceMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-import com.dsic.gj_erp.mapper.KbanMapper;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import lombok.AllArgsConstructor;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java
index 4e1e2f4..3fe3443 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java
@@ -26,5 +26,5 @@ public interface DmBomService extends IService<DmBom> {
 
     void copyListBom(HttpServletRequest req, Map map);
 
-    List<DmBom> getBomUni(String dcCh,String dcPl);
+    List<DmBom> getBomUni(String dcCh,String dcPl,String kw);
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index 6cbf878..4df4bff 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.*;
 import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
-import com.dsic.gj_erp.bean.jhgk.DmTzjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java
index 7293c08..c1158a1 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -125,7 +124,7 @@ public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements
     }
 
     @Override
-    public List<DmBom> getBomUni(String dcCh, String dcPl) {
-        return baseMapper.getBomUni(dcCh,dcPl);
+    public List<DmBom> getBomUni(String dcCh, String dcPl,String kw) {
+        return baseMapper.getBomUni(dcCh,dcPl,kw);
     }
 }
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
index 7e6ef30..f04f772 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
@@ -7,7 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
index 8330132..e5a8a8b 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
 import com.dsic.gj_erp.mapper.jhgk.DmDhqdpMapper;
 import com.dsic.gj_erp.service.jhgk.DmDhqdpService;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
index c006024..f39a808 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
@@ -1,18 +1,11 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmSygd;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper;
-import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
-import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +14,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
index c218d8f..bb9a9c9 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
@@ -16,7 +16,6 @@ import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
 import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
-import com.dsic.gj_erp.exception.ServiceException;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
index b1cc736..b6e9f32 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
@@ -15,7 +15,6 @@ import com.dsic.gj_erp.bean.pgd.*;
 import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
-import com.dsic.gj_erp.service.jiuzhou.SljhService;
 import com.dsic.gj_erp.service.pgd.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
index f931a79..4f61666 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
@@ -1,21 +1,19 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
-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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmBom;
-import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
-import com.dsic.gj_erp.bean.jhgk.*;
-import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
+import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
+import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
-import com.dsic.gj_erp.mapper.jhgk.YdjhImportMapper;
 import com.dsic.gj_erp.mapper.jhgk.YdjhImportNewMapper;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
@@ -25,10 +23,14 @@ import com.dsic.gj_erp.service.pgd.PgdTzjhService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -48,100 +50,143 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
     private static final String GJSCGK_SYGDMX_KEY = "GJSCGK::SYGDMX::";
     private static final String GJSCGK_TZJH_KEY = "GJSCGK::TZJH::";
+    private static final String GJSCGK_BOM_COUNT_KEY="GJSCGK::BOM::COUNT::";
 
     public List<String> getFileNameList() {
         return baseMapper.getFileNameList();
     }
 
-    public List<YdjhImportNew> listByFileName(String fileName) {
+    public List<YdjhImportNew> listByFileName(String fileName,String zt) {
         List<YdjhImportNew> list = this.list(Wrappers.<YdjhImportNew>lambdaQuery()
                 .eq(StrUtil.isNotEmpty(fileName), YdjhImportNew::get文件名, fileName)
+                        .eq(StrUtil.isNotEmpty(zt),YdjhImportNew::getZt,zt)
                 .orderByAsc(YdjhImportNew::getId)
         );
         list.stream().filter(item->StrUtil.isNotEmpty(item.getDcPl()))
                 .forEach(item->{
-                    List<DmBom> bomList = bomService.getBomUni(item.getDcCh(),item.getDcPl());
-                    if (ObjUtil.isNotEmpty(bomList)){
-                        item.set板数(bomList.size()+"");
-                        Map<String, List<DmBom>> collect = bomList.stream().collect(Collectors.groupingBy(DmBom::getKw));
-                        //一垮龙门和一垮数控
-                        if (item.get切割完成1() != null) {
-                            Optional.ofNullable(collect.get("7")).ifPresent(bom -> {
-                                item.set一垮龙门板数(bom.size()+"");
-                            });
+                    String dcPl = item.getDcPl();
 
-                            Optional.ofNullable(collect.get("8")).ifPresent(bom -> {
-                                item.set一垮数控板数(bom.size()+"");
-                            });
-                        }
+                    try {
+                        dcPl = String.format("%03d", Integer.parseInt(dcPl));
+                        item.setDcPl(dcPl);
+                    } catch (Exception ignored) {
+                    }
 
-                        if (item.get切割完成2() != null) {
-                            Optional.ofNullable(collect.get("5")).ifPresent(bom -> {
-                                item.set二跨面板板数(bom.size()+"");
-                            });
-                        }
+                    AtomicInteger 板数 = new AtomicInteger(0);
+                    //一垮龙门和一垮数控
+                    if (item.get切割完成1() != null) {
+                        this.getBomSize(item, "7",(size)->{
+                            item.set二跨面板板数(size+"");
+                            板数.addAndGet(size);
+                        });
 
-                        if (item.get切割完成3() != null) {
-                            AtomicInteger atomicInteger = new AtomicInteger(0);
-                            Optional.ofNullable(collect.get("9")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
+                        this.getBomSize(item, "8",(size)->{
+                            item.set二跨面板板数(size+"");
+                            板数.addAndGet(size);
+                        });
+                    }
 
-                            Optional.ofNullable(collect.get("10")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
+                    if (item.get切割完成2() != null) {
+                        this.getBomSize(item, "5",(size)->{
+                            item.set二跨面板板数(size+"");
+                            板数.addAndGet(size);
+                        });
+                    }
 
-                            Optional.ofNullable(collect.get("12")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
-                            item.set二跨数控板数(atomicInteger.toString());
-                        }
+                    if (item.get切割完成3() != null) {
+                        AtomicInteger atomicInteger = new AtomicInteger(0);
 
-                        if (item.get切割完成4() != null) {
-                            AtomicInteger atomicInteger = new AtomicInteger(0);
-                            Optional.ofNullable(collect.get("6")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
+                        this.getBomSize(item, "9",(size)->{
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
 
-                            Optional.ofNullable(collect.get("14")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
-                            item.set三跨平铁板数(atomicInteger.toString());
-                        }
+                        this.getBomSize(item, "10",(size)->{
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
 
-                        if (item.get切割完成5() != null) {
-                            Optional.ofNullable(collect.get("13")).ifPresent(bom -> {
-                                item.set三跨数控板数(bom.size()+"");
-                            });
-                        }
+                        this.getBomSize(item, "12",(size)->{
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
 
-                        if (item.get切割完成6() != null) {
-                            Optional.ofNullable(collect.get("11")).ifPresent(bom -> {
-                                item.set四区腹板板数(bom.size()+"");
-                            });
-                        }
+                        item.set二跨数控板数(atomicInteger.toString());
+                    }
 
-                        if (item.get切割完成7() != null) {
-                            AtomicInteger atomicInteger = new AtomicInteger(0);
-                            Optional.ofNullable(collect.get("15")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
+                    if (item.get切割完成4() != null) {
+                        this.getBomSize(item, "6",(size)->{
+                            item.set三跨平铁板数(size.toString());
+                            板数.addAndGet(size);
+                        });
 
-                            Optional.ofNullable(collect.get("16")).ifPresent(bom -> {
-                                atomicInteger.addAndGet(bom.size());
-                            });
-                            item.set四区数控板数(atomicInteger.toString());
-                        }
                     }
+
+                    if(item.get曲平铁曲完成()!=null){
+                        this.getBomSize(item, "13", 板数::addAndGet);
+                    }
+
+                    if (item.get切割完成5() != null) {
+                        this.getBomSize(item, "14",(size)->{
+                            item.set三跨数控板数(size+"");
+                            板数.addAndGet(size);
+                        });
+                    }
+
+                    if (item.get切割完成6() != null) {
+                        this.getBomSize(item, "11",(size)->{
+                            item.set四区腹板板数(size+"");
+                            板数.addAndGet(size);
+                        });
+                    }
+
+                    if (item.get切割完成7() != null) {
+                        AtomicInteger atomicInteger = new AtomicInteger(0);
+
+                        this.getBomSize(item, "15",(size)->{
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
+
+                        this.getBomSize(item, "16",(size)->{
+                            atomicInteger.addAndGet(size);
+                            板数.addAndGet(size);
+                        });
+                        item.set四区数控板数(atomicInteger.toString());
+                    }
+
+                    if(item.get光电完成()!=null){
+                        this.getBomSize(item, "17", 板数::addAndGet);
+                    }
+
+                    item.set板数(板数.toString());
                 });
         return list;
     }
 
-    public void sh(String fileName) {
+    private void getBomSize(YdjhImportNew item, String kw, Consumer<Integer> handler){
+        Integer o = (Integer) redisTemplate.opsForHash().get(GJSCGK_BOM_COUNT_KEY + item.getDcCh(), item.getDcPl() + "_"+kw);
+//        if (o==null||o==0){
+//            List<DmBom> bomUni = bomService.getBomUni(item.getDcCh(), item.getDcPl(), kw);
+//            if (bomUni!=null){
+//                o=bomUni.size();
+//                redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY + item.getDcCh(), item.getDcPl() + "_"+kw,o);
+//            }
+//        }
+        Optional.ofNullable(o).ifPresent(handler);
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void sh(String fileName,String shr) {
         LambdaQueryWrapper<YdjhImportNew> wrapper = Wrappers.<YdjhImportNew>lambdaQuery()
                 .eq(YdjhImportNew::get文件名, fileName)
                 .eq(YdjhImportNew::getZt, YdjhImportNew.ZtEnum.TJ.ordinal());
-        List<YdjhImportNew> list = this.updateData(wrapper, YdjhImportNew::sh);
+        String shrq=DateUtil.date().toString("yyyy/MM/dd");
+        List<YdjhImportNew> list = this.updateData(wrapper, (item)->{
+            item.updateToSh(shr,shrq);
+            item.sh();
+        });
         if (ObjUtil.isEmpty(list)){
             return;
         }
@@ -154,9 +199,14 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         dcPl = String.format("%03d", Integer.parseInt(dcPl));
                     } catch (Exception ignored) {
                     }
-                    List<DmYdjh> ydjhList = dmYdjhService.list(Wrappers.<DmYdjh>lambdaQuery().eq(DmYdjh::getDcCh, dcPl));
+                    List<DmYdjh> ydjhList = dmYdjhService.list(Wrappers.<DmYdjh>lambdaQuery()
+                            .eq(DmYdjh::getDcCh, item.getDcCh())
+                            .eq(DmYdjh::getDcPl, dcPl)
+                    );
                     if (ObjUtil.isNotEmpty(ydjhList)){
-                        Map<String, List<DmYdjh>> collect = ydjhList.stream().collect(Collectors.groupingBy(DmYdjh::getKw));
+                        Map<String, List<DmYdjh>> collect = ydjhList.stream()
+                                .filter(ydjh->StrUtil.isNotEmpty(ydjh.getKw()))
+                                .collect(Collectors.groupingBy(DmYdjh::getKw));
                         //一垮龙门和一垮数控
                         if (item.get切割完成1() != null) {
                             Optional.ofNullable(collect.get("7")).ifPresent(ydjhs -> {
@@ -221,9 +271,12 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 });
                             });
 
-                            Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> {
+                        }
+
+                        if(item.get曲平铁曲完成()!=null){
+                            Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> {
                                 ydjhs.forEach(ydjh->{
-                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成4());
+                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get曲平铁曲完成());
                                     dmYdjh.setId(ydjh.getId());
                                     updateList.add(dmYdjh);
                                 });
@@ -231,7 +284,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         }
 
                         if (item.get切割完成5() != null) {
-                            Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> {
+                            Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> {
                                 ydjhs.forEach(ydjh->{
                                     DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成5());
                                     dmYdjh.setId(ydjh.getId());
@@ -268,6 +321,16 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                                 });
                             });
                         }
+
+                        if(item.get光电完成()!=null){
+                            Optional.ofNullable(collect.get("17")).ifPresent(ydjhs -> {
+                                ydjhs.forEach(ydjh->{
+                                    DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get光电完成());
+                                    dmYdjh.setId(ydjh.getId());
+                                    updateList.add(dmYdjh);
+                                });
+                            });
+                        }
                     }
                 });
 
@@ -294,7 +357,9 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
         if (ObjUtil.isEmpty(list)){
             return;
         }
-        list.forEach(item -> {
+        list.stream()
+        .filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
+        .forEach(item -> {
             String dcPl = item.getDcPl();
 
             try {
@@ -316,7 +381,9 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
             return;
         }
         transactionTemplate.execute((status)->{
-            list.stream().filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
+            list.stream()
+                    .filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
+                    .filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
                     .forEach(item->{
                         sygdMxService.remove(new QueryWrapper<DmSygdMx>()
                                 .eq("dc_ch", item.getDcCh())
@@ -342,6 +409,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
     private List<YdjhImportNew> updateData(LambdaQueryWrapper<YdjhImportNew> wrapper, Consumer<YdjhImportNew> handler) {
         List<YdjhImportNew> list = this.list(wrapper);
+
         list.forEach(item -> {
             YdjhImportNew ydjhImportNew = new YdjhImportNew();
             ydjhImportNew.setId(item.getId());
@@ -353,16 +421,21 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
     }
 
     public void handler(List<YdjhImportNew> list, String fileName, HttpServletRequest request) {
+
+        String yhms = (String) request.getAttribute("yhms");
         //三月滚动明细
         this.createSygdmx(list, fileName);
 
         //没有基础数据的计划生成图纸计划
-        this.createTzjh(list, fileName, request);
+        this.createTzjh(list, fileName, yhms);
 
+        String date = DateUtil.date().toString("yyyy/MM/dd");
         transactionTemplate.execute((status) -> {
-            list.stream().filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(), item.getDcPl()))
+            list.stream()
+                    .filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(), item.getDcPl()))
                     .forEach(item -> {
                         item.set文件名(fileName);
+                        item.updateToBz(yhms,date);
                         this.remove(new QueryWrapper<YdjhImportNew>()
                                 .eq("dc_ch", item.getDcCh())
                                 .eq("dc_pl", item.getDcPl())
@@ -374,11 +447,11 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
         });
     }
 
-    private void createTzjh(List<YdjhImportNew> list, String fileName, HttpServletRequest request) {
-        String yhms = (String) request.getAttribute("yhms");
+    private void createTzjh(List<YdjhImportNew> list, String fileName,String yhms) {
         String date = DateUtil.date().toString("yyyy/MM/dd");
 
         list.stream()
+                .filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
                 .filter(YdjhImportNew::isNonBom)
                 .forEach(item -> {
                     String dcPl = item.getDcPl();
@@ -412,7 +485,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                     } catch (Exception ignored) {
                     }
 
-                    List<DmBom> bomList = bomService.getBomUni(item.getDcCh(), dcPl);
+                    List<DmBom> bomList = bomService.getBomUni(item.getDcCh(), dcPl,null);
 
                     if (ObjUtil.isEmpty(bomList)) {
                         //无bom,明细数据使用目标船只替代,切在作业计划中生成一条(按照kw进行区分)数据
@@ -434,8 +507,10 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     Map<String, List<DmBom>> collect = bomList.stream().collect(Collectors.groupingBy(DmBom::getKw));
                     //一垮龙门和一垮数控
+                    String finalDcPl = dcPl;
                     if (item.get切割完成1() != null) {
                         Optional.ofNullable(collect.get("7")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_7",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -449,6 +524,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         });
 
                         Optional.ofNullable(collect.get("8")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_8",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -464,6 +540,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     if (item.get切割完成2() != null) {
                         Optional.ofNullable(collect.get("5")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_5",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -479,6 +556,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     if (item.get切割完成3() != null) {
                         Optional.ofNullable(collect.get("9")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_9",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -492,6 +570,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         });
 
                         Optional.ofNullable(collect.get("10")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_10",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -505,6 +584,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         });
 
                         Optional.ofNullable(collect.get("12")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_12",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -520,13 +600,12 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     if (item.get切割完成4() != null) {
                         Optional.ofNullable(collect.get("6")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_6",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成4());
-                                dmSygdMx.setQbs("1");
-                                dmSygdMx.setQjgrq(item.get曲平铁曲完成());
                                 dmSygdMx.setJssj(item.getQfxqrqxz());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
@@ -534,32 +613,34 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                             });
                         });
 
-                        Optional.ofNullable(collect.get("14")).ifPresent(boms -> {
+                    }
+
+                    if(item.get曲平铁曲完成()!=null){
+                        Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_13",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
-                                dmSygdMx.setQgrq(item.get切割完成4());
+                                dmSygdMx.setQgrq(item.get曲平铁曲完成());
                                 dmSygdMx.setQbs("1");
-                                dmSygdMx.setQjgrq(item.get曲平铁曲完成());
+                                dmSygdMx.setQjgrq(item.get曲外板曲完成());
                                 dmSygdMx.setJssj(item.getQfxqrqxz());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
                                 addList.add(dmSygdMx);
                             });
                         });
-
                     }
 
                     if (item.get切割完成5() != null) {
-                        Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
+                        Optional.ofNullable(collect.get("14")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
                                 dmSygdMx.setDcPl(item.getDcPl());
                                 dmSygdMx.setQgrq(item.get切割完成5());
-                                dmSygdMx.setQbs("1");
-                                dmSygdMx.setQjgrq(item.get曲外板曲完成());
                                 dmSygdMx.setJssj(item.getQfxqrqxz());
                                 dmSygdMx.setGjjsDz(item.getQfxqrqdz());
                                 dmSygdMx.setBomData(bom);
@@ -570,6 +651,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     if (item.get切割完成6() != null) {
                         Optional.ofNullable(collect.get("11")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_11",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -585,6 +667,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
 
                     if (item.get切割完成7() != null) {
                         Optional.ofNullable(collect.get("15")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_15",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -598,6 +681,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                         });
 
                         Optional.ofNullable(collect.get("16")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_16",boms.size());
                             boms.forEach(bom -> {
                                 DmSygdMx dmSygdMx = new DmSygdMx();
                                 dmSygdMx.setDcCh(item.getDcCh());
@@ -610,6 +694,23 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
                             });
                         });
                     }
+
+                    if(item.get光电完成()!=null){
+                        Optional.ofNullable(collect.get("17")).ifPresent(boms -> {
+                            redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_17",boms.size());
+                            boms.forEach(bom -> {
+                                DmSygdMx dmSygdMx = new DmSygdMx();
+                                dmSygdMx.setDcCh(item.getDcCh());
+                                dmSygdMx.setDcPl(item.getDcPl());
+                                dmSygdMx.setQgrq(item.get光电完成());
+                                dmSygdMx.setJssj(item.getQfxqrqxz());
+                                dmSygdMx.setGjjsDz(item.getQfxqrqdz());
+                                dmSygdMx.setBomData(bom);
+                                addList.add(dmSygdMx);
+                            });
+                        });
+                    }
+
                     redisTemplate.opsForHash().put(GJSCGK_SYGDMX_KEY + fileName, item.getDcCh() + "_" + dcPl, addList);
                 });
     }
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
index 14d3b9e..aa0b825 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
@@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.jcsj.DmBom;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
-import com.dsic.gj_erp.bean.jhgk.*;
+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 com.dsic.gj_erp.bean.jhgk.YdjhImport;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
diff --git a/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java b/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java
index f770e54..e8bdd51 100644
--- a/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java
@@ -7,7 +7,6 @@ import com.dsic.gj_erp.jiuzhoumapper.SljhMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
index 39f4d6e..549f09d 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.service.zyjh;
 
-import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index 59686fa..d703dcc 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -19,7 +19,6 @@ import com.dsic.gj_erp.service.jcsj.DmBzryService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.google.common.collect.ImmutableMap;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
diff --git a/src/main/resources/mappers/jcsj/DmBomMapper.xml b/src/main/resources/mappers/jcsj/DmBomMapper.xml
index 9773e15..aa6c80b 100644
--- a/src/main/resources/mappers/jcsj/DmBomMapper.xml
+++ b/src/main/resources/mappers/jcsj/DmBomMapper.xml
@@ -285,6 +285,9 @@
             dm_bom
         WHERE
             dcch =#{dcCh} and pl =#{dcPl} and type='b'
+            <if test="kw!=null and kw!=''">
+                and kw=#{kw}
+            </if>
     </select>