1.删除导入项

2.增加月度计划导入时支持导入已下发月度计划
3.月度计划审核时自动生成作业计划,作业计划不再根据双周需求导入时生成

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,19 +1,8 @@
 package com.dsic.gj_erp;
 
 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 {

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

@@ -323,24 +323,46 @@ public class DmSygdMx implements Serializable {
         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/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,8 +37,7 @@ public class DmSygdController {
     DmSygdService service;
     @Resource
     DmSygdMxService mxService;
-    @Autowired
+
-    private EmGcrlService gcrlService;
     @RequestMapping("/getList")
     @AuthFunction
     public ResultBean getList(@RequestBody DmSygd sygd){

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>

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

@@ -3,9 +3,7 @@ package com.dsic.gj_erp.controller.jhgk;
 
 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;

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;
 

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

@@ -8,19 +8,15 @@ 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.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.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/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/mapper/jhgk/DmSygdMxMapper.java

@@ -27,6 +27,8 @@ public interface DmSygdMxMapper extends BaseMapper<DmSygdMx> {
 
     Dhdto getDhsl(Dhdto dhdto);
 
+    DmSygdMx getOne(String dcch,String dcpl);
+
    List<DmSygdMxLj> getLjxx(@Param("begin") String begin, @Param("end") String end);
    List<DmSygdMx> getMx(@Param("begin") String begin, @Param("end") String end);
    int setParent(@Param("begin") String begin, @Param("end") String end);

src/main/java/com/dsic/gj_erp/service/ApiService.java

@@ -1,6 +1,5 @@
 package com.dsic.gj_erp.service;
 
-import cn.hutool.core.util.StrUtil;
 import com.dsic.gj_erp.bean.request.LoginBean;
 import com.dsic.gj_erp.bean.sy.QSyfunp;
 import com.dsic.gj_erp.bean.sy.QSyifrp;

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

@@ -4,10 +4,7 @@ package com.dsic.gj_erp.service.jcsj;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
-import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
-import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 

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

@@ -1,9 +1,7 @@
 package com.dsic.gj_erp.service.jcsj;
 
 
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 

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

@@ -1,13 +1,9 @@
 package com.dsic.gj_erp.service.jcsj;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类

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

@@ -3,10 +3,7 @@ package com.dsic.gj_erp.service.jcsj;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbrydyp;
-import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
-import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

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

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
 import com.dsic.gj_erp.bean.request.EmSbwxjhBean;
 

src/main/java/com/dsic/gj_erp/service/jhgk/DmDhqdpService.java

@@ -2,10 +2,7 @@ package com.dsic.gj_erp.service.jhgk;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
-import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java

@@ -3,7 +3,6 @@ package com.dsic.gj_erp.service.jhgk;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java

@@ -2,14 +2,9 @@ package com.dsic.gj_erp.service.jhgk;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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.QfExcel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java

@@ -2,14 +2,11 @@ package com.dsic.gj_erp.service.jhgk;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
 import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
 import com.dsic.gj_erp.bean.jhgk.dto.*;
 import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java

@@ -3,10 +3,7 @@ package com.dsic.gj_erp.service.jhgk;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsic.gj_erp.bean.jhgk.DmSygd;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
 import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -22,10 +19,10 @@ import java.util.Map;
  */
 public interface DmSygdService extends IService<DmSygd> {
 
-    Map getSygds();
     Map uploadSy(List<SyExcel> list, HttpServletRequest req);
     Boolean tj(List<DmSygd> dmSygds);
+    void tj1(String from,String to);
     Boolean sh(List<DmSygd> dmSygds);
-
+    void sh1(String from,String to);
 
 }

src/main/java/com/dsic/gj_erp/service/jhgk/DmTzjhService.java

@@ -2,11 +2,8 @@ package com.dsic.gj_erp.service.jhgk;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jhgk.DmTzjh;
-import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java

@@ -20,7 +20,6 @@ import java.util.Map;
  */
 public interface  DmYdjhService extends IService<DmYdjh> {
 
-
     List<DmSygdMx> tjydjh();
 
     @Transactional

src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java

@@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jhgk;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -7,13 +7,10 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
 import com.dsic.gj_erp.mapper.jhgk.DmDhqdpMapper;
 import com.dsic.gj_erp.service.jhgk.DmDhqdpService;
 import com.google.common.collect.Maps;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -5,15 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
-import com.dsic.gj_erp.dao.jhgk.DmJtsyjhRepository;
 import com.dsic.gj_erp.mapper.jhgk.DmJtsyjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmJtsyjhService;
 import com.dsic.gj_erp.util.ExcelUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.modelmapper.ModelMapper;
-import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -1,7 +1,6 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmQfxq;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.mapper.jhgk.DmQfxqMapper;
@@ -20,7 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -179,27 +179,27 @@ public class DmQfxqServiceImpl extends ServiceImpl<DmQfxqMapper, DmQfxq> impleme
 //        }
         Map<String, List<DmYdjh>> map = ydjhList.stream().collect(Collectors.groupingBy(mx -> mx.getDcCh() +"@"+ mx.getDcPl()));
         this.removeByMulti(map);
-        ydjhList.forEach(l->{
+//        ydjhList.forEach(l->{
-            if (StrUtil.isAllNotEmpty(l.getXzglxq(),l.getJssj())){
+//            if (StrUtil.isAllNotEmpty(l.getXzglxq(),l.getJssj())){
-                //状态 2拖期 1提前 3追加
+//                //状态 2拖期 1提前 3追加
-                if (l.getXzglxq().compareTo(l.getJssj())<0){
+//                if (l.getXzglxq().compareTo(l.getJssj())<0){
-                    if (!DateUtil.isSameMonth(DateUtil.parseDate(l.getXzglxq()),DateUtil.parseDate(l.getJssj()))){
+//                    if (!DateUtil.isSameMonth(DateUtil.parseDate(l.getXzglxq()),DateUtil.parseDate(l.getJssj()))){
-                        l.setJhlx("3");
+//                        l.setJhlx("3");
-                    }else {
+//                    }else {
-                        l.setJhlx("1");
+//                        l.setJhlx("1");
-                    }
+//                    }
-                }
+//                }
-                if (l.getXzglxq().compareTo(l.getJssj())>0){
+//                if (l.getXzglxq().compareTo(l.getJssj())>0){
-                    l.setJhlx("2");
+//                    l.setJhlx("2");
-                }
+//                }
-                l.setJssjOld(StrUtil.isEmpty(l.getJssj())?"":l.getJssj());
+//                l.setJssjOld(StrUtil.isEmpty(l.getJssj())?"":l.getJssj());
-                l.setJssj(l.getXzglxq());
+//                l.setJssj(l.getXzglxq());
-            }
+//            }
-            if (StrUtil.isEmpty(l.getTzbh())){
+//            if (StrUtil.isEmpty(l.getTzbh())){
-                l.setJhlx("3");
+//                l.setJhlx("3");
-            }
+//            }
-        });
+//        });
-        ydjhService.saveBatch(ydjhList);
+//        ydjhService.saveBatch(ydjhList);
     }
 
     private void removeByMulti(Map<String, List<DmYdjh>> map){

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

@@ -2,6 +2,7 @@ package com.dsic.gj_erp.service.jhgk.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -25,7 +26,10 @@ import com.dsic.gj_erp.handler.dto.RealCapacity;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
 import com.dsic.gj_erp.service.jcsj.DmBomService;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
-import com.dsic.gj_erp.service.jhgk.*;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
+import com.dsic.gj_erp.service.jhgk.DmSygdService;
+import com.dsic.gj_erp.service.jhgk.DmTzjhService;
+import com.dsic.gj_erp.service.jhgk.DmXbjhService;
 import com.dsic.gj_erp.util.MyString;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -996,41 +1000,48 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
             //二跨数控开始
             val.stream().filter(item -> "9".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setEkskks(item.getQgrq()));
 
             //二跨数控2
             dmYdjhxf.setEksk2(eksk2.get()+"");
             //二跨数控2开始
             val.stream().filter(item -> "5".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setEkskks(item.getQgrq()));
 
             dmYdjhxf.setSksk(sksk.get()+"");
             val.stream().filter(item->"14".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setSkskqgks(item.getQgrq()));
 
             dmYdjhxf.setSkpt(skpt.get()+"");
             val.stream().filter(item -> "6".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setPtks(item.getQgrq()));
 
             val.stream().filter(item -> "6".equals(item.getKw()))
-                .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setPtjs(item.getQjgrq()));
+                    .filter(item->StrUtil.isNotEmpty(item.getQjgrq()))
+                    .min(Comparator.comparing(DmSygdMx::getQjgrq)).ifPresent(item -> dmYdjhxf.setPtjs(item.getQjgrq()));
 
             dmYdjhxf.setSkbs(skbs.get()+"");
             val.stream().filter(item->"15".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setSkqgks(item.getQgrq()));
 
             dmYdjhxf.setSkbs2(skbs2.get()+"");
             val.stream().filter(item->"11".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setSkbs2(item.getQgrq()));
 
             val.stream().filter(item->"7".equals(item.getKw()))
+                    .filter(item->StrUtil.isNotEmpty(item.getQgrq()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setYkpkjs(item.getQgrq()));
 
             dmYdjhxf.setFdxq(val.get(0).getJssj());
             list2.add(dmYdjhxf);
         });
-//        return list2.stream().sorted(Comparator.comparing(item -> item.getDcCh() +"_"+ item.getDcPl()+"_"+item.getSl())).collect(Collectors.toList());
+        return list2.stream().sorted(Comparator.comparing(item->item.getDcCh()+item.getDcPl())).collect(Collectors.toList());
-        return list2.stream().sorted(Comparator.comparing(DmYdjhxf::getSl)).collect(Collectors.toList());
     }
 
     @Transactional
@@ -1077,6 +1088,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void ydjhImport(List<JhxfExcel> objList) {
         // 1,同产品与批量视为一条记录  dcch  dcpl
         // 2,板数是否为空  不为空循环板数增加记录(还有一个其他集合)  bs1=7
@@ -1098,7 +1110,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                     dcch=jhxfExcel.getDcCh();
                 //}
             //    if(StringUtils.isBlank(dcpl)){
-                    dcpl=jhxfExcel.getDcPl();
+                    dcpl=StrUtil.padPre(jhxfExcel.getDcPl(),3,"0");
                 num=0;
                 zsl=0;
                 zz=0;
@@ -1116,7 +1128,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                         // 生成数据
                         DmSygdMx sygdMx= new DmSygdMx();
                         sygdMx.setDcCh(jhxfExcel.getDcCh());
-                        sygdMx.setDcPl(jhxfExcel.getDcPl());
+                        sygdMx.setDcPl(dcpl);
                         sygdMx.setDcFd(jhxfExcel.getDcFd());
                         sygdMx.setSlrq(jhxfExcel.getSl());
                         sygdMx.setPwrq(jhxfExcel.getPw());
@@ -1149,6 +1161,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                         insertsOne.add(sygdMx);
                     }
                 }else{
+                    dcch="";
+                    dcpl="";
                     continue;
                 }
                 int yklm=0;
@@ -1157,16 +1171,14 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 if(yklm>0){
                     zz=yklm;
-
-
                     for (int j = 0; j < yklm; j++) {
-                        // 生成数据
-                        insertsOne.get(j).setKw("7");
-                        insertsOne.get(j).setQgrq(jhxfExcel.getYkpkjs());
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
+                        // 生成数据
+                        insertsOne.get(j).setKw("7");
+                        insertsOne.get(j).setQgrq(jhxfExcel.getYkpkjs());
                     }
                 }
 
@@ -1176,13 +1188,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 if(yksk>0){
                     for (int j = 0; j < yksk; j++) {
-                        // 生成数据
-                        insertsOne.get(zz+j).setKw("8");
-                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getYkpkjs());
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
+                        // 生成数据
+                        insertsOne.get(zz+j).setKw("8");
+                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getYkpkjs());
                     }
                     zz=zz+yksk;
                 }
