From e0786c6043f48326e96a74a0f2fa465ccfb9de1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 21 Oct 2024 17:16:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=AF=BC=E5=85=A5=E9=A1=B9?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E5=8F=91=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=203.=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=A1=E5=88=92,=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=A0=B9=E6=8D=AE=E5=8F=8C=E5=91=A8=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=AF=BC=E5=85=A5=E6=97=B6=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/GjErpApplication.java | 4 - src/main/java/com/dsic/gj_erp/Test.java | 11 - .../com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 44 +++- .../dsic/gj_erp/controller/ApiController.java | 5 - .../dsic/gj_erp/controller/SYController.java | 8 +- .../controller/fd/DmXqdwcjcdController.java | 1 - .../controller/jcsj/BomUploadController.java | 1 - .../controller/jcsj/DmBomController.java | 18 +- .../controller/jcsj/DmBzryController.java | 2 - .../controller/jcsj/DmCzplpNewController.java | 1 - .../controller/jcsj/EmGcrlController.java | 2 - .../controller/jcsj/EmSbcnpController.java | 3 - .../controller/jcsj/EmSbjbbController.java | 2 - .../controller/jcsj/EmSbjgryController.java | 5 - .../controller/jcsj/EmSbwxjhController.java | 4 - .../controller/jhgk/DmDhqdpController.java | 1 - .../controller/jhgk/DmJtsyjhController.java | 1 - .../controller/jhgk/DmQfxqController.java | 8 +- .../controller/jhgk/DmSygdController.java | 17 +- .../controller/jhgk/DmSygdxqController.java | 8 +- .../controller/jhgk/DmTzjhController.java | 4 - .../controller/jhgk/DmXbjhController.java | 2 - .../controller/jhgk/DmYdjhController.java | 7 - .../controller/jhgk/DmZrcjhController.java | 3 - .../jhgk/三月滚动排产控制器.java | 5 +- .../controller/kban/KbanController.java | 4 - .../controller/pbsc/MpYlxxpController.java | 2 - .../controller/pbsc/PbPwjhController.java | 13 +- .../controller/pgd/DmPpxxbController.java | 4 - .../controller/pgd/PgdDhController.java | 1 - .../controller/pgd/PgdDmjhController.java | 2 - .../controller/pgd/PgdPkjhController.java | 2 - .../controller/pgd/PgdPwjhController.java | 1 - .../controller/pgd/PgdQgjhController.java | 1 - .../controller/pgd/PgdQmjhController.java | 4 - .../controller/pgd/PgdSljhController.java | 4 - .../controller/pgd/PgdTzjhController.java | 18 +- .../controller/sy/SyDictItemController.java | 2 - .../controller/sy/SyUserLogController.java | 12 +- .../txzz/jhgl/DmMateriaController.java | 6 +- .../txzz/jhgl/TpbhPlanController.java | 2 - .../txzz/供应商管理Controller.java | 15 +- .../controller/txzz/入库Controller.java | 15 +- .../controller/txzz/出库Controller.java | 15 +- .../txzz/发票管理Controller.java | 15 +- .../txzz/应付账款Controller.java | 15 +- .../txzz/应收账款Controller.java | 15 +- .../controller/txzz/盘点Controller.java | 15 +- .../controller/txzz/退货Controller.java | 15 +- .../txzz/采购订单Controller.java | 15 +- .../java/com/dsic/gj_erp/datasync/Config.java | 2 - .../com/dsic/gj_erp/datasync/DataHandler.java | 1 - .../gj_erp/mapper/jhgk/DmSygdMxMapper.java | 2 + .../com/dsic/gj_erp/service/ApiService.java | 1 - .../gj_erp/service/jcsj/EmSbcnpService.java | 3 - .../gj_erp/service/jcsj/EmSbjbbService.java | 2 - .../gj_erp/service/jcsj/EmSbjgryService.java | 4 - .../gj_erp/service/jcsj/EmSbrydypService.java | 3 - .../gj_erp/service/jcsj/EmSbwxjhService.java | 1 - .../gj_erp/service/jhgk/DmDhqdpService.java | 3 - .../gj_erp/service/jhgk/DmJtsyjhService.java | 1 - .../gj_erp/service/jhgk/DmQfxqService.java | 5 - .../gj_erp/service/jhgk/DmSygdMxService.java | 3 - .../gj_erp/service/jhgk/DmSygdService.java | 7 +- .../gj_erp/service/jhgk/DmTzjhService.java | 3 - .../gj_erp/service/jhgk/DmYdjhService.java | 1 - .../gj_erp/service/jhgk/DmZrcjhService.java | 1 - .../service/jhgk/impl/DmDhqdpServiceImpl.java | 3 - .../jhgk/impl/DmJtsyjhServiceImpl.java | 3 - .../service/jhgk/impl/DmQfxqServiceImpl.java | 48 ++-- .../jhgk/impl/DmSygdMxServiceImpl.java | 225 ++++++++++-------- .../service/jhgk/impl/DmSygdServiceImpl.java | 105 +++++--- .../service/jhgk/impl/DmTzjhServiceImpl.java | 4 +- .../service/jhgk/impl/DmXbjhServiceImpl.java | 6 +- .../service/jhgk/impl/DmYdjhServiceImpl.java | 2 - .../service/jhgk/impl/DmZrcjhServiceImpl.java | 4 +- .../service/pgsc/impl/PbscServiceImpl.java | 5 - .../service/txzz/DmMateriaServiceImpl.java | 8 +- .../txzz/impl/供应商管理ServiceImpl.java | 4 +- .../service/txzz/impl/入库ServiceImpl.java | 5 +- .../service/txzz/impl/出库ServiceImpl.java | 4 +- .../txzz/impl/发票管理ServiceImpl.java | 4 +- .../txzz/impl/应付账款ServiceImpl.java | 4 +- .../txzz/impl/应收账款ServiceImpl.java | 4 +- .../service/txzz/impl/盘点ServiceImpl.java | 4 +- .../service/txzz/impl/退货ServiceImpl.java | 4 +- .../txzz/impl/采购订单ServiceImpl.java | 4 +- .../service/xiaochi/XiaoChiService.java | 2 - .../gj_erp/wsclient/handler/TipHandler.java | 4 - .../gj_erp/wsclient/handler/ZxHandler.java | 5 - .../resources/mappers/jhgk/DmSygdMxMapper.xml | 3 + 91 files changed, 369 insertions(+), 518 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/GjErpApplication.java b/src/main/java/com/dsic/gj_erp/GjErpApplication.java index bf6f0ff..f446a6b 100644 --- a/src/main/java/com/dsic/gj_erp/GjErpApplication.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/Test.java b/src/main/java/com/dsic/gj_erp/Test.java index 818685e..b4ad045 100644 --- a/src/main/java/com/dsic/gj_erp/Test.java +++ b/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 { diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java index d26184c..3d6fb22 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java +++ b/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(); - this.hxcd=bom.getHxcd().doubleValue(); - this.dmcd=bom.getDmcd().doubleValue(); - this.qgcd=bom.getQgcd().doubleValue(); + 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){} - this.pkcd=bom.getPkcd().doubleValue(); - this.ljsl=bom.getLjsl().doubleValue(); + try { + this.pkcd=bom.getPkcd().doubleValue(); + }catch (Exception ignored){} + try { + this.ljsl=bom.getLjsl().doubleValue(); + }catch (Exception ignored){} this.zl=bom.getZl(); - this.xcms=bom.getXcshms().doubleValue(); + try { + this.xcms=bom.getXcshms().doubleValue(); + }catch (Exception ignored){} this.kw=bom.getKw(); this.dcFd=bom.getFd(); - this.bclqzl=bom.getBclqzl().doubleValue(); - this.bcshzl=bom.getBcshzl().doubleValue(); - this.bcylzl=bom.getBcylzl().doubleValue(); - this.bcljtlzl=bom.getBcljtlzl().doubleValue(); - this.bcqpyld=bom.getBcqpyld().doubleValue(); + 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(); } } diff --git a/src/main/java/com/dsic/gj_erp/controller/ApiController.java b/src/main/java/com/dsic/gj_erp/controller/ApiController.java index a775ce2..f931326 100644 --- a/src/main/java/com/dsic/gj_erp/controller/ApiController.java +++ b/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") diff --git a/src/main/java/com/dsic/gj_erp/controller/SYController.java b/src/main/java/com/dsic/gj_erp/controller/SYController.java index f5f7be2..9e900ac 100644 --- a/src/main/java/com/dsic/gj_erp/controller/SYController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java b/src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java index 3164c40..4790e36 100644 --- a/src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java +++ b/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; 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 645ede2..e336898 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 @@ -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; 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 65902a5..167e400 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 @@ -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.*; -import org.springframework.web.multipart.MultipartFile; +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.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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java index 0b326bb..917598b 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java index 4d62e62..9c244a9 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java index d294dd5..55aa61e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java index f4e8027..a0dccda 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java index 68ce468..c8d55b1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java +++ b/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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java index 78a4647..dff899d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbwxjhController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbwxjhController.java index bce33cf..7bcdc0f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbwxjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmDhqdpController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmDhqdpController.java index fd6b51d..1f22180 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmDhqdpController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java index 9b18c7e..eeb78e3 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java index 0ee9e49..d8143a0 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java +++ b/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); } 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 d9fbda1..1d840a8 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 @@ -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.jcsj.EmSbcnp; -import com.dsic.gj_erp.bean.jhgk.*; -import com.dsic.gj_erp.bean.jhgk.excel.QfExcel; +import com.dsic.gj_erp.bean.jhgk.DmSygd; +import com.dsic.gj_erp.bean.jhgk.DmYdjhxf; 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; /** *

