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

修改三月滚动计划管理查询

Browse Source
master
xiaoning 11 months ago
parent 6e8779ca03
commit ddd8f458f5
6 changed files with 105 additions and 56 deletions
Show Stats Download Patch File Download Diff File

34
gj_erp.iml
Unescape View File

@ -13,6 +13,7 @@
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
<factory-entry name="gj_erp" />
<factory-entry name="manEntityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
@ -32,13 +33,27 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:3.2.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:3.2.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:3.2.0" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
@ -57,9 +72,7 @@
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.4.RELEASE" level="project" />
@ -82,17 +95,15 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.38" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.38" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
@ -104,7 +115,6 @@
<orderEntry type="library" name="Maven: com.mysema.commons:mysema-commons-lang:0.2.4" level="project" />
<orderEntry type="library" name="Maven: com.infradna.tool:bridge-method-annotation:1.13" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-apt:4.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-codegen:4.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.mysema.codegen:codegen:0.6.8" level="project" />
@ -119,7 +129,6 @@
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
@ -159,7 +168,7 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.52.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.52.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.15" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.25" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.4.RELEASE" level="project" />
@ -184,8 +193,6 @@
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.9.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
@ -198,6 +205,7 @@
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.0.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.modelmapper:modelmapper:2.3.5" level="project" />
<orderEntry type="library" name="Maven: org.modelmapper:modelmapper:3.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
</component>
</module>

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

@ -16,22 +16,64 @@ import java.util.regex.Pattern;
public class Test {
public static void main(String[] args) throws IOException {
//String aaa="gagagag";
//System.out.println(aaa.split("@")[0]);
//System.out.println("aaa = " + String.format("%03d",1));
String pdfFilePath = "E:/B046HC103HN第046批量数控套料图2023-05-11.pdf"; // PDF文件路径
String pdfFilePath = "E:/runpeng/1润芃工作日志/第21个月/第3周/钢加项目资料/小池/新建文件夹/G175K-3/G175K-3_81_20240401/PDF/B081HC103HN第81批数控套料图.pdf"; // PDF文件路径
// String pdfFilePath = "E:/runpeng/1润芃工作日志/第21个月/第3周/钢加项目资料/小池/B046HC103HN第046批量数控套料图2023-05-11.pdf"; // PDF文件路径
PDDocument document = PDDocument.load(new File(pdfFilePath));
PDFTextStripper stripper = new PDFTextStripper();
String text = stripper.getText(document);
stripper.setStartPage(72);
stripper.setEndPage(72);
String text = stripper.getText(document);//本页文字内容
// String tlth[]=s.split("序号零件编号")[1].split(" ");
// String dcCh=tlth[2].split("\r\n")[1];
// String pl=tlth[3];
// String th=tlth[6].substring(0,12);
// String thbh=tlth[5];
// String tlth1[]=text.split("序号零件编号")[1].split("\r\n");
// Double hxcd=new Double(tlth1[2]);
// Double qgcd=new Double(tlth1[3]);
// Double hxkc=new Double(tlth1[4]);
// Double qgkc=new Double(tlth1[5]);
String tlth1[]=text.split("DNV\\+CCS")[1].split("\r\n");
Double ljzl=new Double(tlth1[1]);
System.out.println(ljzl);
// System.out.println(dcCh);
// System.out.println(pl);
// System.out.println(th);
// System.out.println(thbh);
// System.out.println(hxcd+"/"+qgcd+"/"+hxkc+"/"+qgkc);
// String[] a=text.split("\r\n");
// int ljCount= text.split("\\|")[0].split("\r\n").length;//零件数量
//取用下标count 至 count*2-1的数组，为属性
// String[] sxArray=getArrayByIndex(a,ljCount-1,ljCount*2-2);
//取用下标count*2 至 count*3-1 的数组，为零件号
// String[] ljArray=getArrayByIndex(a,ljCount*2-2,ljCount*3-3);
// for (int i = 0; i < sxArray.length; i++) {
// if (i==0){
// String[] b= ljArray[i].split("\\|");
// System.out.println(b[b.length-1]);
// System.out.println(sxArray[i].split("\\|")[4]);
// }else {
// System.out.println(ljArray[i]);
// System.out.println(sxArray[i].split("\\|")[4]);
// }
// }
document.close();
// 输出提取的文本到控制台
System.out.println(text);
// 可以选择将文本写入文件
String outputPath = "E:/B046HC103HN第046批量数控套料图2023-05-11.txt"; // 输出文本文件路径
String outputPath = "C:/Users/91564/Desktop/B046HC103HN第046批量数控套料图2023-05-11.txt"; // 输出文本文件路径
Files.write(Paths.get(outputPath), text.getBytes());
}
public static String[] getArrayByIndex(String[] oldArray,int startIndex,int endIndex){
int newArraylen=endIndex-startIndex+1;
String[] array=new String[newArraylen];
for (int i = 0; i < newArraylen; i++) {
array[i]=oldArray[i+startIndex];
}
return array;
}
}

2
src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java
Unescape View File