@@ -1191,77 +1203,81 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                     eklmbs= MyString.convertStringToNumber(jhxfExcel.getEksk());
                 }
                 if(eklmbs>0){
-
                     for (int j = 0; j < eklmbs; j++) {
-                        // 生成数据
-                        insertsOne.get(zz+j).setKw("5");
-                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getLmqgks());
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
+                        // 生成数据
+                        insertsOne.get(zz+j).setKw("5");
+                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getLmqgks());
                     }
                     zz=zz+eklmbs;
                 }
 
                 int eksk=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getEksk())){
+                    try {
                         eksk= MyString.convertStringToNumber(jhxfExcel.getEksk());
+                    }catch (Exception ignored){}
                 }
                 if(eksk>0){
-
                     for (int j = 0; j < eksk; j++) {
-                        // 生成数据
-                        insertsOne.get(zz+j).setKw("9");/// 2跨超长超宽曲板 // 2跨T型材腹板  //2跨超长超宽板
-                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getEkskks());
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
+                        // 生成数据
+                        insertsOne.get(zz+j).setKw("9");/// 2跨超长超宽曲板 // 2跨T型材腹板  //2跨超长超宽板
+                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getEkskks());
                     }
                     zz=zz+eksk;
                 }
                 int sksk=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSksk())){
+                    try {
                         sksk= MyString.convertStringToNumber(jhxfExcel.getSksk());
+                    }catch (Exception ignored){}
                 }
                 if(sksk>0){
 
                     for (int j = 0; j < sksk; j++) {
-                        // 生成数据
-                        insertsOne.get(zz+j).setKw("14");///3跨曲板 // 3跨厚板
-                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getSkskqgks());
-
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
+                        // 生成数据
+                        insertsOne.get(zz+j).setKw("14");///3跨曲板 // 3跨厚板
+                        insertsOne.get(zz+j).setQgrq(jhxfExcel.getSkskqgks());
                     }
                     zz=zz+sksk;
                 }
                 int skpt=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSkpt())){
+                    try {
                         skpt= MyString.convertStringToNumber(jhxfExcel.getSkpt());
+                    }catch (Exception ignored){}
                 }
                 if(skpt>0){
 
                     for (int j = 0; j < skpt; j++) {
+                        zsl++;
+                        if(zsl>num){
+                            break;
+                        }
                         // 生成数据
                         insertsOne.get(zz+j).setKw("6");///3跨曲板 // 3跨厚板
                         insertsOne.get(zz+j).setQgrq(jhxfExcel.getPtks());
                         insertsOne.get(zz+j).setQjgrq(jhxfExcel.getQptjs());
-
-                        zsl++;
-                        if(zsl>num){
-                            continue;
-                        }
                     }
                     zz=zz+skpt;
                 }
 
                 int skbs=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSkbs())){
+                    try {
                         skbs= MyString.convertStringToNumber(jhxfExcel.getSkbs());
+                    }catch (Exception ignored){}
                 }
                 if(skbs>0){
 
@@ -1280,18 +1296,18 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 map.put(dcch+"_"+dcpl,insertsOne);
 
-            }{
+            }else{
                 List<DmSygdMx> insertsOne = map.get(dcch +"_"+ dcpl);
 
 
                 int yklm=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getYklm())){
+                    try {
                         yklm= MyString.convertStringToNumber(jhxfExcel.getYklm());
+                    }catch (Exception ignored){}
                 }
                 if(yklm>0){
                     zz=yklm;
-
-
                     for (int j = 0; j < yklm; j++) {
                         // 生成数据
                         insertsOne.get(j).setKw("7");
@@ -1305,7 +1321,9 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
                 int yksk=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getYksk())){
+                    try {
                         yksk= MyString.convertStringToNumber(jhxfExcel.getYksk());
+                    }catch (Exception ignored){}
                 }
                 if(yksk>0){
                     for (int j = 0; j <yksk; j++) {
@@ -1321,10 +1339,11 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 int eklmbs=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getEklmbs())){
+                    try {
                         eklmbs= MyString.convertStringToNumber(jhxfExcel.getEksk());
+                    }catch (Exception ignored){}
                 }
                 if(eklmbs>0){
-
                     for (int j = 0; j < eklmbs; j++) {
                         // 生成数据
                         insertsOne.get(zz+j).setKw("5");
@@ -1339,7 +1358,9 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
                 int eksk=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getEksk())){
+                    try {
                         eksk= MyString.convertStringToNumber(jhxfExcel.getEksk());
+                    }catch (Exception ignored){}
                 }
                 if(eksk>0){
 
@@ -1356,10 +1377,11 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 int sksk=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSksk())){
+                    try {
                         sksk= MyString.convertStringToNumber(jhxfExcel.getSksk());
+                    }catch (Exception ignored){}
                 }
                 if(sksk>0){
-
                     for (int j = 0; j < sksk; j++) {
                         // 生成数据
                         insertsOne.get(zz+j).setKw("14");///3跨曲板 // 3跨厚板
@@ -1367,14 +1389,16 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
                         zsl++;
                         if(zsl>num){
-                            continue;
+                            break;
                         }
                     }
                     zz=zz+sksk;
                 }
                 int skpt=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSkpt())){
+                    try {
                         skpt= MyString.convertStringToNumber(jhxfExcel.getSkpt());
+                    }catch (Exception ignored){}
                 }
                 if(skpt>0){
 
@@ -1394,17 +1418,16 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
                 int skbs=0;
                 if(StringUtils.isNotBlank(jhxfExcel.getSkbs())){
+                    try {
                         skbs= MyString.convertStringToNumber(jhxfExcel.getSkbs());
+                    }catch (Exception ignored){}
                 }
                 if(skbs>0){
-
                     for (int j = 0; j < skbs; j++) {
                         // 生成数据
                         insertsOne.get(zz+j).setKw("15");///3跨曲板 // 3跨厚板
                         insertsOne.get(zz+j).setQgrq(jhxfExcel.getSkqgks());
 
-
-
                         zsl++;
                         if(zsl>num){
                             continue;
@@ -1414,52 +1437,62 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 }
                 map.put(dcch+"_"+dcpl,insertsOne);//这里改为用"_"分割,方便后面逻辑调用
             }
-
-
-
-
         }
 
         for (Map.Entry<String, List<DmSygdMx>> entry : map.entrySet()) {
             String key = entry.getKey();
             List<DmSygdMx> value = entry.getValue();
 
-            // 打印键和值
-            System.out.println("Key: " + key);
-            System.out.println("Value: " + value);
-
             //todo 支持导入有基础数据的月度计划
-//            String ch=key.split("_")[0];
+            String ch=key.split("_")[0];
-//            String pl=key.split("_")[1];
+            String pl=key.split("_")[1];
-//            List<DmBom> bomList=bomService.list(Wrappers.<DmBom>lambdaQuery().eq(DmBom::getDcch,ch).eq(DmBom::getPl,pl));
-//
-//            //补充基础数据
-//            //fixme 这里有个冲突 ,如果导入的数量比bom少,多次导入时无法确认哪些bom被占用
-//            if (ObjectUtil.isNotEmpty(bomList)){
-//                int size=Math.min(value.size(),bomList.size());
-//                for (int i=0;i<size;i++){
-//                    DmSygdMx dmSygdMx = value.get(i);
-//                    DmBom dmBom = bomList.get(i);
-//                    dmSygdMx.setBomData(dmBom);
-//                }
-//            }
 
-            // 如果需要，这里还可以进一步遍历List<DmSygdMx>
-            for (DmSygdMx item : value) {
-                // 对每个DmSygdMx对象进行操作
-                System.out.println("DmSygdMx Object: " + item);
 
-               /// 简单根据 船号 批量 删除后重复导入
+            List<DmSygdMx> sygdMxes=this.list(Wrappers.<DmSygdMx>lambdaQuery()
-                this.remove(new QueryWrapper<DmSygdMx>().eq("dc_ch",item.getDcCh()).eq("dc_pl",item.getDcPl())
+                    .eq(DmSygdMx::getDcCh,ch)
-                    .eq("dc_fd",item.getDcFd())
+                    .eq(DmSygdMx::getDcPl,pl)
             );
 
+            DmSygdMx importData=value.get(0);
+            if (ObjectUtil.isNotEmpty(sygdMxes)){
+                CopyOptions options = CopyOptions.create()
+                        .setIgnoreNullValue(true)  // 忽略源对象属性为空的情况
+                        .setIgnoreError(true);     // 忽略复制过程中出现的错误
+                sygdMxes.forEach(item-> BeanUtil.copyProperties(importData, item,options));
+                this.updateBatchById(sygdMxes);
+            }else {
+                List<DmBom> bomList=bomService.list(Wrappers.<DmBom>lambdaQuery().eq(DmBom::getDcch,ch).eq(DmBom::getPl,pl));
+                //补充基础数据
+                //fixme 这里有个冲突 ,如果导入的数量比bom少,多次导入时无法确认哪些bom被占用
+                if (ObjectUtil.isNotEmpty(bomList)){
+                    int size=Math.min(value.size(),bomList.size());
+                    for (int i=0;i<size;i++){
+                        DmSygdMx dmSygdMx = value.get(i);
+                        DmBom dmBom = bomList.get(i);
+                        dmSygdMx.setBomData(dmBom);
+                        dmSygdMx.setId(IdWorker.get32UUID());
+                        dmSygdMx.setDrbs("Y");
+                    }
                 }
-            for (DmSygdMx item : value) {
+                this.saveBatch(value,500);
-                item.setId(IdWorker.get32UUID());
-                item.setDrbs("Y");
-                this.save(item);
             }
+
+            // 如果需要，这里还可以进一步遍历List<DmSygdMx>
+//            for (DmSygdMx item : value) {
+//                // 对每个DmSygdMx对象进行操作
+//                System.out.println("DmSygdMx Object: " + item);
+//
+//                // 简单根据 船号 批量 删除后重复导入
+//                this.remove(new QueryWrapper<DmSygdMx>().eq("dc_ch",item.getDcCh()).eq("dc_pl",item.getDcPl())
+//                    .eq("dc_fd",item.getDcFd())
+//                );
+//
+//            }
+//            for (DmSygdMx item : value) {
+//                item.setId(IdWorker.get32UUID());
+//                item.setDrbs("Y");
+//                this.save(item);
+//            }
         }
     }
 

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

@@ -1,35 +1,24 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.BeanCopier;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
-import com.dsic.gj_erp.bean.jcsj.DmBom;
-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.DmZrcjh;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
 import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
-import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
-import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper;
-import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
-import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
-import com.sun.el.stream.Stream;
+import com.dsic.gj_erp.service.jhgk.DmYdjhService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 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;
@@ -43,24 +32,14 @@ import java.util.stream.Collectors;
  * @since 2023-10-09
  */
 @Service
+@AllArgsConstructor
 public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> implements DmSygdService {
 
-    @Resource
+    private final DmYdjhService ydjhService;
-    private DmSygdMapper mapper;
+    private final DmSygdMxService sygdMxService;
-
-    @Resource
-    private DmBclqjbpService bclqjbpService;
-
-
-    @Override
-    public Map getSygds(){
-
-       Map map= new HashMap();
-
-        return  map;
-    }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map uploadSy(List<SyExcel> list, HttpServletRequest req){
         List<DmSygd> listForSave=new ArrayList<>();
         for (SyExcel q:list) {
@@ -80,6 +59,8 @@ public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> impleme
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean tj(List<DmSygd> dmSygds){
         dmSygds.forEach(dmSygd->{
             String zt=dmSygd.getGdZt();
@@ -88,6 +69,23 @@ public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> impleme
         });
       return this.updateBatchById(dmSygds);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void tj1(String from,String to){
+        List<DmSygdMx> sygdMxes = this.sygdMxService.list(Wrappers.<DmSygdMx>lambdaQuery().between(DmSygdMx::getJssj, from, to));
+        List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
+            DmSygdMx dmSygdMx = new DmSygdMx();
+            dmSygdMx.setId(dmSygd.getId());
+            dmSygdMx.setZt("1");
+            return dmSygdMx;
+        }).collect(Collectors.toList());
+        this.sygdMxService.updateBatchById(collect);
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean sh(List<DmSygd> dmSygds){
         dmSygds.forEach(dmSygd->{
             String setZt="2";
@@ -96,5 +94,50 @@ public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> impleme
         return this.updateBatchById(dmSygds);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sh1(String from,String to){
+        List<DmSygdMx> sygdMxes = this.sygdMxService.list(Wrappers.<DmSygdMx>lambdaQuery().between(DmSygdMx::getJssj, from, to));
+        List<DmSygdMx> collect = sygdMxes.stream().map(dmSygd -> {
+            DmSygdMx dmSygdMx = new DmSygdMx();
+            dmSygdMx.setId(dmSygd.getId());
+            dmSygdMx.setZt("2");
+            return dmSygdMx;
+        }).collect(Collectors.toList());
+        this.sygdMxService.updateBatchById(collect);
+        //生成作业计划
+        new Thread(()->{
+            this.generateYdjh(sygdMxes);
+        }).start();
+    }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void generateYdjh(List<DmSygdMx> sygdMxes) {
+        List<DmYdjh> ydjhList = sygdMxes.stream().map(item -> {
+            DmYdjh dmYdjh = new DmYdjh();
+            BeanUtil.copyProperties(item, dmYdjh);
+            return dmYdjh;
+        }).collect(Collectors.toList());
+        ydjhList.forEach(l->{
+            if (StrUtil.isAllNotEmpty(l.getXzglxq(),l.getJssj())){
+                //状态 2拖期 1提前 3追加
+                if (l.getXzglxq().compareTo(l.getJssj())<0){
+                    if (!DateUtil.isSameMonth(DateUtil.parseDate(l.getXzglxq()),DateUtil.parseDate(l.getJssj()))){
+                        l.setJhlx("3");
+                    }else {
+                        l.setJhlx("1");
+                    }
+                }
+                if (l.getXzglxq().compareTo(l.getJssj())>0){
+                    l.setJhlx("2");
+                }
+                l.setJssjOld(StrUtil.isEmpty(l.getJssj())?"":l.getJssj());
+                l.setJssj(l.getXzglxq());
+            }
+            if (StrUtil.isEmpty(l.getTzbh())){
+                l.setJhlx("3");
+            }
+        });
+        ydjhService.saveBatch(ydjhList);
+    }
 }

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

@@ -26,8 +26,6 @@ public class DmTzjhServiceImpl extends ServiceImpl<DmTzjhMapper, DmTzjh> impleme
 
     @Resource
     DmTzjhMapper dmTzjhMapper;
-//    @Resource
-//    DmTzjhRepository dmTzjhRepository;
 
     @Override
     public List<DmTzjh> getList(JSONObject json) {
@@ -41,7 +39,7 @@ public class DmTzjhServiceImpl extends ServiceImpl<DmTzjhMapper, DmTzjh> impleme
         if(StringUtils.isNotEmpty(json.getString("dcPl"))){
             queryWrapper.eq("DC_PL",json.getString("dcPl"));
         }
-        List<DmTzjh> dmTzjhs=dmTzjhMapper.selectList(queryWrapper);
+        List<DmTzjh> dmTzjhs=dmTzjhMapper.selectList(queryWrapper.orderByAsc("dc_ch","dc_pl"));
         return dmTzjhs;
     }
 

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

@@ -11,7 +11,6 @@ import com.dsic.gj_erp.mapper.jhgk.DmXbjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmXbjhService;
 import com.dsic.gj_erp.util.ExcelUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.http.parser.Ranges;
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +18,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

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

@@ -17,7 +17,6 @@ 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 io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -27,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -4,12 +4,12 @@ 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.ObjectUtil;
-import cn.hutool.poi.excel.ExcelReader;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.jhgk.*;
+import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
+import com.dsic.gj_erp.bean.jhgk.DmZrcjhOld;
 import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmZrcjhOldService;
 import com.dsic.gj_erp.service.jhgk.DmZrcjhService;

src/main/java/com/dsic/gj_erp/service/pgsc/impl/PbscServiceImpl.java

@@ -1,12 +1,7 @@
 package com.dsic.gj_erp.service.pgsc.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  *  服务实现类

src/main/java/com/dsic/gj_erp/service/txzz/DmMateriaServiceImpl.java

@@ -1,9 +1,7 @@
 package com.dsic.gj_erp.service.txzz;
 
 import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.sy.SyDictItem;
@@ -17,8 +15,10 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
-import java.util.function.Function;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**

src/main/java/com/dsic/gj_erp/service/txzz/impl/供应商管理ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.供应商管理;
 import com.dsic.gj_erp.mapper.txzz.供应商管理Mapper;
 import com.dsic.gj_erp.service.txzz.I供应商管理Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/入库ServiceImpl.java

@@ -1,14 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jt.入库;
 import com.dsic.gj_erp.mapper.txzz.入库Mapper;
 import com.dsic.gj_erp.service.txzz.I入库Service;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/出库ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.出库;
 import com.dsic.gj_erp.mapper.txzz.出库Mapper;
 import com.dsic.gj_erp.service.txzz.I出库Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/发票管理ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.发票管理;
 import com.dsic.gj_erp.mapper.txzz.发票管理Mapper;
 import com.dsic.gj_erp.service.txzz.I发票管理Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/应付账款ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.应付账款;
 import com.dsic.gj_erp.mapper.txzz.应付账款Mapper;
 import com.dsic.gj_erp.service.txzz.I应付账款Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/应收账款ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.应收账款;
 import com.dsic.gj_erp.mapper.txzz.应收账款Mapper;
 import com.dsic.gj_erp.service.txzz.I应收账款Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/盘点ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.盘点;
 import com.dsic.gj_erp.mapper.txzz.盘点Mapper;
 import com.dsic.gj_erp.service.txzz.I盘点Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/退货ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.退货;
 import com.dsic.gj_erp.mapper.txzz.退货Mapper;
 import com.dsic.gj_erp.service.txzz.I退货Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/txzz/impl/采购订单ServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.txzz.impl;
 
-import java.util.List;
-
 import com.dsic.gj_erp.bean.jt.采购订单;
 import com.dsic.gj_erp.mapper.txzz.采购订单Mapper;
 import com.dsic.gj_erp.service.txzz.I采购订单Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  * 

src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.cron.CronUtil;
 import cn.hutool.cron.task.Task;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.bean.xiaochi.CutPlan;
@@ -17,7 +16,6 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.stream.Collectors;
 

src/main/java/com/dsic/gj_erp/wsclient/handler/TipHandler.java

@@ -1,9 +1,5 @@
 package com.dsic.gj_erp.wsclient.handler;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.ws.WsHandler;
 import com.dsic.gj_erp.wsclient.Message;
 import lombok.AllArgsConstructor;

src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java

@@ -1,16 +1,11 @@
 package com.dsic.gj_erp.wsclient.handler;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import com.dsic.gj_erp.ws.WsHandler;
 import com.dsic.gj_erp.wsclient.Message;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
 @AllArgsConstructor
 public class ZxHandler implements IHandlerService{

src/main/resources/mappers/jhgk/DmSygdMxMapper.xml

@@ -593,4 +593,7 @@
                  dm_sygd_mx.dc_pl,
                  dm_sygd_mx.dc_fd,dm_sygd_mx.tzbh
     </select>
+    <select id="getOne" resultType="com.dsic.gj_erp.bean.jhgk.DmSygdMx">
+        select * from dm_sygd_mx where dc_ch=#{dcch} and dc_pl=#{dcpl}
+    </select>
 </mapper>