From 2efce27ab9e7df488a7c2c3bc640976311b71ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Sat, 12 Oct 2024 14:16:09 +0800 Subject: [PATCH 01/11] 1.111 --- .../com/dsic/gj_erp/controller/jhgk/DmSygdxqController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a602412..9521679 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 @@ -52,7 +52,8 @@ public class DmSygdxqController { .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh")) .ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("beginTime")))) .le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", DateUtil.endOfMonth(DateUtil.parseDate(map.get("endTime")))) - .orderByAsc("dc_ch, cast(dc_pl as int),xzglxq")); +// .orderByAsc("dc_ch, cast(dc_pl as int),xzglxq")); + .orderByAsc("dc_ch, dc_pl,xzglxq")); return new ResultBean(list); } From f0e35bbce9008633282d02fe6c0116ea79584322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 15 Oct 2024 10:59:52 +0800 Subject: [PATCH 02/11] =?UTF-8?q?1.=E6=B8=85=E7=90=86=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=A1=B9=202.=E4=BF=AE=E5=A4=8D=E9=98=85?= =?UTF-8?q?=E8=AF=BB=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug=203.=E5=A2=9E=E5=8A=A0ws?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=B0=83=E8=AF=95=E7=8E=AF=E5=A2=83=204.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ws?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/bean/jcsj/DmBom.java | 1 - .../com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java | 2 -- .../com/dsic/gj_erp/bean/jcsj/EmGcrl.java | 1 - .../com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java | 11 ---------- .../com/dsic/gj_erp/bean/jcsj/EmSbjbb.java | 5 ++++- .../com/dsic/gj_erp/bean/jcsj/EmSbjgry.java | 2 -- .../com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java | 2 -- .../com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java | 2 -- .../com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java | 2 -- .../com/dsic/gj_erp/bean/jhgk/DmSygd.java | 1 - .../com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 1 - .../com/dsic/gj_erp/bean/jhgk/DmTzjh.java | 2 -- .../com/dsic/gj_erp/bean/jhgk/DmXbjh.java | 2 -- .../com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java | 1 - .../com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java | 5 ----- .../com/dsic/gj_erp/bean/jhgk/DmZrcjh.java | 1 - .../com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java | 1 - .../com/dsic/gj_erp/bean/jhgk/dto/Pldto.java | 3 --- .../dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java | 1 - .../gj_erp/bean/jhgk/excel/GdxqExcel.java | 7 ------- .../gj_erp/bean/jhgk/excel/GdxqExcel1.java | 6 ------ .../dsic/gj_erp/bean/jhgk/excel/SyExcel.java | 2 -- .../com/dsic/gj_erp/bean/jiuzhou/Sljh.java | 2 -- .../com/dsic/gj_erp/bean/kc/ImCkwpkwp.java | 2 -- .../com/dsic/gj_erp/bean/pgd/DmPpxxb.java | 8 +++----- .../java/com/dsic/gj_erp/bean/pgd/PgdDh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdDmjh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdPkjh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdPwjh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdQgjh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdQmjh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdSljh.java | 3 ++- .../com/dsic/gj_erp/bean/pgd/PgdTzjh.java | 3 ++- .../java/com/dsic/gj_erp/bean/pgd/Qmqz.java | 4 ++-- .../com/dsic/gj_erp/bean/sy/SyDictItem.java | 2 -- .../java/com/dsic/gj_erp/bean/sy/SyLog.java | 1 - .../config/MyPhysicalNamingStrategy.java | 1 - .../controller/jhgk/DmSygdMxController.java | 17 ---------------- ...日程批量表合并导入控制器.java | 13 +++++++----- .../gj_erp/dao/jcsj/EmGcrlRepository.java | 1 - .../gj_erp/dao/jcsj/EmSbjbbRepository.java | 1 - .../gj_erp/dao/jcsj/EmSbrydypRepository.java | 1 - .../gj_erp/dao/jhgk/DmJtsyjhRepository.java | 1 - .../gj_erp/mapper/jcsj/EmSbjbbMapper.java | 8 -------- .../gj_erp/mapper/jcsj/EmSbjgryMapper.java | 1 - .../gj_erp/mapper/jhgk/DmJtsyjhMapper.java | 1 - .../gj_erp/mapper/jhgk/DmSygdxqMapper.java | 2 -- .../dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java | 1 - .../dsic/gj_erp/mapper/pgd/PgdDhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java | 3 +-- .../dsic/gj_erp/mapper/pgd/PgdSljhMapper.java | 2 +- .../dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java | 2 +- .../mapper/txzz/应付账款Mapper.java | 1 - .../dsic/gj_erp/mapper/txzz/盘点Mapper.java | 1 - .../dsic/gj_erp/mapper/txzz/退货Mapper.java | 1 - .../mapper/txzz/采购订单Mapper.java | 1 - .../java/com/dsic/gj_erp/pc/DataFactory.java | 5 ++++- src/main/java/com/dsic/gj_erp/pc/Manager.java | 1 - .../com/dsic/gj_erp/pc/dto/工序产能.java | 2 -- .../java/com/dsic/gj_erp/pc/dto/资源.java | 1 - .../gj_erp/pc/service/三月滚动接口.java | 2 -- .../gj_erp/pc/service/工序CD接口.java | 1 - .../订货计划滚动信息接口.java | 2 -- .../gj_erp/pc/service/设备产能接口.java | 5 ++++- .../gj_erp/service/jcsj/EmGcrlService.java | 1 - .../jcsj/impl/BomUploadServiceImpl.java | 6 ------ .../service/jcsj/impl/DmBomServiceImpl.java | 2 -- .../service/jcsj/impl/EmGcrlServiceImpl.java | 11 +++------- .../service/jcsj/impl/EmSbcnpServiceImpl.java | 1 - .../service/jcsj/impl/EmSbjbbServiceImpl.java | 2 -- .../jcsj/impl/EmSbjgryServiceImpl.java | 10 ---------- .../jcsj/impl/EmSbrydypServiceImpl.java | 1 - .../jhgk/impl/DmSygdMxServiceImpl.java | 6 +++++- .../gj_erp/service/pgd/DmPpxxbService.java | 1 - .../dsic/gj_erp/service/pgd/PgdDhService.java | 3 +-- .../gj_erp/service/pgd/PgdDmjhService.java | 4 +--- .../gj_erp/service/pgd/PgdPkjhService.java | 3 +-- .../gj_erp/service/pgd/PgdPwjhService.java | 3 +-- .../gj_erp/service/pgd/PgdQgjhService.java | 3 +-- .../gj_erp/service/pgd/PgdQmjhService.java | 3 +-- .../gj_erp/service/pgd/PgdSljhService.java | 3 +-- .../gj_erp/service/pgd/PgdTzjhService.java | 2 +- .../service/pgd/impl/PgdDhServiceImpl.java | 4 +--- .../service/pgd/impl/PgdDmjhServiceImpl.java | 5 +---- .../service/pgd/impl/PgdPkjhServiceImpl.java | 4 +--- .../service/pgd/impl/PgdPwjhServiceImpl.java | 3 +-- .../service/pgd/impl/PgdQgjhServiceImpl.java | 4 +--- .../service/pgd/impl/PgdQmjhServiceImpl.java | 4 +--- .../service/pgd/impl/PgdSljhServiceImpl.java | 9 +-------- .../service/pgd/impl/PgdTzjhServiceImpl.java | 4 +--- .../com/dsic/gj_erp/service/sy/SYService.java | 5 ----- .../sy/impl/SyDictItemServiceImpl.java | 2 +- .../service/sy/impl/SyDictServiceImpl.java | 4 ++-- .../java/com/dsic/gj_erp/util/ExcelUtil.java | 4 ---- .../java/com/dsic/gj_erp/util/FileUtil.java | 1 - .../java/com/dsic/gj_erp/util/IPUtils.java | 20 ++++++++++--------- .../com/dsic/gj_erp/ws/WsInitListener.java | 1 - .../com/dsic/gj_erp/ws/WsStopListener.java | 1 - src/main/resources/application-localws.yml | 13 ++++++++++++ src/main/resources/application-ws.yml | 4 ++-- 104 files changed, 102 insertions(+), 247 deletions(-) create mode 100644 src/main/resources/application-localws.yml diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java index d5610e6..12a68b7 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.data.annotation.Id; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java index dbf2b5d..9ebb6b9 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.bean.jcsj; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.dsic.gj_erp.bean.jhgk.DmZrcjh; import com.dsic.gj_erp.bean.jhgk.excel.ZrcAndPlb; import com.dsic.gj_erp.exception.ServiceException; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java index b4501a6..bb45952 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java index ecfc921..cf73d2e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java @@ -1,20 +1,9 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dsic.gj_erp.bean.jhgk.DmSygdxq; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; -import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; /** *

diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java index 8f0b0e9..07e576b 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java @@ -1,6 +1,9 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java index f8a324f..dee6ef1 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java @@ -1,9 +1,7 @@ package com.dsic.gj_erp.bean.jcsj; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java index d9c296f..b9df005 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java index ccec210..b36d318 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; import java.io.Serializable; /** diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java index 1219fb5..b61cd54 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java @@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java index 88051a1..5e4bbad 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.List; /** *

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 b029d78..a820ec4 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 @@ -13,7 +13,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.math.BigDecimal; /** *

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java index 0a3eb43..81709d1 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; import java.io.Serializable; /** diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java index 9834ad5..8630bce 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java @@ -1,8 +1,6 @@ package com.dsic.gj_erp.bean.jhgk; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java index 8e18e87..982e872 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.poi.ooxml.POIXMLDocumentPart; import java.io.Serializable; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java index dcb781b..1c8aaed 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java @@ -1,12 +1,7 @@ package com.dsic.gj_erp.bean.jhgk; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serializable; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java index 4bf117d..f6a8032 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.bean.jhgk; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.annotation.ExcelIgnore; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java index 9fc1a9f..67c953f 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.bean.jhgk.dto; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java index 0a77c86..97657d5 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java @@ -1,11 +1,8 @@ package com.dsic.gj_erp.bean.jhgk.dto; import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; -import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import lombok.Data; -import java.util.List; - @Data public class Pldto extends DmCzplpNew { diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java index a990497..e7d345d 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java @@ -4,7 +4,6 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmXbjh; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @Data diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java index 27e99eb..f29197c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java @@ -3,15 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; /** *

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java index 8beba9f..8a6a051 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java @@ -3,14 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; /** *

diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java index 162df6c..92e7a6e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java @@ -1,9 +1,7 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java index 3ba8303..ad3f32c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java @@ -7,8 +7,6 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh; import lombok.Getter; import lombok.Setter; -import java.util.Random; - @Getter @Setter @TableName("im_slxx") diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java index 9e93bfb..bfb6773 100644 --- a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java +++ b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java @@ -1,8 +1,6 @@ package com.dsic.gj_erp.bean.kc; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java index 5f55447..ec49116 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java @@ -1,17 +1,15 @@ package com.dsic.gj_erp.bean.pgd; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java index 68b3327..c9c2fa0 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java index 6973b85..636baa5 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java index 3ac9acf..5eece15 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java index 1304dc3..99f2230 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java index 9fabac8..0625d95 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java index bb7d0ac..e989dab 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java index 0e28c4c..d9af066 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java index 90d0b67..c6080ad 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java index 78a2951..6bba1f9 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java @@ -1,12 +1,12 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java index 465bd72..282b6af 100644 --- a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java +++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.bean.sy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -12,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.math.BigDecimal; /** *

diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java index 692c323..013ede4 100644 --- a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java +++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.bean.sy; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; - import com.dsic.gj_erp.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java index 685c5fb..b1facbb 100644 --- a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java +++ b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.config; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java index 55a4b0b..a929cdb 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java @@ -1,42 +1,25 @@ package com.dsic.gj_erp.controller.jhgk; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; -import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; -import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; -import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import com.dsic.gj_erp.bean.jcsj.excel.PlExcel; -import com.dsic.gj_erp.bean.jhgk.DmQfxq; -import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmYdjhxf; import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel; -import com.dsic.gj_erp.handler.ComputePlan; import com.dsic.gj_erp.listeners.ExcelJhxfListener; -import com.dsic.gj_erp.listeners.ExcelPlListener; -import com.dsic.gj_erp.pc.Manager; -import com.dsic.gj_erp.pc.排产; import com.dsic.gj_erp.service.jcsj.EmGcrlService; import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; -import com.dsic.gj_erp.service.sy.SYService; -import com.sun.org.apache.bcel.internal.generic.RETURN; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.*; -import java.util.concurrent.Semaphore; import java.util.stream.Collectors; /** 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 0737792..efc1c84 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jcsj.DmCzplp; import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; @@ -46,6 +47,7 @@ public class 中日程批量表合并导入控制器 { private final DmZrcjhOldService oldService; @PostMapping("upload") + @AuthFunction @Transactional(rollbackFor = Exception.class) public ResultBean upload(@RequestParam("file") MultipartFile file,String dcCh, HttpServletRequest req) throws IOException { ExcelZrcAndPlb excelZrcAndPlb = new ExcelZrcAndPlb(); @@ -75,15 +77,16 @@ public class 中日程批量表合并导入控制器 { if (ObjectUtil.isNotEmpty(dmZrcjhOne)) { //存进备份表 DmZrcjhOld old= BeanUtil.copyProperties(dmZrcjhOne, DmZrcjhOld.class); + old.setXh(null); oldService.save(old); String dmZrcjhOneBzr = dmZrcjhOne.getBzr(); String dmZrcjhOneBzrq = dmZrcjhOne.getBzrq(); if (!dmZrcjhOneBzr.contains(bzr)) { dmZrcjh.setBzr(StrUtil.format("{}@{}",dmZrcjhOneBzr , bzr)); dmZrcjh.setBzrq(StrUtil.format("{}@{}",dmZrcjhOneBzrq , day)); - dmZrcjh.setXh(dmZrcjhOne.getXh()); } - zrcjhService.updateById(dmZrcjh); + dmZrcjh.setXh(dmZrcjhOne.getXh()); + zrcjhList.add(dmZrcjh); } else { dmZrcjh.setBzr(bzr); dmZrcjh.setBzrq(day); @@ -99,8 +102,8 @@ public class 中日程批量表合并导入控制器 { fdList.stream().filter(fst -> plb.getDcPl().equals(fst.getDcPl())) .findFirst().ifPresent(it->updateCzPlp(plb,it)); }catch (Exception ignored){} + plList.add(plb); } - plList.add(plb); //旧表数据,仅当首次导入时写入即可 if (!remove){ @@ -111,7 +114,7 @@ public class 中日程批量表合并导入控制器 { } } } - zrcjhService.saveBatch(zrcjhList,500); + zrcjhService.saveOrUpdateBatch(zrcjhList,500); if (!plList.isEmpty()) { czplpNewService.saveBatch(plList,500); @@ -139,7 +142,7 @@ public class 中日程批量表合并导入控制器 { dmCzplpService.saveBatch(dmCzplpList); } - return new ResultBean<>(); + return new ResultBean<>(zrcjhList); } private void updateCzPlp(DmCzplpNew czplpNew,DmCzplpNew czplp){ diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java index 95a9059..95cf6eb 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jcsj; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java index efda05b..4cdaa49 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jcsj; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import com.dsic.gj_erp.bean.sy.Dm_zhbmlbp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java index ee76802..5da5616 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.dao.jcsj; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbrydyp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java b/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java index cb5db63..54e7fdc 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jhgk; import com.dsic.gj_erp.bean.jhgk.DmJtsyjh; -import com.dsic.gj_erp.bean.jhgk.DmXbjh; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java index a1fb2a2..70adf07 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java @@ -1,18 +1,10 @@ package com.dsic.gj_erp.mapper.jcsj; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import org.mapstruct.Mapper; -import java.io.Serializable; -import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.function.Function; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java index d5d70d3..4edd813 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.jcsj; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbjgry; /** diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java index 6289d9d..00c78bc 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.mapper.jhgk; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jhgk.DmJtsyjh; -import io.lettuce.core.dynamic.annotation.Param; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java index e0b4180..79a7bc5 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java @@ -2,10 +2,8 @@ package com.dsic.gj_erp.mapper.jhgk; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj; import com.dsic.gj_erp.bean.jhgk.DmSygdxq; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java index 7e66d8a..b77ae32 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.pgd; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.DmPpxxb; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java index b600521..4f9b3c7 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdDh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java index a756191..ed0ae99 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdDmjh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java index ff77df2..abd38d8 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdPkjh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java index 8e60cbe..47e1b90 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java index 350a2e0..d53f257 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdQgjh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java index 7c3a54f..a6bede6 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java @@ -1,9 +1,8 @@ package com.dsic.gj_erp.mapper.pgd; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdQmjh; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.pgd.Qmqz; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java index 3725126..39ff74a 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdSljh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java index c8016c1..0037445 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java index 37cdb6d..f4a484f 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.应付账款; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java index 83af2da..0dcbe14 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.盘点; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java index 8644722..faf5fc1 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.退货; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java index c6872ca..de2869e 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.采购订单; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java index 03aff28..45eb3ea 100644 --- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java +++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java @@ -19,7 +19,10 @@ import com.dsic.gj_erp.pc.dto.data.钢料需求; import com.dsic.gj_erp.pc.dto.gx.*; import com.dsic.gj_erp.pc.dto.sb.*; import com.dsic.gj_erp.pc.dto.tlt.*; -import com.dsic.gj_erp.pc.dto.*; +import com.dsic.gj_erp.pc.dto.套料图工序; +import com.dsic.gj_erp.pc.dto.工序产能; +import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.dto.资源; import com.dsic.gj_erp.pc.service.工序CD接口; import com.dsic.gj_erp.pc.service.订货计划滚动信息接口; import com.dsic.gj_erp.pc.service.设备产能接口; diff --git a/src/main/java/com/dsic/gj_erp/pc/Manager.java b/src/main/java/com/dsic/gj_erp/pc/Manager.java index 023a28f..62c9eaf 100644 --- a/src/main/java/com/dsic/gj_erp/pc/Manager.java +++ b/src/main/java/com/dsic/gj_erp/pc/Manager.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.pc; import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; import com.dsic.gj_erp.pc.dto.data.Bom; -import com.dsic.gj_erp.pc.dto.data.钢料需求; import com.dsic.gj_erp.pc.dto.资源; import java.util.ArrayList; diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java b/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java index f542138..68901ca 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java @@ -6,8 +6,6 @@ import com.dsic.gj_erp.pc.service.工序排产处理接口; import lombok.Getter; import lombok.Setter; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/资源.java b/src/main/java/com/dsic/gj_erp/pc/dto/资源.java index a6e32f4..9769f50 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/资源.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/资源.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.dto; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.data.Bom; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index 91eab79..9d60d51 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.service; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.bean.ResultBean; @@ -15,7 +14,6 @@ import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdService; -import com.dsic.gj_erp.service.jhgk.impl.DmSygdMxLjServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java index 6d56d34..fc257c1 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.pc.service; import com.dsic.gj_erp.pc.工序CD; -import com.dsic.gj_erp.pc.设备产能; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java b/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java index 64a8a26..431a04e 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java @@ -1,7 +1,5 @@ package com.dsic.gj_erp.pc.service; -import com.dsic.gj_erp.bean.jhgk.DmSygd; -import com.dsic.gj_erp.pc.工序CD; import com.dsic.gj_erp.pc.订货计划; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java index 82590e6..a85fe4a 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java @@ -8,7 +8,10 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; @Service @AllArgsConstructor diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java index 454c84c..e193d82 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java @@ -4,7 +4,6 @@ package com.dsic.gj_erp.service.jcsj; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index 0d1dfc3..6f583a8 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dsic.gj_erp.bean.ResultBean; @@ -18,14 +17,9 @@ import com.dsic.gj_erp.service.jcsj.*; import com.dsic.gj_erp.service.jhgk.DmTzjhService; import com.dsic.gj_erp.service.sy.SYService; import org.apache.commons.lang3.StringUtils; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.text.PDFTextStripper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import javax.script.ScriptException; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java index bddad2e..de178f2 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.service.jcsj.impl; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -12,7 +11,6 @@ import com.dsic.gj_erp.bean.jcsj.vo.BomVO; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.mapper.jcsj.DmBomMapper; import com.dsic.gj_erp.service.jcsj.DmBomService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java index 4f1d906..6b93557 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java @@ -1,29 +1,24 @@ package com.dsic.gj_erp.service.jcsj.impl; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository; import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper; import com.dsic.gj_erp.service.jcsj.EmGcrlService; -import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.time.DayOfWeek; import java.time.LocalDate; -import java.time.Period; -import java.time.Year; import java.time.format.DateTimeFormatter; import java.time.temporal.WeekFields; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; /** *

diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java index 4fbf036..9139f5e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java index 0251e8a..99af377 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.service.jcsj.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import com.dsic.gj_erp.bean.jcsj.EmSbjbb; import com.dsic.gj_erp.bean.request.EmSbjbbBean; import com.dsic.gj_erp.dao.jcsj.EmSbjbbRepository; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java index cb87b18..dd056f9 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java @@ -1,22 +1,12 @@ package com.dsic.gj_erp.service.jcsj.impl; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbjgry; -import com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper; import com.dsic.gj_erp.mapper.jcsj.EmSbjgryMapper; -import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jcsj.EmSbjgryService; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - /** *

* 服务实现类 diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java index 2355052..d4638cb 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java @@ -15,7 +15,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** *

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 2a601db..3b81dbc 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 @@ -26,7 +26,6 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper; import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jhgk.*; import com.dsic.gj_erp.util.MyString; -import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -912,6 +911,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i List list2=new ArrayList<>(); //按批次合并为一行 collect.forEach((key,val)->{ + List tzbhList=new ArrayList<>(); Set plSet=new HashSet<>(); DmYdjhxf dmYdjhxf = new DmYdjhxf(); dmYdjhxf.setDcCh(key.split("_")[0]); @@ -927,6 +927,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i AtomicReference skbs= new AtomicReference<>(0); AtomicReference skbs2= new AtomicReference<>(0); val.forEach(item-> { + if (tzbhList.contains(item.getTzbh())){ + return; + } + tzbhList.add(item.getTzbh()); plSet.add(item.getDcFd()); if (slkw.contains(item.getKw())){ bs.updateAndGet(v -> v + 1); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java b/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java index c4c712b..3280fdf 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.DmPpxxb; -import com.baomidou.mybatisplus.extension.service.IService; import com.github.jeffreyning.mybatisplus.service.IMppService; /** diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java index 5961366..b17d354 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java @@ -1,8 +1,7 @@ package com.dsic.gj_erp.service.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDh; import com.baomidou.mybatisplus.extension.service.IService; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; +import com.dsic.gj_erp.bean.pgd.PgdDh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java index e8d1567..5b01d54 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.service.pgd; +import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdDmjh; -import com.baomidou.mybatisplus.extension.service.IService; -import com.dsic.gj_erp.bean.pgd.PgdPkjh; -import com.dsic.gj_erp.bean.pgd.Qmqz; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java index 5f701cd..1002924 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java @@ -1,9 +1,8 @@ package com.dsic.gj_erp.service.pgd; +import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPkjh; -import com.baomidou.mybatisplus.extension.service.IService; -import com.dsic.gj_erp.bean.pgd.PgdQmjh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java index a58d591..dc069cf 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java @@ -1,8 +1,7 @@ package com.dsic.gj_erp.service.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDh; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java index 7ea12b2..ebae263 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java @@ -1,8 +1,7 @@ package com.dsic.gj_erp.service.pgd; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdQgjh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java index b278726..830f6cf 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java @@ -1,9 +1,8 @@ package com.dsic.gj_erp.service.pgd; +import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; -import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.pgd.Qmqz; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java index aacb981..8a44904 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java @@ -1,8 +1,7 @@ package com.dsic.gj_erp.service.pgd; -import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.baomidou.mybatisplus.extension.service.IService; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; +import com.dsic.gj_erp.bean.pgd.PgdSljh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java index ed0483d..a2cef74 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.service.pgd; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java index 9b306e9..f81ccfb 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java @@ -1,17 +1,15 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.pgd.PgdDh; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.mapper.pgd.PgdDhMapper; import com.dsic.gj_erp.service.pgd.PgdDhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java index b169f48..55255d8 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java @@ -1,15 +1,12 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdDmjh; -import com.dsic.gj_erp.bean.pgd.PgdPkjh; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.mapper.pgd.PgdDmjhMapper; import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdDmjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.service.sy.SYService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java index 3552b67..fba5607 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java @@ -1,14 +1,12 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPkjh; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; -import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.dsic.gj_erp.mapper.pgd.PgdPkjhMapper; import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdPkjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.service.sy.SYService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java index 537bd45..2dfe317 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java @@ -1,11 +1,10 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.pgd.PgdPwjh; -import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.dsic.gj_erp.mapper.pgd.PgdPwjhMapper; import com.dsic.gj_erp.service.pgd.PgdPwjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java index e80dd0c..7375eb2 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java @@ -1,12 +1,10 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.pgd.PgdQgjh; -import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.dsic.gj_erp.mapper.pgd.PgdQgjhMapper; import com.dsic.gj_erp.service.pgd.PgdQgjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java index 3fd3c53..fbbf77a 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java @@ -4,15 +4,13 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; -import com.dsic.gj_erp.bean.pgd.PgdPkjh; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.dsic.gj_erp.bean.pgd.Qmqz; import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper; import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdQmjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.service.sy.SYService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java index 4bd22e1..b890506 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java @@ -2,14 +2,10 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.dsic.gj_erp.bean.jhgk.DmZrcjh; -import com.dsic.gj_erp.bean.pgd.PgdDh; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.pgd.PgdSljh; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.mapper.pgd.PgdSljhMapper; -import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.service.pgd.PgdSljhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -19,9 +15,6 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; -import static com.dsic.gj_erp.pc.Manager.from; -import static com.dsic.gj_erp.pc.Manager.to; - /** *

* 服务实现类 diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java index 9a8c273..983bda0 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java @@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.DmBchxjbp; import com.dsic.gj_erp.bean.jcsj.DmBclqjbp; import com.dsic.gj_erp.bean.pgd.PgdTzjh; @@ -10,10 +11,7 @@ import com.dsic.gj_erp.mapper.pgd.PgdTzjhMapper; import com.dsic.gj_erp.service.jcsj.DmBchxjbpService; import com.dsic.gj_erp.service.jcsj.DmBclqjbpService; import com.dsic.gj_erp.service.pgd.PgdTzjhService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; -import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java index c417f6b..35463d2 100644 --- a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java +++ b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java @@ -6,29 +6,24 @@ import cn.hutool.core.util.ObjectUtil; import com.dsic.gj_erp.bean.sy.*; import com.dsic.gj_erp.dao.sy.*; import com.dsic.gj_erp.mapper.SyuserMapper; -import com.dsic.gj_erp.util.MD5Util; import com.querydsl.core.Tuple; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.PostConstruct; import javax.persistence.EntityManager; -import javax.xml.bind.DatatypeConverter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.alibaba.excel.util.StringUtils.isEmpty; - /** * 系统安全子系统处理逻辑 */ diff --git a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java index 93615a4..20bd3b5 100644 --- a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java @@ -9,8 +9,8 @@ import com.dsic.gj_erp.service.sy.SyDictItemService; import com.dsic.gj_erp.util.CacheConstant; import com.dsic.gj_erp.util.ConditionSelect; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java index 79257ed..7e02866 100644 --- a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java @@ -7,9 +7,9 @@ import com.dsic.gj_erp.bean.sy.SyDict; import com.dsic.gj_erp.bean.tree.ProjectTreeVo; import com.dsic.gj_erp.mapper.SyDictMapper; import com.dsic.gj_erp.service.sy.SyDictService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java index ae3b11c..2daccf4 100644 --- a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java +++ b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java @@ -1,9 +1,6 @@ package com.dsic.gj_erp.util; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsic.gj_erp.bean.jhgk.DmJtsyjh; -import com.dsic.gj_erp.bean.jhgk.DmXbjh; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -13,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; diff --git a/src/main/java/com/dsic/gj_erp/util/FileUtil.java b/src/main/java/com/dsic/gj_erp/util/FileUtil.java index 873759a..0f0061c 100644 --- a/src/main/java/com/dsic/gj_erp/util/FileUtil.java +++ b/src/main/java/com/dsic/gj_erp/util/FileUtil.java @@ -10,7 +10,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Optional; -import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; public class FileUtil { diff --git a/src/main/java/com/dsic/gj_erp/util/IPUtils.java b/src/main/java/com/dsic/gj_erp/util/IPUtils.java index dc893a2..0a2c640 100644 --- a/src/main/java/com/dsic/gj_erp/util/IPUtils.java +++ b/src/main/java/com/dsic/gj_erp/util/IPUtils.java @@ -1,15 +1,17 @@ package com.dsic.gj_erp.util; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.apache.commons.lang3.StringUtils; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.*; -import java.util.Enumeration; + import javax.servlet.http.HttpServletRequest; + import java.io.BufferedReader; + import java.io.IOException; + import java.io.InputStreamReader; + import java.net.Inet4Address; + import java.net.InetAddress; + import java.net.NetworkInterface; + import java.util.Enumeration; /** * IP地址 diff --git a/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java b/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java index 30fd3d6..d37146f 100644 --- a/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java +++ b/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.ws; import com.corundumstudio.socketio.SocketIOServer; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java b/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java index 89fd5d0..63b1dbf 100644 --- a/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java +++ b/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.ws; import com.corundumstudio.socketio.SocketIOServer; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextClosedEvent; import org.springframework.stereotype.Component; diff --git a/src/main/resources/application-localws.yml b/src/main/resources/application-localws.yml new file mode 100644 index 0000000..fbc2ea4 --- /dev/null +++ b/src/main/resources/application-localws.yml @@ -0,0 +1,13 @@ +ws: + host: 0.0.0.0 + port: 23456 + workCount: 100 + allowCustomRequests: true + upgradeTimeout: 10000 + pingTimeout: 60000 + pingInterval: 25000 + maxHttpContentLength: 1048576 + maxFramePayloadLength: 1048576 + client: + url: ws://192.168.18.1:9000 + id: 100000000001 \ No newline at end of file diff --git a/src/main/resources/application-ws.yml b/src/main/resources/application-ws.yml index 2e17433..c6a5680 100644 --- a/src/main/resources/application-ws.yml +++ b/src/main/resources/application-ws.yml @@ -9,5 +9,5 @@ ws: maxHttpContentLength: 1048576 maxFramePayloadLength: 1048576 client: - url: ws://192.168.13.9:9000 - id: abc \ No newline at end of file + url: ws://127.0.0.1:9000 + id: 100000000001 \ No newline at end of file From 76e7fe7d66768706b3a3e8edfa115eacdb205317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 16 Oct 2024 10:23:52 +0800 Subject: [PATCH 03/11] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84excel=E4=B8=8A=E4=BC=A0=E9=AA=8C=E8=AF=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jhgk/三月滚动排产控制器.java | 7 +++--- ...日程批量表合并导入控制器.java | 5 +++- .../gj_erp/pc/service/三月滚动接口.java | 23 +++++++++---------- .../jhgk/impl/DmSygdMxServiceImpl.java | 11 +++++++-- 4 files changed, 28 insertions(+), 18 deletions(-) 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 7e8d38e..e1d552f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java @@ -49,7 +49,7 @@ public class 三月滚动排产控制器 { } catch (RuntimeException e) { e.printStackTrace(); ResultBean resultBean = new ResultBean<>(); - resultBean.setStatus(10000); + resultBean.setStatus(10001); resultBean.setSuccess(false); resultBean.setMessage(e.getMessage()); return resultBean; @@ -69,17 +69,18 @@ public class 三月滚动排产控制器 { HashMap map = new HashMap<>(); if (from.equals(Manager.from)&&to.equals(Manager.to)){ - semaphore.release(); map.put("zy",Manager.资源池); + semaphore.release(); return new ResultBean<>(map); } try { 排产.execute(from,to); + map.put("zy",Manager.资源池); }finally { semaphore.release(); } - map.put("zy",Manager.资源池); + return new ResultBean<>(map); } 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 efc1c84..3b6449d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java @@ -61,6 +61,9 @@ public class 中日程批量表合并导入控制器 { String bzr = (String) req.getAttribute("yhms"); String day=DateUtil.date().toString("yyyy/MM/dd"); for(ZrcAndPlb item:objList){ + if (item.getMfd()==null){ + continue; + } String[] fds = item.getMfd().split("/"); List fdList = czplpNewService.list(new QueryWrapper().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh)); boolean remove = czplpNewService.remove(new QueryWrapper().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh)); @@ -102,8 +105,8 @@ public class 中日程批量表合并导入控制器 { fdList.stream().filter(fst -> plb.getDcPl().equals(fst.getDcPl())) .findFirst().ifPresent(it->updateCzPlp(plb,it)); }catch (Exception ignored){} - plList.add(plb); } + plList.add(plb); //旧表数据,仅当首次导入时写入即可 if (!remove){ diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index 9d60d51..b20c400 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java @@ -33,8 +33,6 @@ public class 三月滚动接口 { private final DmSygdMxService sygdMxService; private final DmSygdService sygdService; - - @Transactional public ResultBean 生成三月滚动(String begin, String end) { //清理历史数据 @@ -74,17 +72,18 @@ public class 三月滚动接口 { sygdMxService.saveBatch(mxList,500); - ljList.forEach(lj-> mxList.forEach(mx->{ - if (lj.getDcch().equals(mx.getDcCh()) - &&lj.getPl().equals(mx.getDcPl()) - && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){ - lj.setParentId(mx.getId()); - } - })); - ljService.saveBatch(ljList,500); + new Thread(()->{ + ljList.forEach(lj-> mxList.forEach(mx->{ + if (lj.getDcch().equals(mx.getDcCh()) + &&lj.getPl().equals(mx.getDcPl()) + && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){ + lj.setParentId(mx.getId()); + } + })); + ljService.saveBatch(ljList,500); + }).start(); List list= sygdMxService.tqSygd1(begin,end); - ResultBean r = new ResultBean(list); - return r; + return new ResultBean<>(list); } } 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 3b81dbc..d2ba251 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 @@ -906,8 +906,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl i private List tqSygd2(String begin,String end){ List slkw=Arrays.asList("7","8","9","5","6","15","11","14"); - List list = this.list(Wrappers.lambdaQuery().between(DmSygdMx::getJssj, begin, end)); + List list = this.list(Wrappers.lambdaQuery() + .between(DmSygdMx::getJssj, begin, end) + .orderBy(true,true,DmSygdMx::getDcCh,DmSygdMx::getDcPl,DmSygdMx::getSlrq) + ); Map> collect = list.stream().collect(Collectors.groupingBy(item -> item.getDcCh() +"_"+ item.getDcPl())); + List list2=new ArrayList<>(); //按批次合并为一行 collect.forEach((key,val)->{ @@ -1005,8 +1009,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i dmYdjhxf.setSkpt(skpt.get()+""); val.stream().filter(item->"6".equals(item.getKw())) .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())); + dmYdjhxf.setSkbs(skbs.get()+""); val.stream().filter(item->"15".equals(item.getKw())) .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setSkqgks(item.getQgrq())); @@ -1021,7 +1027,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i dmYdjhxf.setFdxq(val.get(0).getJssj()); list2.add(dmYdjhxf); }); - return list2; +// 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()); } @Transactional From 97ba5d2f7ba06ec8330c2e30934aae6508cc4b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 16 Oct 2024 11:44:39 +0800 Subject: [PATCH 04/11] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=E6=97=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?bom=E7=9A=84=E9=80=BB=E8=BE=91=202.=E4=BF=AE=E6=AD=A3=E6=9C=88?= =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 26 +++++++++++++++++ .../jhgk/impl/DmSygdMxServiceImpl.java | 28 +++++++++++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) 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 a820ec4..d26184c 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 @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.dsic.gj_erp.bean.jcsj.DmBom; import com.dsic.gj_erp.pc.Constant; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -317,4 +318,29 @@ public class DmSygdMx implements Serializable { return mx; } + public void setBomData(DmBom bom){ + this.lqlb=bom.getLqlb(); + this.tzbh=bom.getTzbh(); + this.wpgg=bom.getWpgg(); + this.wpxh=bom.getWpcz(); + this.hxcd=bom.getHxcd().doubleValue(); + this.dmcd=bom.getDmcd().doubleValue(); + this.qgcd=bom.getQgcd().doubleValue(); + this.qbs=bom.getQbs(); + try { + this.pklx=Double.valueOf(bom.getPklx()); + }catch (Exception ignored){} + this.pkcd=bom.getPkcd().doubleValue(); + this.ljsl=bom.getLjsl().doubleValue(); + this.zl=bom.getZl(); + this.xcms=bom.getXcshms().doubleValue(); + 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(); + this.ylbhgg=bom.getYlbhgg(); + } } 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 d2ba251..c9106f0 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 @@ -23,6 +23,7 @@ import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.handler.ComputePlan; 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.util.MyString; @@ -61,6 +62,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i private EmSbcnpService sbcnpService; @Autowired Dm_zhbmpRepository dm_zhbmpRepository; + @Autowired + DmBomService bomService; public Map> getMxMap(String begin,String end){ @@ -1276,10 +1279,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } zz=zz+skbs; } - map.put(dcch+dcpl,insertsOne); + map.put(dcch+"_"+dcpl,insertsOne); }{ - List insertsOne = map.get(dcch + dcpl); + List insertsOne = map.get(dcch +"_"+ dcpl); int yklm=0; @@ -1410,7 +1413,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } zz=zz+skbs; } - map.put(dcch+dcpl,insertsOne); + map.put(dcch+"_"+dcpl,insertsOne);//这里改为用"_"分割,方便后面逻辑调用 } @@ -1426,6 +1429,22 @@ public class DmSygdMxServiceImpl extends ServiceImpl i 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 for (DmSygdMx item : value) { // 对每个DmSygdMx对象进行操作 @@ -1436,9 +1455,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl i .eq("dc_fd",item.getDcFd()) ); - - - } for (DmSygdMx item : value) { item.setId(IdWorker.get32UUID()); From a7befc9804701c6c1d4810050dbaee51d3d91e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 16 Oct 2024 16:58:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E4=B8=8A=E6=96=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF=E7=9A=84bug=202.?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E7=BC=96?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E9=80=89=E6=8B=A9=E5=88=97=203.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 c9106f0..9e59df4 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 @@ -972,9 +972,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i dmYdjhxf.setBs(Double.valueOf(bs.get())); //上料日期 - DmSygdMx minSlrq=val.stream().filter(item->StrUtil.isNotEmpty(item.getSlrq())) - .min(Comparator.comparing(DmSygdMx::getSlrq)).get(); - dmYdjhxf.setSl(minSlrq.getSlrq()); + val.stream().filter(item->StrUtil.isNotEmpty(item.getSlrq())) + .min(Comparator.comparing(DmSygdMx::getSlrq)).ifPresent(item->dmYdjhxf.setSl(item.getSlrq())); //型材抛丸日期 val.stream().filter(item -> "16".equals(item.getKw())) 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 06/11] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=A1=B9=202.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5=E6=97=B6=E6=94=AF=E6=8C=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=B7=B2=E4=B8=8B=E5=8F=91=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=203.=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92,=E4=BD=9C=E4=B8=9A=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=8D=E5=86=8D=E6=A0=B9=E6=8D=AE=E5=8F=8C=E5=91=A8?= =?UTF-8?q?=E9=9C=80=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 + From 9b1a1a6efc258de08f56f44f949e5b574040788f 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:58:00 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98=202.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BA=BF=E8=A1=A8=E5=AF=BC=E5=85=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=89=88=E6=9C=AC=E5=8F=B7=E5=8A=9F=E8=83=BD,?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8C=87=E5=AE=9A=E7=BA=BF=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/Test.java | 5 +- .../com/dsic/gj_erp/bean/jhgk/DmXbjh.java | 2 +- .../controller/jhgk/DmSygdController.java | 8 +- .../gj_erp/service/jhgk/DmSygdMxService.java | 3 +- .../gj_erp/service/jhgk/DmSygdService.java | 4 +- .../jhgk/impl/DmSygdMxServiceImpl.java | 67 ++++++++++++- .../service/jhgk/impl/DmSygdServiceImpl.java | 62 ------------ .../service/jhgk/impl/DmXbjhServiceImpl.java | 94 ++++++++++--------- 8 files changed, 128 insertions(+), 117 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/Test.java b/src/main/java/com/dsic/gj_erp/Test.java index b4ad045..6da244f 100644 --- a/src/main/java/com/dsic/gj_erp/Test.java +++ b/src/main/java/com/dsic/gj_erp/Test.java @@ -1,5 +1,6 @@ package com.dsic.gj_erp; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import java.io.IOException; @@ -7,7 +8,9 @@ import java.io.IOException; public class Test { public static void main(String[] args) throws IOException { - System.out.println(StrUtil.padPre("1",3,"0")); + System.out.println(DateUtil.thisYear()); + +// System.out.println(StrUtil.padPre("1",3,"0")); //String aaa="gagagag"; //System.out.println(aaa.split("@")[0]); diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java index 8630bce..7f383e3 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java @@ -51,6 +51,6 @@ public class DmXbjh implements Serializable { @ApiModelProperty(value = "船号") private String dcCh; - + private int version; } 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 1d840a8..34ae684 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 @@ -80,15 +80,15 @@ public class DmSygdController { @PostMapping("/tj") @AuthFunction @ResponseBody - public ResultBean tj(@RequestBody List list){ - service.tj(list); + public ResultBean tj(String from,String to){ + mxService.tj(from,to); return new ResultBean(); } @ApiOperation(value = "批量审核") @PostMapping(value = "/sh") - public ResultBean sh(@RequestBody List dmSygds) { - service.sh(dmSygds); + public ResultBean sh(String from,String to) { + mxService.sh(from,to); return new ResultBean(); } 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 61d4624..eab0184 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 @@ -31,7 +31,8 @@ public interface DmSygdMxService extends IService { List tqSygd1(String begin, String end); Object cgjhdhqk(Map map); - + void tj(String from,String to); + void sh(String from,String to); void ydjhImport(List objList); } 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 6091495..3c4088d 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 @@ -21,8 +21,8 @@ public interface DmSygdService extends IService { 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/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index a600e8d..01e9e69 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 @@ -26,10 +26,7 @@ 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.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.service.jhgk.*; import com.dsic.gj_erp.util.MyString; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +65,68 @@ public class DmSygdMxServiceImpl extends ServiceImpl i Dm_zhbmpRepository dm_zhbmpRepository; @Autowired DmBomService bomService; + @Autowired + DmYdjhService ydjhService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void tj(String from,String to){ + List sygdMxes = this.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.updateBatchById(collect); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void sh(String from,String to){ + List sygdMxes = this.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.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); + } public Map> getMxMap(String begin,String end){ 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 6b28c30..c006024 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 @@ -35,9 +35,6 @@ import java.util.stream.Collectors; @AllArgsConstructor public class DmSygdServiceImpl extends ServiceImpl implements DmSygdService { - private final DmYdjhService ydjhService; - private final DmSygdMxService sygdMxService; - @Override @Transactional(rollbackFor = Exception.class) public Map uploadSy(List list, HttpServletRequest req){ @@ -70,19 +67,6 @@ 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) @@ -94,50 +78,4 @@ 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/DmXbjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java index b25fdd9..b1c0b61 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 @@ -1,10 +1,15 @@ package com.dsic.gj_erp.service.jhgk.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; 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.DmXbjh; import com.dsic.gj_erp.mapper.jhgk.DmXbjhMapper; @@ -17,6 +22,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -26,7 +33,7 @@ import java.util.stream.Collectors; /** *

- * 服务实现类 + * 服务实现类 *

* * @author xn @@ -40,69 +47,72 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme ModelMapper modelMapper; @Override - public Map> getList(JSONObject json) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - if(StringUtils.isNotEmpty(json.getString("dcCh"))){ - queryWrapper.eq("dc_ch",json.getString("dcCh")); + public Map> getList(JSONObject json) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (StringUtils.isNotEmpty(json.getString("dcCh"))) { + queryWrapper.eq("dc_ch", json.getString("dcCh")); } - if(StringUtils.isNotEmpty(json.getString("Zt"))){ - queryWrapper.eq("zt",json.getString("Zt")); + if (StringUtils.isNotEmpty(json.getString("Zt"))) { + queryWrapper.eq("zt", json.getString("Zt")); } - if(StringUtils.isNotEmpty(json.getString("nf"))){ - String nf=json.getString("nf"); - String startTime=nf.split("~")[0]; - String endTime=nf.split("~")[1]; - queryWrapper.between("nf",startTime,endTime); + if (StringUtils.isNotEmpty(json.getString("nf"))) { + String nf = json.getString("nf"); + String startTime = nf.split("~")[0]; + String endTime = nf.split("~")[1]; + queryWrapper.between("nf", startTime, endTime); } queryWrapper.orderByDesc("zl"); - List dmTzjhs=dmXbjhMapper.selectList(queryWrapper); - Map> map=dmTzjhs.stream() + List dmTzjhs = dmXbjhMapper.selectList(queryWrapper); + Map> map = dmTzjhs.stream() .collect(Collectors.groupingBy(DmXbjh::getDcCh)); - //对map的value进行排序，并返回降序以后的map集合 - LinkedHashMap> collect = map.entrySet().stream().sorted((entry1, entry2) -> { - Double zl1=entry1.getValue().stream().filter(l->ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); - Double zl2=entry2.getValue().stream().filter(l->ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); - //降序排序 - return zl2.compareTo(zl1); - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,(oldValue, newValue) -> oldValue, LinkedHashMap::new)); + //对map的value进行排序，并返回降序以后的map集合 + LinkedHashMap> collect = map.entrySet().stream().sorted((entry1, entry2) -> { + Double zl1 = entry1.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); + Double zl2 = entry2.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); + //降序排序 + return zl2.compareTo(zl1); + }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); return collect; } - - @Override + @Transactional public JSONObject upload(MultipartFile file) throws IOException { - // ExcelReader reader = ExcelUtil.getReader(file.getInputStream()); - //List dmXbjhs= ExcelUtil.readDmXbjh(file); - JSONObject dmXbjhs= ExcelUtil.readDmXbjh(file); + JSONObject dmXbjhs = ExcelUtil.readDmXbjh(file); + if (dmXbjhs != null) { + List listByNf = list(Wrappers.lambdaQuery().eq(DmXbjh::getNf, dmXbjhs.getString("nf"))); + this.save(dmXbjhs); -// List list=new ArrayList<>(); -// mapList.forEach(stringObjectMap -> { -// DmXbjh dmXbjh = modelMapper.map(stringObjectMap, DmXbjh.class); -// dmXbjh.setZt("0"); -// list.add(dmXbjh); -// }); - this.save(dmXbjhs); + String type = FileUtil.extName(file.getOriginalFilename()); + File uploadFile = new File("./线表计划"); + if (!uploadFile.exists()) { + uploadFile.mkdirs(); + } + int version = !listByNf.isEmpty() ? listByNf.get(0).getVersion() + 1 : 1; + File uploadFiles = new File(StrUtil.format("./线表计划/{}_{}{}{}", dmXbjhs.getString("nf"), version, StrUtil.DOT, type)); + + file.transferTo(uploadFiles); + } return dmXbjhs; } @Override @Transactional public void save(JSONObject json) { - List dmXbjhs=new ArrayList<>(); - for (String key:json.keySet()) { - JSONArray jsonArray=json.getJSONArray(key); - for (Object object:jsonArray) { - // JSONObject dmxb=JSONObject.parseObject(object.toString()); - DmXbjh dmXbjh= modelMapper.map(object,DmXbjh.class); + List dmXbjhs = new ArrayList<>(); + for (String key : json.keySet()) { + JSONArray jsonArray = json.getJSONArray(key); + for (Object object : jsonArray) { + // JSONObject dmxb=JSONObject.parseObject(object.toString()); + DmXbjh dmXbjh = modelMapper.map(object, DmXbjh.class); dmXbjh.setDcCh(key); dmXbjhs.add(dmXbjh); - this.remove(new QueryWrapper().eq("dc_ch",dmXbjh.getDcCh()) - .eq("nf",dmXbjh.getNf()) - .eq("yf",dmXbjh.getYf()) + this.remove(new QueryWrapper().eq("dc_ch", dmXbjh.getDcCh()) + .eq("nf", dmXbjh.getNf()) + .eq("yf", dmXbjh.getYf()) ); } } From 572ab4fac9cb6e6bad7093963244451f7fdbf17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 23 Oct 2024 11:50:08 +0800 Subject: [PATCH 08/11] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=BA=BF=E8=A1=A8?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5,=E6=8C=89=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=85=A5=E5=B9=B4=E4=BB=BD=E5=88=92=E5=88=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=202.=E4=BF=AE=E5=A4=8D=E6=9C=88?= =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jhgk/DmSygdController.java | 19 +------ .../gj_erp/service/jhgk/DmSygdMxService.java | 1 + .../jhgk/impl/DmSygdMxServiceImpl.java | 55 +++++++++++-------- .../service/jhgk/impl/DmXbjhServiceImpl.java | 37 +++++++++---- src/main/resources/application-xbjh.yml | 1 + 5 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 src/main/resources/application-xbjh.yml 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 34ae684..d43efcb 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 @@ -41,23 +41,8 @@ public class DmSygdController { @RequestMapping("/getList") @AuthFunction public ResultBean getList(@RequestBody DmSygd sygd){ -// List list= service.list(new QueryWrapper() -// .eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt()) -// .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime()) -// .le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime()) -// .orderByAsc("sl_sj,dc_ch,dc_pl") -// ); - List list= mxService.tqSygd1(sygd.getBeginTime(),sygd.getEndTime()); - Map map=new HashMap(); -// if (list.size()>0){ -// String beginTime=list.get(0).getGjjsXz(); -// String endTime=list.get(list.size()-1).getGjjsXz(); -// List emGcrls= gcrlService.list(new QueryWrapper().select("gl").between("gl",beginTime,endTime).eq("xxr","0")); -// List gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList()); -// map.put("gcrl",gcrl); -// } - map.put("list",list); - return new ResultBean(map); + List list= mxService.tqSygd2(sygd.getBeginTime(),sygd.getEndTime(),sygd.getGdZt()); + return new ResultBean(list); } @PostMapping("/upload") 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 eab0184..361e625 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 @@ -19,6 +19,7 @@ import java.util.Map; * @since 2023-10-09 */ public interface DmSygdMxService extends IService { + List tqSygd2(String from, String to,String zt); ResultBean sygdPC(); // List saveByDcch(HashMap> map); List getKwList(List list,String begin,String end); 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 01e9e69..81b97e6 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 @@ -71,31 +71,41 @@ public class DmSygdMxServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public void tj(String from,String to){ - List sygdMxes = this.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.updateBatchById(collect); + List sygdMxes = this.list(Wrappers.lambdaQuery() + .eq(DmSygdMx::getZt,"0") + .between(DmSygdMx::getJssj, from, to) + ); + if (ObjectUtil.isNotEmpty(sygdMxes)){ + List collect = sygdMxes.stream().map(dmSygd -> { + DmSygdMx dmSygdMx = new DmSygdMx(); + dmSygdMx.setId(dmSygd.getId()); + dmSygdMx.setZt("1"); + return dmSygdMx; + }).collect(Collectors.toList()); + this.updateBatchById(collect); + } } @Override @Transactional(rollbackFor = Exception.class) public void sh(String from,String to){ - List sygdMxes = this.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.updateBatchById(collect); - //生成作业计划 - new Thread(()->{ - this.generateYdjh(sygdMxes); - }).start(); + List sygdMxes = this.list(Wrappers.lambdaQuery() + .eq(DmSygdMx::getZt,"1") + .between(DmSygdMx::getJssj, from, to) + ); + if (ObjectUtil.isNotEmpty(sygdMxes)){ + List collect = sygdMxes.stream().map(dmSygd -> { + DmSygdMx dmSygdMx = new DmSygdMx(); + dmSygdMx.setId(dmSygd.getId()); + dmSygdMx.setZt("2"); + return dmSygdMx; + }).collect(Collectors.toList()); + this.updateBatchById(collect); + //生成作业计划 + new Thread(()->{ + this.generateYdjh(sygdMxes); + }).start(); + } } @Transactional(rollbackFor = Exception.class) @@ -970,9 +980,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i return new ResultBean(sygdList); } - private List tqSygd2(String begin,String end){ + public List tqSygd2(String begin,String end,String zt){ List slkw=Arrays.asList("7","8","9","5","6","15","11","14"); List list = this.list(Wrappers.lambdaQuery() + .eq(StrUtil.isNotEmpty(zt),DmSygdMx::getZt,zt) .between(DmSygdMx::getJssj, begin, end) .orderBy(true,true,DmSygdMx::getDcCh,DmSygdMx::getDcPl,DmSygdMx::getSlrq) ); @@ -1142,7 +1153,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i // list2.add(ydjhxf1); // } - return this.tqSygd2(begin,end); + return this.tqSygd2(begin,end,null); } 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 b1c0b61..239b9c0 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 @@ -9,7 +9,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; 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.DmXbjh; import com.dsic.gj_erp.mapper.jhgk.DmXbjhMapper; @@ -17,18 +16,16 @@ import com.dsic.gj_erp.service.jhgk.DmXbjhService; import com.dsic.gj_erp.util.ExcelUtil; import org.apache.commons.lang3.StringUtils; import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -46,6 +43,9 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme @Resource ModelMapper modelMapper; + @Value("${xbjh-path}") + String xbjhPath; + @Override public Map> getList(JSONObject json) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -83,18 +83,31 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme public JSONObject upload(MultipartFile file) throws IOException { JSONObject dmXbjhs = ExcelUtil.readDmXbjh(file); if (dmXbjhs != null) { - List listByNf = list(Wrappers.lambdaQuery().eq(DmXbjh::getNf, dmXbjhs.getString("nf"))); - this.save(dmXbjhs); + File[] files = FileUtil.ls(xbjhPath); + AtomicInteger maxVersion= new AtomicInteger(0); + if (files.length > 0) { + HashSet names = new HashSet<>(); + for (File file1 : files) { + String name = FileUtil.getPrefix(file1.getName()); + String[] s = name.split("_"); + names.add(s[s.length - 1]); + } + String tmpVersion=names.stream().max(String::compareTo).get(); + Optional.of(tmpVersion).ifPresent(item->{ + String v = item.replace("v", ""); + maxVersion.set(Integer.parseInt(v)); + }); + } String type = FileUtil.extName(file.getOriginalFilename()); - File uploadFile = new File("./线表计划"); + File uploadFile = new File(xbjhPath); if (!uploadFile.exists()) { uploadFile.mkdirs(); } - int version = !listByNf.isEmpty() ? listByNf.get(0).getVersion() + 1 : 1; - File uploadFiles = new File(StrUtil.format("./线表计划/{}_{}{}{}", dmXbjhs.getString("nf"), version, StrUtil.DOT, type)); - + int version = maxVersion.incrementAndGet(); + File uploadFiles = new File(StrUtil.format("{}/{}_{}{}{}{}", xbjhPath,DateUtil.thisYear(), "v",version, StrUtil.DOT, type)); file.transferTo(uploadFiles); + this.save(dmXbjhs); } return dmXbjhs; } diff --git a/src/main/resources/application-xbjh.yml b/src/main/resources/application-xbjh.yml new file mode 100644 index 0000000..999e0a0 --- /dev/null +++ b/src/main/resources/application-xbjh.yml @@ -0,0 +1 @@ +xbjh-path: D:\\javaweb\\static\\upload\\线表计划 \ No newline at end of file From 3cdd7777e63ddc18e23b31d37eadb04c3e1ea9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 23 Oct 2024 16:43:02 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E8=A1=A8=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?,=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=88=97,=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=8C=89=E7=85=A7=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java | 3 +++ src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java | 2 ++ src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java | 3 +++ .../dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java index 9ebb6b9..6156498 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java @@ -172,6 +172,8 @@ public class DmCzplpNew implements Serializable { private String xfqLqb1; + private int dataOrder; + public static DmCzplpNew createByExcel(String dcCh, String fd, ZrcAndPlb item){ DmCzplpNew plp = new DmCzplpNew(); plp.setDcCh(dcCh); @@ -191,6 +193,7 @@ public class DmCzplpNew implements Serializable { plp.setXfqDhqd(item.getDhqd()); plp.setBcdq(item.getGldq()); plp.setZt("0"); + plp.setDataOrder(item.getDataOrder()); return plp; } } diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java index 4024734..6b88d0e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java @@ -37,4 +37,6 @@ public class ZrcAndPlb { @ExcelProperty(value = "备注") public String bz; + + public int dataOrder; } diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java index cd09012..8cfa701 100644 --- a/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java +++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java @@ -8,15 +8,18 @@ import lombok.Getter; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; @Getter public class ExcelZrcAndPlb extends AnalysisEventListener { private List list; + private final AtomicInteger dataOrder=new AtomicInteger(0); @Override public void invoke(ZrcAndPlb zrcAndPlb, AnalysisContext analysisContext) { zrcAndPlb.setDcPl(StrUtil.padPre(zrcAndPlb.getDcPl(),3,"0")); + zrcAndPlb.setDataOrder(dataOrder.getAndIncrement()); list.add(zrcAndPlb); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index 896cd06..4b3d943 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java @@ -410,7 +410,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq(StrUtil.isNotEmpty((String) map.get("dcch")), "dc_ch", (String) map.get("dcch")); qw.eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "dc_pl", (String) map.get("dcpl")); - qw.orderBy(true, true, "len(dc_pl)","dc_pl"); + qw.orderBy(true, true, "data_order"); if((Boolean) map.get("flag")){ List list= dmCbxxpService.list(new QueryWrapper() From 99f4fdfe24b9e62c41f8604692bd07339940c54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 24 Oct 2024 14:22:58 +0800 Subject: [PATCH 10/11] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=BA=8F=E6=9F=A5=E7=9C=8B=E5=BC=80?= =?UTF-8?q?=E5=85=B3,=E7=AE=A1=E7=90=86=E7=94=9F=E4=BA=A7=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=8A=A5=E5=B7=A5=E6=97=B6,=E4=B8=8B=E9=81=93?= =?UTF-8?q?=E5=BA=8F=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E4=B8=8A=E9=81=93?= =?UTF-8?q?=E5=BA=8F=E5=AE=8C=E5=B7=A5=E5=90=8E=E6=89=8D=E5=8F=AF=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=202.=E8=B0=83=E6=95=B4=E5=90=84=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=80=BB=E8=BE=91,=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=8B=E9=81=93=E5=BA=8F=E9=9C=80=E8=A6=81=E4=B8=8A=E9=81=93?= =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E5=B7=A5=E5=90=8E=E6=89=8D=E8=83=BD=E7=9C=8B?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj_erp/controller/zyjh/ZyjhController.java | 9 +++++++++ .../com/dsic/gj_erp/service/zyjh/ZyjhService.java | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 8458f08..7e3351e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -294,6 +294,15 @@ public class ZyjhController { return new ResultBean<>(); } + /** + * 报工数据查看控制器 + * 可根据配置情况控制是否根据上道序报工后下道序才可查看到作业计划数据 + */ + @PostMapping("bgControl") + public ResultBean bgControl(String gx){ + return new ResultBean<>(zyjhService.cacheable(gx)); + } + @PostMapping("test") public ResultBean test(@RequestBody Message msg){ wsHandler.tip(msg.toJson()); diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 336fa69..d3e1fc0 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -13,8 +13,11 @@ import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.service.jcsj.DmCbxxpService; import com.google.common.collect.ImmutableMap; import lombok.AllArgsConstructor; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -24,6 +27,7 @@ import java.util.stream.Collectors; public class ZyjhService extends ServiceImpl { private final DmCbxxpService dmCbxxpService; + private final RedisTemplate redisTemplate; public List> gcjd(){ @@ -85,4 +89,15 @@ public class ZyjhService extends ServiceImpl { this.update(wrapper); } + + private static final String KEY="gxControl"; + + public Object cacheable(String gx){ + if (gx!=null){ + redisTemplate.opsForValue().set(KEY,gx); + return gx; + }else{ + return redisTemplate.opsForValue().get(KEY); + } + } } From 0c0e1725a6c89682a74bf208eef222cba24e8dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 24 Oct 2024 17:32:14 +0800 Subject: [PATCH 11/11] =?UTF-8?q?1.=E7=BA=BF=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD,=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9A=82=E6=9C=AA=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jhgk/DmXbjhController.java | 17 +++ .../gj_erp/service/jhgk/DmXbjhService.java | 6 + .../service/jhgk/impl/DmXbjhServiceImpl.java | 61 ++++++++- .../java/com/dsic/gj_erp/util/ExcelUtil.java | 127 +++++++++++------- 4 files changed, 160 insertions(+), 51 deletions(-) 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 723fe05..9ba2a18 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 @@ -1,6 +1,9 @@ package com.dsic.gj_erp.controller.jhgk; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jhgk.DmXbjh; @@ -11,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,6 +50,16 @@ public class DmXbjhController { return new ResultBean(dmXbjhs); } + @GetMapping("getVersion") + public ResultBean getVersion(String nf){ + return new ResultBean<>(dmXbjhService.getVersion(nf)); + } + + @GetMapping("getByVersion") + public ResultBean getByVersion(String nf,String version){ + return new ResultBean<>(dmXbjhService.getByVersion(nf,version)); + } + @ApiOperation(value = "批量保存") @PostMapping(value = "/save") public ResultBean save(@RequestBody JSONObject dmXbjhs) { @@ -57,5 +73,6 @@ public class DmXbjhController { dmXbjhService.tj(dmXbjhs); return new ResultBean(); } + } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java index a8f1a8e..ed9caac 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java @@ -6,6 +6,8 @@ import com.dsic.gj_erp.bean.jhgk.DmXbjh; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -25,4 +27,8 @@ public interface DmXbjhService extends IService { void save(JSONObject dmXbjhs); void tj(List dmXbjhs); + + List> getVersion(String nf); + + Map> getByVersion(String startTime, String _version); } 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 239b9c0..51621c5 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 @@ -3,7 +3,6 @@ package com.dsic.gj_erp.service.jhgk.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -48,6 +47,7 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme @Override public Map> getList(JSONObject json) { + QueryWrapper queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotEmpty(json.getString("dcCh"))) { queryWrapper.eq("dc_ch", json.getString("dcCh")); @@ -55,6 +55,7 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme if (StringUtils.isNotEmpty(json.getString("Zt"))) { queryWrapper.eq("zt", json.getString("Zt")); } + if (StringUtils.isNotEmpty(json.getString("nf"))) { String nf = json.getString("nf"); String startTime = nf.split("~")[0]; @@ -77,6 +78,64 @@ public class DmXbjhServiceImpl extends ServiceImpl impleme return collect; } + public Map> getByVersion(String startTime,String _version){ + List> version = this.getVersion(startTime); + if (ObjectUtil.isNotEmpty(version)&&!version.get(version.size()-1).get("version").equals(_version)) { + List dmXbjhs = new ArrayList<>(); + for (HashMap map : version) { + if (map.get("version").equals(_version)) { + String fileName = (String) map.get("fileName"); + File file = FileUtil.file(xbjhPath, fileName); + if (file.exists()) { + JSONObject jsonObject = this.readFile(file); + for (String key : jsonObject.keySet()) { + JSONArray jsonArray = jsonObject.getJSONArray(key); + for (Object object : jsonArray) { + DmXbjh dmXbjh = modelMapper.map(object, DmXbjh.class); + dmXbjh.setDcCh(key); + dmXbjhs.add(dmXbjh); + } + } + } + } + } + Map> map = dmXbjhs.stream() + .collect(Collectors.groupingBy(DmXbjh::getDcCh)); + + //对map的value进行排序，并返回降序以后的map集合 + LinkedHashMap> collect = map.entrySet().stream().sorted((entry1, entry2) -> { + Double zl1 = entry1.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); + Double zl2 = entry2.getValue().stream().filter(l -> ObjectUtil.isNotEmpty(l.getZl())).mapToDouble(DmXbjh::getZl).sum(); + //降序排序 + return zl2.compareTo(zl1); + }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); + return collect; + } + return null; + } + + public List> getVersion(String nf){ + if (nf==null){ + return null; + } + File[] files = FileUtil.ls(xbjhPath); + List> versions = new ArrayList<>(); + for (File file : files) { + String name = FileUtil.getPrefix(file.getName()); + String[] s = name.split("_"); + if (nf.equals(s[0])){ + HashMap map = new HashMap<>(); + map.put("fileName", file.getName()); + map.put("version", s[1]); + versions.add(map); + } + } + return versions; + } + + public JSONObject readFile(File file){ + return ExcelUtil.readDmXbjh(file); + } @Override @Transactional diff --git a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java index 2daccf4..5d69893 100644 --- a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java +++ b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java @@ -1,5 +1,6 @@ package com.dsic.gj_erp.util; +import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -9,6 +10,7 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.*; @@ -187,49 +189,66 @@ public class ExcelUtil { public static JSONObject readDmXbjh(MultipartFile file) { try { Workbook workbook=isWorkBook(file); - // 获取第一张表 - Sheet sheet = workbook.getSheetAt(0); - Row monthRow=sheet.getRow(2); - Map monthMap=new HashMap<>(); - for (int index = 0; index < monthRow.getPhysicalNumberOfCells(); index++){ - Cell cell = monthRow.getCell(index); - // 转换为字符串类型 - cell.setCellType(CellType.STRING); - monthMap.put(index,cell.toString()); + return read(workbook); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + public static JSONObject readDmXbjh(File file) { + try { + Workbook workbook=isWorkBook(file); + return read(workbook); + } catch (Exception e) { + return null; + } + } + + private static JSONObject read(Workbook workbook){ + // 获取第一张表 + Sheet sheet = workbook.getSheetAt(0); + Row monthRow=sheet.getRow(2); + Map monthMap=new HashMap<>(); + for (int index = 0; index < monthRow.getPhysicalNumberOfCells(); index++){ + Cell cell = monthRow.getCell(index); + // 转换为字符串类型 + cell.setCellType(CellType.STRING); + monthMap.put(index,cell.toString()); + } + // String year=""; + // List> mapList=new ArrayList<>(); + // List dmXbjhs=new ArrayList<>(); + JSONObject jsonObject=new JSONObject(); + for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) { + Row row = sheet.getRow(i); + String dcch=row.getCell(0).toString(); + if (dcch.contains("待接")||dcch.contains("已接")||dcch.contains("合计")){ + break; } - // String year=""; - // List> mapList=new ArrayList<>(); - // List dmXbjhs=new ArrayList<>(); - JSONObject jsonObject=new JSONObject(); - for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) { - Row row = sheet.getRow(i); - String dcch=row.getCell(0).toString(); - if (dcch.contains("待接")||dcch.contains("已接")||dcch.contains("合计")){ - break; - } // Map map=new HashMap<>(); // map.put("dcCh",dcch); - List mapList=new ArrayList<>(); - for (int index = 1; index < row.getPhysicalNumberOfCells(); index++) { - Cell cell = row.getCell(index); - cell.setCellType(CellType.STRING); + List mapList=new ArrayList<>(); + for (int index = 1; index < row.getPhysicalNumberOfCells(); index++) { + Cell cell = row.getCell(index); + cell.setCellType(CellType.STRING); - String month=monthMap.get(index); - if (month.contains("计")){ - continue; - } - String cl=cell+""; - String year=getMergedRegionValue(sheet,1,index).toString(); - // DmXbjh dmXbjh=new DmXbjh(); - Map map=new HashMap(); - map.put("zt","0"); - map.put("nf",year.replace("年","")); - map.put("yf",String.format("%02d", Integer.parseInt(month.replace("月","")))); - if (StringUtils.isNotEmpty(cl)){ - map.put("zl",Double.parseDouble(cl)); - }else { - map.put("zl",0.0); - } + String month=monthMap.get(index); + if (month.contains("计")){ + continue; + } + String cl=cell+""; + String year=getMergedRegionValue(sheet,1,index).toString(); + // DmXbjh dmXbjh=new DmXbjh(); + Map map=new HashMap(); + map.put("zt","0"); + map.put("nf",year.replace("年","")); + map.put("yf",String.format("%02d", Integer.parseInt(month.replace("月","")))); + if (StringUtils.isNotEmpty(cl)){ + map.put("zl",Double.parseDouble(cl)); + }else { + map.put("zl",0.0); + } // dmXbjh.setZt("0"); // dmXbjh.setNf(year.replace("年","")); // dmXbjh.setYf(String.format("%02d", Integer.parseInt(month.replace("月","")))); @@ -241,20 +260,14 @@ public class ExcelUtil { // dmXbjh.setDcCh(dcch); - // dmXbjhs.add(dmXbjh); - mapList.add(map); + // dmXbjhs.add(dmXbjh); + mapList.add(map); // map.put("cl"+year.replace("年","")+String.format("%02d", Integer.parseInt(month.replace("月",""))),cl); - } -// mapList.add(map); - jsonObject.put(dcch,mapList); } - return jsonObject; -// return mapList; - // return dmXbjhs; - } catch (Exception e) { - e.printStackTrace(); - return null; +// mapList.add(map); + jsonObject.put(dcch,mapList); } + return jsonObject; } public static String date(String strDate){ @@ -300,6 +313,20 @@ public class ExcelUtil { } return workbook; } + + public static Workbook isWorkBook(File file) throws IOException { + Workbook workbook;// = new XSSFWorkbook(inputStream); + // 截取路径名 . 后面的后缀名，判断是xls还是xlsx + // 如果这个判断不对，就把equals换成 equalsIgnoreCase() + Pattern pattern = Pattern.compile(".*\\.xls"); + Matcher matcher = pattern.matcher(FileUtil.getSuffix(file.getName())); + if (matcher.matches()){ + workbook = new HSSFWorkbook(FileUtil.getInputStream(file)); + }else{ + workbook = new XSSFWorkbook(FileUtil.getInputStream(file)); + } + return workbook; + } /** * 获取合并单元格的值 * @param sheet