xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.新导入月度计划

Browse Source 
2.去除冗余import项
master
董哲奇 2 months ago
parent 44910e569b
commit 56d00a7548
36 changed files with 253 additions and 195 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/dsic/gj_erp/GjErpApplication.java
Unescape View File

@ -10,10 +10,8 @@ import org.modelmapper.convention.MatchingStrategies;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;

6
src/main/java/com/dsic/gj_erp/Test.java
Unescape View File

@ -6,25 +6,19 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig; import cn.hutool.extra.qrcode.QrConfig;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix; import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.QRCodeWriter;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.PDPageTree;
import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory; import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
import org.apache.pdfbox.text.PDFTextStripper;
import org.apache.pdfbox.text.PDFTextStripperByArea; import org.apache.pdfbox.text.PDFTextStripperByArea;
import java.awt.*;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class Test { public class Test {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {

14
src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
Unescape View File

@ -148,6 +148,20 @@ public class YdjhImportNew {
private String bzrq; private String bzrq;
private String shry;
private String shrq;
public void updateToBz(String bzr,String bzrq){
this.bzr=bzr;
this.bzrq=bzrq;
}
public void updateToSh(String shr,String shrq){
this.shry =shr;
this.shrq=shrq;
}
public void tj(){ public void tj(){
this.zt=ZtEnum.TJ.ordinal()+""; this.zt=ZtEnum.TJ.ordinal()+"";
} }

1
src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
Unescape View File

@ -3,7 +3,6 @@ package com.dsic.gj_erp.config;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import javax.sql.DataSource; import javax.sql.DataSource;

2
src/main/java/com/dsic/gj_erp/config/JapConfig.java
Unescape View File

@ -11,8 +11,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.datasource.init.DataSourceInitializer; import org.springframework.jdbc.datasource.init.DataSourceInitializer;

1
src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
Unescape View File

@ -12,7 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.datasource.DataSourceTransactionManager;

1
src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
Unescape View File

@ -12,7 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.datasource.DataSourceTransactionManager;

7
src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
Unescape View File

@ -1,13 +1,10 @@
package com.dsic.gj_erp.controller.jcsj; package com.dsic.gj_erp.controller.jcsj;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmBom; import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jcsj.DmTltpdf;
import com.dsic.gj_erp.bean.sy.Dm_zhbmp; import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.exception.CustomException;
@ -16,17 +13,13 @@ import com.dsic.gj_erp.service.jcsj.DmBomService;
import com.dsic.gj_erp.service.jcsj.DmTltpdfService; import com.dsic.gj_erp.service.jcsj.DmTltpdfService;
import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl; import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;

6
src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
Unescape View File

@ -7,7 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.*; import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jcsj.vo.BomVO; import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.sy.Dm_zhbmp; import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
@ -31,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
Unescape View File

@ -17,9 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>

5
src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
Unescape View File

@ -1,17 +1,13 @@
package com.dsic.gj_erp.controller.jhgk; package com.dsic.gj_erp.controller.jhgk;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
import com.dsic.gj_erp.service.jcsj.DmCzplpNewService; import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
@ -28,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;

11
src/main/java/com/dsic/gj_erp/controller/jhgk/YdjhImportNewController.java
Unescape View File

@ -8,7 +8,6 @@ import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
import com.dsic.gj_erp.listeners.ExcelYdjhImportNewListener; import com.dsic.gj_erp.listeners.ExcelYdjhImportNewListener;
import com.dsic.gj_erp.service.jhgk.impl.YdjhImportNewService; import com.dsic.gj_erp.service.jhgk.impl.YdjhImportNewService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -28,8 +27,8 @@ public class YdjhImportNewController {
private final YdjhImportNewService ydjhImportNewService; private final YdjhImportNewService ydjhImportNewService;
@GetMapping("listByFileName") @GetMapping("listByFileName")
public ResultBean<?> listByFileName(String fileName) { public ResultBean<?> listByFileName(String fileName,String zt) {
return new ResultBean<>(ydjhImportNewService.listByFileName(fileName)); return new ResultBean<>(ydjhImportNewService.listByFileName(fileName,zt));
} }
@RequestMapping("/getFileNameList") @RequestMapping("/getFileNameList")
@ -58,8 +57,10 @@ public class YdjhImportNewController {
} }
@GetMapping("/sh") @GetMapping("/sh")
public ResultBean<?> sh(String fileName) { @AuthFunction
ydjhImportNewService.sh(fileName); public ResultBean<?> sh(String fileName,HttpServletRequest request) {
String yhms = (String) request.getAttribute("yhms");
ydjhImportNewService.sh(fileName,yhms);
return new ResultBean<>(); return new ResultBean<>();
} }
} }

35
src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
Unescape View File

@ -1,20 +1,10 @@
package com.dsic.gj_erp.controller.kban; package com.dsic.gj_erp.controller.kban;
import java.io.File; import cn.hutool.core.date.DateTime;
import java.util.ArrayList; import cn.hutool.core.date.DateUtil;
import java.util.Arrays; import cn.hutool.core.io.FileUtil;
import java.util.HashMap; import cn.hutool.core.util.ObjUtil;
import java.util.List; import cn.hutool.core.util.StrUtil;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
@ -27,13 +17,16 @@ import com.dsic.gj_erp.service.jcsj.DmBzryService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.sy.impl.SyMsgService; import com.dsic.gj_erp.service.sy.impl.SyMsgService;
import com.dsic.gj_erp.service.zyjh.ZyjhService; import com.dsic.gj_erp.service.zyjh.ZyjhService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.date.DateTime; import java.io.File;
import cn.hutool.core.date.DateUtil; import java.util.*;
import cn.hutool.core.io.FileUtil; import java.util.concurrent.atomic.AtomicInteger;
import cn.hutool.core.util.ObjUtil; import java.util.stream.Collectors;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
/** /**
* 各作业区划分规则 * 各作业区划分规则

2
src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
Unescape View File

@ -2,10 +2,8 @@ package com.dsic.gj_erp.controller.pgd;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
import com.dsic.gj_erp.bean.zyjh.DmYppyz; import com.dsic.gj_erp.bean.zyjh.DmYppyz;
import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper; import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;

3
src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
Unescape View File

@ -21,7 +21,6 @@ import com.dsic.gj_erp.controller.zyjh.dto.PwExportExcel;
import com.dsic.gj_erp.controller.zyjh.dto.PwpgDto; import com.dsic.gj_erp.controller.zyjh.dto.PwpgDto;
import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository;
import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.exception.ServiceException;
import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper; import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
@ -42,8 +41,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**

1
src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
Unescape View File

@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel; import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
import com.dsic.gj_erp.util.ObjConvertUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/com/dsic/gj_erp/listeners/ExcelYdjhImportNewListener.java
Unescape View File

@ -3,12 +3,10 @@ package com.dsic.gj_erp.listeners;
import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
import com.dsic.gj_erp.bean.jhgk.YdjhImportNew; import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
import lombok.Getter; import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Excel通用监听器 * Excel通用监听器

7
src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
Unescape View File

@ -1,13 +1,12 @@
package com.dsic.gj_erp.mapper; package com.dsic.gj_erp.mapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.ibatis.annotations.Mapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
@Mapper @Mapper
public interface KbanMapper { public interface KbanMapper {

2
src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java
Unescape View File

@ -24,5 +24,5 @@ public interface DmBomMapper extends BaseMapper<DmBom> {
int insertFile(@Param("filepath")String filepath,@Param("yhdm") String yhdm); int insertFile(@Param("filepath")String filepath,@Param("yhdm") String yhdm);
List<DmBom> getBomUni(String dcCh,String dcPl); List<DmBom> getBomUni(String dcCh,String dcPl,String kw);
} }

1
src/main/java/com/dsic/gj_erp/mapper/jhgk/YdjhImportNewMapper.java
Unescape View File

@ -1,7 +1,6 @@
package com.dsic.gj_erp.mapper.jhgk; package com.dsic.gj_erp.mapper.jhgk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.jhgk.YdjhImport;
import com.dsic.gj_erp.bean.jhgk.YdjhImportNew; import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java
Unescape View File

@ -5,9 +5,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj; import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;

19
src/main/java/com/dsic/gj_erp/service/KbanService.java
Unescape View File

@ -1,23 +1,20 @@
package com.dsic.gj_erp.service; package com.dsic.gj_erp.service;
import java.io.File; import cn.hutool.core.date.DateTime;
import java.math.BigDecimal; import cn.hutool.core.date.DateUtil;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.xiaochi.Device; import com.dsic.gj_erp.bean.xiaochi.Device;
import com.dsic.gj_erp.mapper.KbanMapper;
import com.dsic.gj_erp.mapper.xiaochi.DeviceMapper; import com.dsic.gj_erp.mapper.xiaochi.DeviceMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.dsic.gj_erp.bean.jhgk.DmYdjh; import java.io.File;
import com.dsic.gj_erp.mapper.KbanMapper; import java.math.BigDecimal;
import java.util.*;
import cn.hutool.core.date.DateTime; import java.util.concurrent.atomic.AtomicInteger;
import cn.hutool.core.date.DateUtil;
import lombok.AllArgsConstructor;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor

2
src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java
Unescape View File

@ -26,5 +26,5 @@ public interface DmBomService extends IService<DmBom> {
void copyListBom(HttpServletRequest req, Map map); void copyListBom(HttpServletRequest req, Map map);
List<DmBom> getBomUni(String dcCh,String dcPl); List<DmBom> getBomUni(String dcCh,String dcPl,String kw);
} }

1
src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
Unescape View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.*; import com.dsic.gj_erp.bean.jcsj.*;
import com.dsic.gj_erp.bean.jcsj.vo.BomVO; import com.dsic.gj_erp.bean.jcsj.vo.BomVO;
import com.dsic.gj_erp.bean.jhgk.DmTzjh;
import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh;
import com.dsic.gj_erp.bean.sy.Dm_zhbmp; import com.dsic.gj_erp.bean.sy.Dm_zhbmp;

5
src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java
Unescape View File

@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -125,7 +124,7 @@ public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements
} }
@Override @Override
public List<DmBom> getBomUni(String dcCh, String dcPl) { public List<DmBom> getBomUni(String dcCh, String dcPl,String kw) {
return baseMapper.getBomUni(dcCh,dcPl); return baseMapper.getBomUni(dcCh,dcPl,kw);
} }
} }

1
src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java
Unescape View File

@ -7,7 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

1
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmDhqdpServiceImpl.java
Unescape View File

@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jhgk.DmDhqdp; import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
import com.dsic.gj_erp.mapper.jhgk.DmDhqdpMapper; import com.dsic.gj_erp.mapper.jhgk.DmDhqdpMapper;
import com.dsic.gj_erp.service.jhgk.DmDhqdpService; import com.dsic.gj_erp.service.jhgk.DmDhqdpService;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;

8
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
Unescape View File

@ -1,18 +1,11 @@
package com.dsic.gj_erp.service.jhgk.impl; package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel; import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper; import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.jhgk.DmSygdService; import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.jhgk.DmYdjhService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -21,7 +14,6 @@ import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* <p> * <p>

1
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
Unescape View File

@ -16,7 +16,6 @@ import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdxq; import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld; import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
import com.dsic.gj_erp.exception.ServiceException;
import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper; import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
import com.dsic.gj_erp.service.jcsj.DmBomService; import com.dsic.gj_erp.service.jcsj.DmBomService;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService;

1
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
Unescape View File

@ -15,7 +15,6 @@ import com.dsic.gj_erp.bean.pgd.*;
import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
import com.dsic.gj_erp.service.jhgk.DmQfxqService; import com.dsic.gj_erp.service.jhgk.DmQfxqService;
import com.dsic.gj_erp.service.jhgk.DmYdjhService; import com.dsic.gj_erp.service.jhgk.DmYdjhService;
import com.dsic.gj_erp.service.jiuzhou.SljhService;
import com.dsic.gj_erp.service.pgd.*; import com.dsic.gj_erp.service.pgd.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

225
src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
Unescape View File

@ -1,21 +1,19 @@
package com.dsic.gj_erp.service.jhgk.impl; package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jcsj.DmBom; import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jcsj.DmCbxxp; import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.*; import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel; import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh;
import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper; import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
import com.dsic.gj_erp.mapper.jhgk.YdjhImportMapper;
import com.dsic.gj_erp.mapper.jhgk.YdjhImportNewMapper; import com.dsic.gj_erp.mapper.jhgk.YdjhImportNewMapper;
import com.dsic.gj_erp.service.jcsj.DmBomService; import com.dsic.gj_erp.service.jcsj.DmBomService;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
@ -25,10 +23,14 @@ import com.dsic.gj_erp.service.pgd.PgdTzjhService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate; import org.springframework.transaction.support.TransactionTemplate;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -48,100 +50,143 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
private static final String GJSCGK_SYGDMX_KEY = "GJSCGK::SYGDMX::"; private static final String GJSCGK_SYGDMX_KEY = "GJSCGK::SYGDMX::";
private static final String GJSCGK_TZJH_KEY = "GJSCGK::TZJH::"; private static final String GJSCGK_TZJH_KEY = "GJSCGK::TZJH::";
private static final String GJSCGK_BOM_COUNT_KEY="GJSCGK::BOM::COUNT::";
public List<String> getFileNameList() { public List<String> getFileNameList() {
return baseMapper.getFileNameList(); return baseMapper.getFileNameList();
} }
public List<YdjhImportNew> listByFileName(String fileName) { public List<YdjhImportNew> listByFileName(String fileName,String zt) {
List<YdjhImportNew> list = this.list(Wrappers.<YdjhImportNew>lambdaQuery() List<YdjhImportNew> list = this.list(Wrappers.<YdjhImportNew>lambdaQuery()
.eq(StrUtil.isNotEmpty(fileName), YdjhImportNew::get文件名, fileName) .eq(StrUtil.isNotEmpty(fileName), YdjhImportNew::get文件名, fileName)
.eq(StrUtil.isNotEmpty(zt),YdjhImportNew::getZt,zt)
.orderByAsc(YdjhImportNew::getId) .orderByAsc(YdjhImportNew::getId)
); );
list.stream().filter(item->StrUtil.isNotEmpty(item.getDcPl())) list.stream().filter(item->StrUtil.isNotEmpty(item.getDcPl()))
.forEach(item->{ .forEach(item->{
List<DmBom> bomList = bomService.getBomUni(item.getDcCh(),item.getDcPl()); String dcPl = item.getDcPl();
if (ObjUtil.isNotEmpty(bomList)){
item.set板数(bomList.size()+""); try {
Map<String, List<DmBom>> collect = bomList.stream().collect(Collectors.groupingBy(DmBom::getKw)); dcPl = String.format("%03d", Integer.parseInt(dcPl));
item.setDcPl(dcPl);
} catch (Exception ignored) {
}
AtomicInteger 板数 = new AtomicInteger(0);
//一垮龙门和一垮数控 //一垮龙门和一垮数控
if (item.get切割完成1() != null) { if (item.get切割完成1() != null) {
Optional.ofNullable(collect.get("7")).ifPresent(bom -> { this.getBomSize(item, "7",(size)->{
item.set一垮龙门板数(bom.size()+""); item.set二跨面板板数(size+"");
板数.addAndGet(size);
}); });
Optional.ofNullable(collect.get("8")).ifPresent(bom -> { this.getBomSize(item, "8",(size)->{
item.set一垮数控板数(bom.size()+""); item.set二跨面板板数(size+"");
板数.addAndGet(size);
}); });
} }
if (item.get切割完成2() != null) { if (item.get切割完成2() != null) {
Optional.ofNullable(collect.get("5")).ifPresent(bom -> { this.getBomSize(item, "5",(size)->{
item.set二跨面板板数(bom.size()+""); item.set二跨面板板数(size+"");
板数.addAndGet(size);
}); });
} }
if (item.get切割完成3() != null) { if (item.get切割完成3() != null) {
AtomicInteger atomicInteger = new AtomicInteger(0); AtomicInteger atomicInteger = new AtomicInteger(0);
Optional.ofNullable(collect.get("9")).ifPresent(bom -> {
atomicInteger.addAndGet(bom.size()); this.getBomSize(item, "9",(size)->{
atomicInteger.addAndGet(size);
板数.addAndGet(size);
}); });
Optional.ofNullable(collect.get("10")).ifPresent(bom -> { this.getBomSize(item, "10",(size)->{
atomicInteger.addAndGet(bom.size()); atomicInteger.addAndGet(size);
板数.addAndGet(size);
}); });
Optional.ofNullable(collect.get("12")).ifPresent(bom -> { this.getBomSize(item, "12",(size)->{
atomicInteger.addAndGet(bom.size()); atomicInteger.addAndGet(size);
板数.addAndGet(size);
}); });
item.set二跨数控板数(atomicInteger.toString()); item.set二跨数控板数(atomicInteger.toString());
} }
if (item.get切割完成4() != null) { if (item.get切割完成4() != null) {
AtomicInteger atomicInteger = new AtomicInteger(0); this.getBomSize(item, "6",(size)->{
Optional.ofNullable(collect.get("6")).ifPresent(bom -> { item.set三跨平铁板数(size.toString());
atomicInteger.addAndGet(bom.size()); 板数.addAndGet(size);
}); });
Optional.ofNullable(collect.get("14")).ifPresent(bom -> { }
atomicInteger.addAndGet(bom.size());
}); if(item.get曲平铁曲完成()!=null){
item.set三跨平铁板数(atomicInteger.toString()); this.getBomSize(item, "13", 板数::addAndGet);
} }
if (item.get切割完成5() != null) { if (item.get切割完成5() != null) {
Optional.ofNullable(collect.get("13")).ifPresent(bom -> { this.getBomSize(item, "14",(size)->{
item.set三跨数控板数(bom.size()+""); item.set三跨数控板数(size+"");
板数.addAndGet(size);
}); });
} }
if (item.get切割完成6() != null) { if (item.get切割完成6() != null) {
Optional.ofNullable(collect.get("11")).ifPresent(bom -> { this.getBomSize(item, "11",(size)->{
item.set四区腹板板数(bom.size()+""); item.set四区腹板板数(size+"");
板数.addAndGet(size);
}); });
} }
if (item.get切割完成7() != null) { if (item.get切割完成7() != null) {
AtomicInteger atomicInteger = new AtomicInteger(0); AtomicInteger atomicInteger = new AtomicInteger(0);
Optional.ofNullable(collect.get("15")).ifPresent(bom -> {
atomicInteger.addAndGet(bom.size()); this.getBomSize(item, "15",(size)->{
atomicInteger.addAndGet(size);
板数.addAndGet(size);
}); });
Optional.ofNullable(collect.get("16")).ifPresent(bom -> { this.getBomSize(item, "16",(size)->{
atomicInteger.addAndGet(bom.size()); atomicInteger.addAndGet(size);
板数.addAndGet(size);
}); });
item.set四区数控板数(atomicInteger.toString()); item.set四区数控板数(atomicInteger.toString());
} }
if(item.get光电完成()!=null){
this.getBomSize(item, "17", 板数::addAndGet);
} }
item.set板数(板数.toString());
}); });
return list; return list;
} }
public void sh(String fileName) { private void getBomSize(YdjhImportNew item, String kw, Consumer<Integer> handler){
Integer o = (Integer) redisTemplate.opsForHash().get(GJSCGK_BOM_COUNT_KEY + item.getDcCh(), item.getDcPl() + "_"+kw);
// if (o==null||o==0){
// List<DmBom> bomUni = bomService.getBomUni(item.getDcCh(), item.getDcPl(), kw);
// if (bomUni!=null){
// o=bomUni.size();
// redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY + item.getDcCh(), item.getDcPl() + "_"+kw,o);
// }
// }
Optional.ofNullable(o).ifPresent(handler);
}
@Transactional(rollbackFor = Exception.class)
public void sh(String fileName,String shr) {
LambdaQueryWrapper<YdjhImportNew> wrapper = Wrappers.<YdjhImportNew>lambdaQuery() LambdaQueryWrapper<YdjhImportNew> wrapper = Wrappers.<YdjhImportNew>lambdaQuery()
.eq(YdjhImportNew::get文件名, fileName) .eq(YdjhImportNew::get文件名, fileName)
.eq(YdjhImportNew::getZt, YdjhImportNew.ZtEnum.TJ.ordinal()); .eq(YdjhImportNew::getZt, YdjhImportNew.ZtEnum.TJ.ordinal());
List<YdjhImportNew> list = this.updateData(wrapper, YdjhImportNew::sh); String shrq=DateUtil.date().toString("yyyy/MM/dd");
List<YdjhImportNew> list = this.updateData(wrapper, (item)->{
item.updateToSh(shr,shrq);
item.sh();
});
if (ObjUtil.isEmpty(list)){ if (ObjUtil.isEmpty(list)){
return; return;
} }
@ -154,9 +199,14 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dcPl = String.format("%03d", Integer.parseInt(dcPl)); dcPl = String.format("%03d", Integer.parseInt(dcPl));
} catch (Exception ignored) { } catch (Exception ignored) {
} }
List<DmYdjh> ydjhList = dmYdjhService.list(Wrappers.<DmYdjh>lambdaQuery().eq(DmYdjh::getDcCh, dcPl)); List<DmYdjh> ydjhList = dmYdjhService.list(Wrappers.<DmYdjh>lambdaQuery()
.eq(DmYdjh::getDcCh, item.getDcCh())
.eq(DmYdjh::getDcPl, dcPl)
);
if (ObjUtil.isNotEmpty(ydjhList)){ if (ObjUtil.isNotEmpty(ydjhList)){
Map<String, List<DmYdjh>> collect = ydjhList.stream().collect(Collectors.groupingBy(DmYdjh::getKw)); Map<String, List<DmYdjh>> collect = ydjhList.stream()
.filter(ydjh->StrUtil.isNotEmpty(ydjh.getKw()))
.collect(Collectors.groupingBy(DmYdjh::getKw));
//一垮龙门和一垮数控 //一垮龙门和一垮数控
if (item.get切割完成1() != null) { if (item.get切割完成1() != null) {
Optional.ofNullable(collect.get("7")).ifPresent(ydjhs -> { Optional.ofNullable(collect.get("7")).ifPresent(ydjhs -> {
@ -221,9 +271,12 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
}); });
Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> { }
if(item.get曲平铁曲完成()!=null){
Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{ ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成4()); DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get曲平铁曲完成());
dmYdjh.setId(ydjh.getId()); dmYdjh.setId(ydjh.getId());
updateList.add(dmYdjh); updateList.add(dmYdjh);
}); });
@ -231,7 +284,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
} }
if (item.get切割完成5() != null) { if (item.get切割完成5() != null) {
Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> { Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{ ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成5()); DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成5());
dmYdjh.setId(ydjh.getId()); dmYdjh.setId(ydjh.getId());
@ -268,6 +321,16 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
}); });
} }
if(item.get光电完成()!=null){
Optional.ofNullable(collect.get("17")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get光电完成());
dmYdjh.setId(ydjh.getId());
updateList.add(dmYdjh);
});
});
}
} }
}); });
@ -294,7 +357,9 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (ObjUtil.isEmpty(list)){ if (ObjUtil.isEmpty(list)){
return; return;
} }
list.forEach(item -> { list.stream()
.filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
.forEach(item -> {
String dcPl = item.getDcPl(); String dcPl = item.getDcPl();
try { try {
@ -316,7 +381,9 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
return; return;
} }
transactionTemplate.execute((status)->{ transactionTemplate.execute((status)->{
list.stream().filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl())) list.stream()
.filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
.filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(),item.getDcPl()))
.forEach(item->{ .forEach(item->{
sygdMxService.remove(new QueryWrapper<DmSygdMx>() sygdMxService.remove(new QueryWrapper<DmSygdMx>()
.eq("dc_ch", item.getDcCh()) .eq("dc_ch", item.getDcCh())
@ -342,6 +409,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
private List<YdjhImportNew> updateData(LambdaQueryWrapper<YdjhImportNew> wrapper, Consumer<YdjhImportNew> handler) { private List<YdjhImportNew> updateData(LambdaQueryWrapper<YdjhImportNew> wrapper, Consumer<YdjhImportNew> handler) {
List<YdjhImportNew> list = this.list(wrapper); List<YdjhImportNew> list = this.list(wrapper);
list.forEach(item -> { list.forEach(item -> {
YdjhImportNew ydjhImportNew = new YdjhImportNew(); YdjhImportNew ydjhImportNew = new YdjhImportNew();
ydjhImportNew.setId(item.getId()); ydjhImportNew.setId(item.getId());
@ -353,16 +421,21 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
} }
public void handler(List<YdjhImportNew> list, String fileName, HttpServletRequest request) { public void handler(List<YdjhImportNew> list, String fileName, HttpServletRequest request) {
String yhms = (String) request.getAttribute("yhms");
//三月滚动明细 //三月滚动明细
this.createSygdmx(list, fileName); this.createSygdmx(list, fileName);
//没有基础数据的计划生成图纸计划 //没有基础数据的计划生成图纸计划
this.createTzjh(list, fileName, request); this.createTzjh(list, fileName, yhms);
String date = DateUtil.date().toString("yyyy/MM/dd");
transactionTemplate.execute((status) -> { transactionTemplate.execute((status) -> {
list.stream().filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(), item.getDcPl())) list.stream()
.filter(item -> StrUtil.isAllNotEmpty(item.getDcCh(), item.getDcPl()))
.forEach(item -> { .forEach(item -> {
item.set文件名(fileName); item.set文件名(fileName);
item.updateToBz(yhms,date);
this.remove(new QueryWrapper<YdjhImportNew>() this.remove(new QueryWrapper<YdjhImportNew>()
.eq("dc_ch", item.getDcCh()) .eq("dc_ch", item.getDcCh())
.eq("dc_pl", item.getDcPl()) .eq("dc_pl", item.getDcPl())
@ -374,11 +447,11 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
} }
private void createTzjh(List<YdjhImportNew> list, String fileName, HttpServletRequest request) { private void createTzjh(List<YdjhImportNew> list, String fileName,String yhms) {
String yhms = (String) request.getAttribute("yhms");
String date = DateUtil.date().toString("yyyy/MM/dd"); String date = DateUtil.date().toString("yyyy/MM/dd");
list.stream() list.stream()
.filter(item -> !item.getDcPl().contains("-"))//批次范围的数据暂不处理
.filter(YdjhImportNew::isNonBom) .filter(YdjhImportNew::isNonBom)
.forEach(item -> { .forEach(item -> {
String dcPl = item.getDcPl(); String dcPl = item.getDcPl();
@ -412,7 +485,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
} catch (Exception ignored) { } catch (Exception ignored) {
} }
List<DmBom> bomList = bomService.getBomUni(item.getDcCh(), dcPl); List<DmBom> bomList = bomService.getBomUni(item.getDcCh(), dcPl,null);
if (ObjUtil.isEmpty(bomList)) { if (ObjUtil.isEmpty(bomList)) {
//无bom,明细数据使用目标船只替代,切在作业计划中生成一条(按照kw进行区分)数据 //无bom,明细数据使用目标船只替代,切在作业计划中生成一条(按照kw进行区分)数据
@ -434,8 +507,10 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
Map<String, List<DmBom>> collect = bomList.stream().collect(Collectors.groupingBy(DmBom::getKw)); Map<String, List<DmBom>> collect = bomList.stream().collect(Collectors.groupingBy(DmBom::getKw));
//一垮龙门和一垮数控 //一垮龙门和一垮数控
String finalDcPl = dcPl;
if (item.get切割完成1() != null) { if (item.get切割完成1() != null) {
Optional.ofNullable(collect.get("7")).ifPresent(boms -> { Optional.ofNullable(collect.get("7")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_7",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -449,6 +524,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
Optional.ofNullable(collect.get("8")).ifPresent(boms -> { Optional.ofNullable(collect.get("8")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_8",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -464,6 +540,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (item.get切割完成2() != null) { if (item.get切割完成2() != null) {
Optional.ofNullable(collect.get("5")).ifPresent(boms -> { Optional.ofNullable(collect.get("5")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_5",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -479,6 +556,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (item.get切割完成3() != null) { if (item.get切割完成3() != null) {
Optional.ofNullable(collect.get("9")).ifPresent(boms -> { Optional.ofNullable(collect.get("9")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_9",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -492,6 +570,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
Optional.ofNullable(collect.get("10")).ifPresent(boms -> { Optional.ofNullable(collect.get("10")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_10",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -505,6 +584,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
Optional.ofNullable(collect.get("12")).ifPresent(boms -> { Optional.ofNullable(collect.get("12")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_12",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -520,13 +600,12 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (item.get切割完成4() != null) { if (item.get切割完成4() != null) {
Optional.ofNullable(collect.get("6")).ifPresent(boms -> { Optional.ofNullable(collect.get("6")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_6",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl()); dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成4()); dmSygdMx.setQgrq(item.get切割完成4());
dmSygdMx.setQbs("1");
dmSygdMx.setQjgrq(item.get曲平铁曲完成());
dmSygdMx.setJssj(item.getQfxqrqxz()); dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setGjjsDz(item.getQfxqrqdz()); dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom); dmSygdMx.setBomData(bom);
@ -534,32 +613,34 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
}); });
Optional.ofNullable(collect.get("14")).ifPresent(boms -> { }
if(item.get曲平铁曲完成()!=null){
Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_13",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl()); dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成4()); dmSygdMx.setQgrq(item.get曲平铁曲完成());
dmSygdMx.setQbs("1"); dmSygdMx.setQbs("1");
dmSygdMx.setQjgrq(item.get曲平铁曲完成()); dmSygdMx.setQjgrq(item.get曲外板曲完成());
dmSygdMx.setJssj(item.getQfxqrqxz()); dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setGjjsDz(item.getQfxqrqdz()); dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom); dmSygdMx.setBomData(bom);
addList.add(dmSygdMx); addList.add(dmSygdMx);
}); });
}); });
} }
if (item.get切割完成5() != null) { if (item.get切割完成5() != null) {
Optional.ofNullable(collect.get("13")).ifPresent(boms -> { Optional.ofNullable(collect.get("14")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl()); dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成5()); dmSygdMx.setQgrq(item.get切割完成5());
dmSygdMx.setQbs("1");
dmSygdMx.setQjgrq(item.get曲外板曲完成());
dmSygdMx.setJssj(item.getQfxqrqxz()); dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setGjjsDz(item.getQfxqrqdz()); dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom); dmSygdMx.setBomData(bom);
@ -570,6 +651,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (item.get切割完成6() != null) { if (item.get切割完成6() != null) {
Optional.ofNullable(collect.get("11")).ifPresent(boms -> { Optional.ofNullable(collect.get("11")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_11",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -585,6 +667,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
if (item.get切割完成7() != null) { if (item.get切割完成7() != null) {
Optional.ofNullable(collect.get("15")).ifPresent(boms -> { Optional.ofNullable(collect.get("15")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_15",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -598,6 +681,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
Optional.ofNullable(collect.get("16")).ifPresent(boms -> { Optional.ofNullable(collect.get("16")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_16",boms.size());
boms.forEach(bom -> { boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx(); DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh()); dmSygdMx.setDcCh(item.getDcCh());
@ -610,6 +694,23 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}); });
}); });
} }
if(item.get光电完成()!=null){
Optional.ofNullable(collect.get("17")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_17",boms.size());
boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get光电完成());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
}
redisTemplate.opsForHash().put(GJSCGK_SYGDMX_KEY + fileName, item.getDcCh() + "_" + dcPl, addList); redisTemplate.opsForHash().put(GJSCGK_SYGDMX_KEY + fileName, item.getDcCh() + "_" + dcPl, addList);
}); });
} }

5
src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java
Unescape View File

@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.jcsj.DmBom; import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jcsj.DmCbxxp; import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
import com.dsic.gj_erp.bean.jhgk.*; import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;
import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
import com.dsic.gj_erp.bean.jhgk.YdjhImport;
import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel; import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel;
import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh;
import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper; import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;

1
src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java
Unescape View File

@ -7,7 +7,6 @@ import com.dsic.gj_erp.jiuzhoumapper.SljhMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

1
src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
Unescape View File

@ -1,6 +1,5 @@
package com.dsic.gj_erp.service.zyjh; package com.dsic.gj_erp.service.zyjh;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jhgk.DmYdjh;

1
src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
Unescape View File

@ -19,7 +19,6 @@ import com.dsic.gj_erp.service.jcsj.DmBzryService;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

3
src/main/resources/mappers/jcsj/DmBomMapper.xml
Unescape View File

@ -285,6 +285,9 @@
dm_bom dm_bom
WHERE WHERE
dcch =#{dcCh} and pl =#{dcPl} and type='b' dcch =#{dcCh} and pl =#{dcPl} and type='b'
<if test="kw!=null and kw!=''">
and kw=#{kw}
</if>
</select> </select>

Write Preview
Loading…
Cancel
Save