@ -80,7 +80,7 @@ public class DmYdjhxf implements Serializable {
private String qkxcms;
@ApiModelProperty(value = "型材面板")
private String xcmb;
@ApiModelProperty(value = "分段需求")
@ApiModelProperty(value = "分段需求/小组配送结束")
private String fdxq;
@ApiModelProperty(value = "光电结束")
private String gdjs;

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

@ -9,16 +9,14 @@ 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.DmDhqdp;
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.*;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelQFListener;
import com.dsic.gj_erp.listeners.ExcelSYListener;
import com.dsic.gj_erp.service.jcsj.EmGcrlService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.sy.SYService;
import io.swagger.annotations.ApiOperation;
@ -47,25 +45,28 @@ public class DmSygdController {
@Resource
DmSygdService service;
@Resource
DmSygdMxService mxService;
@Autowired
private EmGcrlService gcrlService;
@RequestMapping("/getList")
@AuthFunction
public ResultBean getList(@RequestBody DmSygd sygd){
List<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
.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<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
// .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<DmYdjhxf> 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<EmGcrl> emGcrls= gcrlService.list(new QueryWrapper<EmGcrl>().select("gl").between("gl",beginTime,endTime).eq("xxr","0"));
List<String> gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList());
map.put("gcrl",gcrl);
}
// if (list.size()>0){
// String beginTime=list.get(0).getGjjsXz();
// String endTime=list.get(list.size()-1).getGjjsXz();
// List<EmGcrl> emGcrls= gcrlService.list(new QueryWrapper<EmGcrl>().select("gl").between("gl",beginTime,endTime).eq("xxr","0"));
// List<String> gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList());
// map.put("gcrl",gcrl);
// }
map.put("list",list);
return new ResultBean(map);
}

24
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
Unescape View File

@ -27,10 +27,7 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -57,8 +54,6 @@ import java.util.stream.Collectors;
@Service
public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> implements DmSygdMxService {
@Resource
private EmGcrlMapper gcrlMapper;
@Resource
private DmSygdService sygdService;
@Resource
@ -740,7 +735,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
return new ResultBean(null);
}
//根据船号+批量分组
Map<String, List<DmSygdMx>> map = list.stream().collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl()));
Map<String, List<DmSygdMx>> map = list.stream().filter(mx -> Objects.nonNull(mx.getTzbh())) // group by 的字段不能有null值
.collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl()));
List<DmSygd> sygdList = new ArrayList<>();
for (String key : map.keySet()) {
DmSygd sygd = new DmSygd();
@ -924,14 +920,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
String[] fds= l.getDcFd().split(" ");
double count= fds.length%2;
int index;
if (count>0){
index= (fds.length/2)+1;
}else {
if (count>0){
index= (fds.length/2)+1;
}else {
index= fds.length/2;
}
String fd1= Arrays.toString(Arrays.copyOfRange(fds, 0, index)).replace(","," ");// 截取索引0（包括）到索引index（不包括）的元素
String fd2= Arrays.toString(Arrays.copyOfRange(fds, index, fds.length)).replace(","," ");
}
String fd1= Arrays.toString(Arrays.copyOfRange(fds, 0, index)).replace(","," ");// 截取索引0（包括）到索引index（不包括）的元素
String fd2= Arrays.toString(Arrays.copyOfRange(fds, index, fds.length)).replace(","," ");
l.setDcFd(fd1.substring(1,fd1.lastIndexOf("]")));
ydjhxf1.setDcFd(fd2.substring(1,fd2.lastIndexOf("]")));
@ -945,6 +940,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
}
ydjhxf1.setSkbs(l.getSkbs2());
ydjhxf1.setSkqgks(l.getSkqgks2());
ydjhxf1.setFdxq(l.getFdxq());
list2.add(l);
list2.add(ydjhxf1);
}

6
src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
Unescape View File

@ -424,6 +424,7 @@
<select id="tqSygd1" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhxf">
SELECT aa.dc_ch,aa.dc_pl,aa.dc_fd,
(SELECT COUNT(c) from
( SELECT COUNT(1) as c
@ -514,9 +515,10 @@
(SELECT a.qgrq from
( SELECT row_number() over(partition by DC_CH,DC_PL order by qgrq ) rn,DC_CH,DC_PL,qgrq from dm_sygd_mx WHERE
dm_sygd_mx.dc_ch=aa.dc_ch and dm_sygd_mx.dc_pl=aa.dc_pl and dm_sygd_mx.kw='11'
)a WHERE rn=1) as 'skqgks2'
)a WHERE rn=1) as 'skqgks2',
aa.jssj as fdxq
from (
SELECT dc_ch,dc_pl,dc_fd from dm_sygd_mx where dm_sygd_mx.jssj between #{begin} and #{end}
SELECT dc_ch,dc_pl,dc_fd,Min(jssj) as jssj from dm_sygd_mx where dm_sygd_mx.jssj between #{begin} and #{end}
GROUP BY dc_ch,dc_pl,dc_fd
)aa ORDER BY aa.dc_ch,aa.dc_pl
</select>

Write Preview
Loading…
Cancel
Save