@@ -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){ diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdxqController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdxqController.java index 9521679..f7c304c 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdxqController.java +++ b/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.stream.Collectors; +import java.util.List; +import java.util.Map; /** *

diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmTzjhController.java index 1c79c6f..ce502a7 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmTzjhController.java +++ b/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; /** diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java index c34ffea..723fe05 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java +++ b/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; 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 4f2e914..aff4b95 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 @@ -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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java index 5aaf735..65d6bd1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java index e1d552f..8b4de0d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/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; 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 68daf7f..3db0bcb 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 @@ -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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pbsc/MpYlxxpController.java b/src/main/java/com/dsic/gj_erp/controller/pbsc/MpYlxxpController.java index 0e9e5c0..66dd242 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pbsc/MpYlxxpController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pbsc/PbPwjhController.java b/src/main/java/com/dsic/gj_erp/controller/pbsc/PbPwjhController.java index b032411..fa30c5c 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pbsc/PbPwjhController.java +++ b/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 javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** *

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 a0000fa..50113aa 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,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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java index f03a62f..dff00f2 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java index b3df65b..be87789 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java index bdae25b..f92ccdc 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java index 2e00cc1..f17183e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java index 25a62c4..2916ff2 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java index 78f0eee..f9cece4 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java +++ b/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; 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 7c3e1ec..933aa0f 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 @@ -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; diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java index e3fcb76..ad66c5f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java +++ b/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.jhgk.DmTzjh; +import com.dsic.gj_erp.bean.jcsj.DmBzry; +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.stream.Collectors; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** *

diff --git a/src/main/java/com/dsic/gj_erp/controller/sy/SyDictItemController.java b/src/main/java/com/dsic/gj_erp/controller/sy/SyDictItemController.java index 8148ac0..ee44da3 100644 --- a/src/main/java/com/dsic/gj_erp/controller/sy/SyDictItemController.java +++ b/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.*; diff --git a/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java b/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java index 763b16d..5de560a 100644 --- a/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java +++ b/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") diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java index 09407c4..a7a1a01 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/DmMateriaController.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java b/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java index ac86f39..37a63fb 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/jhgl/TpbhPlanController.java +++ b/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; /** diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/供应商管理Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/供应商管理Controller.java index efdcb2d..0d8197e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/供应商管理Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/入库Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/入库Controller.java index 9942eab..567e4ce 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/入库Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/出库Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/出库Controller.java index ab1d0de..3b262bd 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/出库Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/发票管理Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/发票管理Controller.java index bc0b774..59d46a6 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/发票管理Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/应付账款Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/应付账款Controller.java index c0a9afc..1538685 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/应付账款Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/应收账款Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/应收账款Controller.java index 4203492..8aeec1a 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/应收账款Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/盘点Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/盘点Controller.java index 5f22b49..31b118e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/盘点Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/退货Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/退货Controller.java index 3a82a7d..d6fe620 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/退货Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/controller/txzz/采购订单Controller.java b/src/main/java/com/dsic/gj_erp/controller/txzz/采购订单Controller.java index edc3c49..5474f3b 100644 --- a/src/main/java/com/dsic/gj_erp/controller/txzz/采购订单Controller.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -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; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 【请填写功能名称】Controller diff --git a/src/main/java/com/dsic/gj_erp/datasync/Config.java b/src/main/java/com/dsic/gj_erp/datasync/Config.java index 7af0035..bb35448 100644 --- a/src/main/java/com/dsic/gj_erp/datasync/Config.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/datasync/DataHandler.java b/src/main/java/com/dsic/gj_erp/datasync/DataHandler.java index fffd096..a32e312 100644 --- a/src/main/java/com/dsic/gj_erp/datasync/DataHandler.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java index 16eeb8a..93f990f 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java @@ -27,6 +27,8 @@ public interface DmSygdMxMapper extends BaseMapper { Dhdto getDhsl(Dhdto dhdto); + DmSygdMx getOne(String dcch,String dcpl); + List getLjxx(@Param("begin") String begin, @Param("end") String end); List getMx(@Param("begin") String begin, @Param("end") String end); int setParent(@Param("begin") String begin, @Param("end") String end); diff --git a/src/main/java/com/dsic/gj_erp/service/ApiService.java b/src/main/java/com/dsic/gj_erp/service/ApiService.java index 5281cab..03056d8 100644 --- a/src/main/java/com/dsic/gj_erp/service/ApiService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbcnpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbcnpService.java index b6ee0f5..3639793 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbcnpService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java index 62b9e0f..3b3702d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java index eaccced..a48c12e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjgryService.java +++ b/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; - /** *

* 服务类 diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java index b6779ae..d56e2bd 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbrydypService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbwxjhService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbwxjhService.java index b8386ce..d17e62b 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbwxjhService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmDhqdpService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmDhqdpService.java index c0c0011..d0650b0 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmDhqdpService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java index 4b0a717..a2a7237 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java index 9536282..a27a5bd 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java +++ b/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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java index ef90c35..61d4624 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java index 529e75a..6091495 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java +++ b/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 { - Map getSygds(); Map uploadSy(List list, HttpServletRequest req); Boolean tj(List dmSygds); + void tj1(String from,String to); Boolean sh(List dmSygds); - + void sh1(String from,String to); } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmTzjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmTzjhService.java index 0f3bb42..5e91a3d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmTzjhService.java +++ b/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; /** diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java index dde6522..2aa380c 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java @@ -20,7 +20,6 @@ import java.util.Map; */ public interface DmYdjhService extends IService { - List tjydjh(); @Transactional diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java index 1bf60d6..2deadbd 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java +++ b/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; 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 a6e14f1..c7dd34f 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 @@ -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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java index a76a306..8e60b7e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java index f29c8a9..5c3728f 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java +++ b/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 impleme // } Map> map = ydjhList.stream().collect(Collectors.groupingBy(mx -> mx.getDcCh() +"@"+ mx.getDcPl())); this.removeByMulti(map); - 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); +// 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); } private void removeByMulti(Map> map){ diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 9e59df4..a600e8d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/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 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())) + 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())); + val.stream().filter(item -> "6".equals(item.getKw())) + .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())) - .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setYkpkjs(item.getQgrq())); + .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(DmYdjhxf::getSl)).collect(Collectors.toList()); + return list2.stream().sorted(Comparator.comparing(item->item.getDcCh()+item.getDcPl())).collect(Collectors.toList()); } @Transactional @@ -1077,6 +1088,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i @Override + @Transactional(rollbackFor = Exception.class) public void ydjhImport(List objList) { // 1,同产品与批量视为一条记录 dcch dcpl // 2,板数是否为空 不为空循环板数增加记录(还有一个其他集合) bs1=7 @@ -1098,7 +1110,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl 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 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 i insertsOne.add(sygdMx); } }else{ + dcch=""; + dcpl=""; continue; } int yklm=0; @@ -1157,16 +1171,14 @@ public class DmSygdMxServiceImpl extends ServiceImpl 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 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 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())){ - eksk= MyString.convertStringToNumber(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())){ - sksk= MyString.convertStringToNumber(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())){ - skpt= MyString.convertStringToNumber(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())){ - skbs= MyString.convertStringToNumber(jhxfExcel.getSkbs()); + try { + skbs= MyString.convertStringToNumber(jhxfExcel.getSkbs()); + }catch (Exception ignored){} } if(skbs>0){ @@ -1280,18 +1296,18 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } map.put(dcch+"_"+dcpl,insertsOne); - }{ + }else{ List insertsOne = map.get(dcch +"_"+ dcpl); int yklm=0; if(StringUtils.isNotBlank(jhxfExcel.getYklm())){ - yklm= MyString.convertStringToNumber(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 i int yksk=0; if(StringUtils.isNotBlank(jhxfExcel.getYksk())){ - yksk= MyString.convertStringToNumber(jhxfExcel.getYksk()); + try { + yksk= MyString.convertStringToNumber(jhxfExcel.getYksk()); + }catch (Exception ignored){} } if(yksk>0){ for (int j = 0; j i } int eklmbs=0; if(StringUtils.isNotBlank(jhxfExcel.getEklmbs())){ - eklmbs= MyString.convertStringToNumber(jhxfExcel.getEksk()); + 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 i int eksk=0; if(StringUtils.isNotBlank(jhxfExcel.getEksk())){ - eksk= MyString.convertStringToNumber(jhxfExcel.getEksk()); + try { + eksk= MyString.convertStringToNumber(jhxfExcel.getEksk()); + }catch (Exception ignored){} } if(eksk>0){ @@ -1356,10 +1377,11 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } int sksk=0; if(StringUtils.isNotBlank(jhxfExcel.getSksk())){ - sksk= MyString.convertStringToNumber(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 i zsl++; if(zsl>num){ - continue; + break; } } zz=zz+sksk; } int skpt=0; if(StringUtils.isNotBlank(jhxfExcel.getSkpt())){ - skpt= MyString.convertStringToNumber(jhxfExcel.getSkpt()); + try { + skpt= MyString.convertStringToNumber(jhxfExcel.getSkpt()); + }catch (Exception ignored){} } if(skpt>0){ @@ -1394,17 +1418,16 @@ public class DmSygdMxServiceImpl extends ServiceImpl i int skbs=0; if(StringUtils.isNotBlank(jhxfExcel.getSkbs())){ - skbs= MyString.convertStringToNumber(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 i } map.put(dcch+"_"+dcpl,insertsOne);//这里改为用"_"分割,方便后面逻辑调用 } - - - - } for (Map.Entry> entry : map.entrySet()) { String key = entry.getKey(); List value = entry.getValue(); - // 打印键和值 - System.out.println("Key: " + key); - System.out.println("Value: " + value); - //todo 支持导入有基础数据的月度计划 -// String ch=key.split("_")[0]; -// String pl=key.split("_")[1]; -// List bomList=bomService.list(Wrappers.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 sygdMxes=this.list(Wrappers.lambdaQuery() + .eq(DmSygdMx::getDcCh,ch) + .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 bomList=bomService.list(Wrappers.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 - for (DmSygdMx item : value) { - // 对每个DmSygdMx对象进行操作 - System.out.println("DmSygdMx Object: " + item); - - /// 简单根据 船号 批量 删除后重复导入 - this.remove(new QueryWrapper().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); - } +// for (DmSygdMx item : value) { +// // 对每个DmSygdMx对象进行操作 +// System.out.println("DmSygdMx Object: " + item); +// +// // 简单根据 船号 批量 删除后重复导入 +// this.remove(new QueryWrapper().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); +// } } } 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 af3f0be..6b28c30 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,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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.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.excel.QfExcel; +import com.dsic.gj_erp.bean.jhgk.DmYdjh; 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.jcsj.DmBclqjbpService; +import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdService; -import com.sun.el.stream.Stream; -import org.springframework.beans.factory.annotation.Autowired; +import com.dsic.gj_erp.service.jhgk.DmYdjhService; +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 implements DmSygdService { - @Resource - private DmSygdMapper mapper; - - @Resource - private DmBclqjbpService bclqjbpService; - - - @Override - public Map getSygds(){ - - Map map= new HashMap(); - - return map; - } + private final DmYdjhService ydjhService; + private final DmSygdMxService sygdMxService; @Override + @Transactional(rollbackFor = Exception.class) public Map uploadSy(List list, HttpServletRequest req){ List listForSave=new ArrayList<>(); for (SyExcel q:list) { @@ -80,6 +59,8 @@ public class DmSygdServiceImpl extends ServiceImpl impleme return null; } + @Override + @Transactional(rollbackFor = Exception.class) public Boolean tj(List dmSygds){ dmSygds.forEach(dmSygd->{ String zt=dmSygd.getGdZt(); @@ -88,6 +69,23 @@ public class DmSygdServiceImpl extends ServiceImpl impleme }); return this.updateBatchById(dmSygds); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void tj1(String from,String to){ + List sygdMxes = this.sygdMxService.list(Wrappers.lambdaQuery().between(DmSygdMx::getJssj, from, to)); + List 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 dmSygds){ dmSygds.forEach(dmSygd->{ String setZt="2"; @@ -96,5 +94,50 @@ public class DmSygdServiceImpl extends ServiceImpl impleme return this.updateBatchById(dmSygds); } + @Override + @Transactional(rollbackFor = Exception.class) + public void sh1(String from,String to){ + List sygdMxes = this.sygdMxService.list(Wrappers.lambdaQuery().between(DmSygdMx::getJssj, from, to)); + List 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 sygdMxes) { + List 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); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java index 9a5345e..d78aa85 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmTzjhServiceImpl.java @@ -26,8 +26,6 @@ public class DmTzjhServiceImpl extends ServiceImpl impleme @Resource DmTzjhMapper dmTzjhMapper; -// @Resource -// DmTzjhRepository dmTzjhRepository; @Override public List getList(JSONObject json) { @@ -41,7 +39,7 @@ public class DmTzjhServiceImpl extends ServiceImpl impleme if(StringUtils.isNotEmpty(json.getString("dcPl"))){ queryWrapper.eq("DC_PL",json.getString("dcPl")); } - List dmTzjhs=dmTzjhMapper.selectList(queryWrapper); + List dmTzjhs=dmTzjhMapper.selectList(queryWrapper.orderByAsc("dc_ch","dc_pl")); return dmTzjhs; } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java index 51d564d..b25fdd9 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java +++ b/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; /** 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 d945958..986e4ec 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 @@ -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; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java index 61c94f8..2a1e753 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/pgsc/impl/PbscServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgsc/impl/PbscServiceImpl.java index 79ef313..4c41bd7 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgsc/impl/PbscServiceImpl.java +++ b/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; - /** *

* 服务实现类 diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/DmMateriaServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/DmMateriaServiceImpl.java index bc2b817..796956a 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/DmMateriaServiceImpl.java +++ b/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.function.Function; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/供应商管理ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/供应商管理ServiceImpl.java index 1764129..fb4cd2b 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/供应商管理ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/入库ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/入库ServiceImpl.java index f656256..97bff4b 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/入库ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/出库ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/出库ServiceImpl.java index a2dfca1..10ffb6a 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/出库ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/发票管理ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/发票管理ServiceImpl.java index e7b48ca..ce9950d 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/发票管理ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/应付账款ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/应付账款ServiceImpl.java index 1fa0bb9..4931346 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/应付账款ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/应收账款ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/应收账款ServiceImpl.java index 7a97254..bf65ccc 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/应收账款ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/盘点ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/盘点ServiceImpl.java index ccbdf8e..fd3778d 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/盘点ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/退货ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/退货ServiceImpl.java index b9f1549..73735c2 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/退货ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/txzz/impl/采购订单ServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/txzz/impl/采购订单ServiceImpl.java index f5d7050..7aecba1 100644 --- a/src/main/java/com/dsic/gj_erp/service/txzz/impl/采购订单ServiceImpl.java +++ b/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业务层处理 * diff --git a/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java b/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java index 38e4fc6..c8e6b9e 100644 --- a/src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/wsclient/handler/TipHandler.java b/src/main/java/com/dsic/gj_erp/wsclient/handler/TipHandler.java index ebe47b9..12243e1 100644 --- a/src/main/java/com/dsic/gj_erp/wsclient/handler/TipHandler.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java b/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java index 925f64f..347862b 100644 --- a/src/main/java/com/dsic/gj_erp/wsclient/handler/ZxHandler.java +++ b/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{ diff --git a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml index ab8ff6b..a27c722 100644 --- a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml +++ b/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 +