Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

每日生产状态报表增加上工序操作员、下料尺寸、材料名称、批量修改工艺路线

Browse Source
master
yangwl 3 years ago
parent 4badf9f3b7
commit 18c043f11b
6 changed files with 337 additions and 49 deletions
Show Stats Download Patch File Download Diff File

233
common/common.iml
Unescape Escape View File

@ -0,0 +1,233 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.foreverwin.modular:modular-core:1.0-SNAPSHOT.standlone-hana" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.43" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.6.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.11.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:2.5.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.14" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.0" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.5.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.48" level="project" />
<orderEntry type="library" name="Maven: ojdbc6:ojdbc6:11.2.0.4" level="project" />
<orderEntry type="library" name="Maven: com.sap:ngdbc:2.5.52" level="project" />
<orderEntry type="library" name="Maven: com.sap:sapdbc:7.9.09" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-legacy:1.1.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-typehandlers-jsr310:1.0.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.12" level="project" />
<orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.12" level="project" />
<orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.12" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.12" level="project" />
<orderEntry type="library" name="Maven: com.sap:sapjco:NTAMD64-3.0.6" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.2.0.v20160908" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.foreverwin.modular:modular-melib:15.4.0.2.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.activity.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.annotation.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.appconfig.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.backgroundprocess.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.browse.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.certification.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.collaboration.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.common.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.container.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.customdata.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datacollection.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.dataformat.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datatransfer.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datatype.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.demand.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.document.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.extension.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.api-internal:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.globalization:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.cncdnc.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.erp.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.inventory.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.labor.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.legacy.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.messaging.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.nonconformance.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.numbering.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.plant.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.productdefinition.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.production.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.productiondate.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.reasoncode.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.reporting.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.resourcetracking.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.sampling.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.schedulingstandards.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.script.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.security.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.setpoint.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.status.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.timeelement.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.tooling.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.uom.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.user.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:service-core.api:3.4.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:common-libs:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:sap-usermanagement-api:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.common.domain:154.0.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.8" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-activemq:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-broker:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.14.5" level="project" />
<orderEntry type="library" name="Maven: javax.jms:javax.jms-api:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.13.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-jms-pool:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-client:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.3" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.6" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
<orderEntry type="module" module-name="meapi" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:barcodes:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:font-asian:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:forms:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:hyph:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:io:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:commons:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:kernel:7.2.0" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:layout:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:pdfa:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:sign:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:styled-xml-parser:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:svg:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
</component>
</module>

5
common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
Unescape Escape View File

@ -6,6 +6,8 @@ package com.foreverwin.mesnac.common.controller;
* @Since 2021-08-23
*/
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.foreverwin.mesnac.common.mapper.ReportDataMapper;
import com.foreverwin.mesnac.common.service.ReportDataService;
import com.foreverwin.modular.core.util.CommonMethods;
@ -13,6 +15,8 @@ import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -108,6 +112,7 @@ public class ReportDataController {
return R.failed(e.getMessage());
}
}
/**
* 每日生产状态报表
*

29
common/src/main/resources/mapper/ReportDataMapper.xml
Unescape Escape View File

@ -350,8 +350,18 @@
ZSD.SFC , ZSD.WORK_CENTER , WCT.DESCRIPTION WORK_CENTER_DESCRIPTION , RU.ROUTER_TYPE , ZSD.STEP_ID , ZSD.OPERATION ,CF.VALUE CHECK_USR,
OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION , ZSD.DISPATCH_STATUS OPERATION_STATUS ,
ZSD.PROD_HOURS ,ZSD.ACTUAL_PROD_HOURS , ZSD.PLANNED_START_DATE , ZSD.PLANNED_COMP_DATE , ZSD.ACTUAL_START_DATE , ZSD.ACTUAL_COMPLETE_DATE,
ROUND(TO_NUMBER(ZSD.ACTUAL_COMPLETE_DATE- ZSD.PLANNED_COMP_DATE)) TARDINESS_TIME
CASE WHEN ZSD.ACTUAL_COMPLETE_DATE IS NOT NULL THEN ROUND(TO_NUMBER(ZSD.ACTUAL_COMPLETE_DATE -ZSD.PLANNED_COMP_DATE))
ELSE ROUND(TO_NUMBER(sysdate -ZSD.PLANNED_COMP_DATE)) END TARDINESS_TIME,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '已完成'
ELSE '未完成' END LAST_OPERATION_STATUS,PREZSD.EMPLOYEE_DESCRIPTION,CT.DESCRIPTION COMPONENT_DESCRIPTION,ZSD.BLANKING_SIZE
FROM Z_SFC_DISPATCH ZSD
INNER JOIN SFC SC ON SC.SITE = ZSD.SITE AND SC.SFC = ZSD.SFC
INNER JOIN SFC_BOM SB ON SB.SFC_BO = SC.HANDLE
INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
LEFT JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
LEFT JOIN Z_SFC_DISPATCH PREZSD
ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 AND zsd.ROUTER_BO=PREZSD.ROUTER_BO
LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = SO.HANDLE AND CFA."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = SO.HANDLE AND CFB."ATTRIBUTE" = 'ITEM_NUMBER'
@ -366,6 +376,10 @@
LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE AND R.SITE = ZSD.SITE
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
JOIN SFC S ON S.SFC=ZSD.SFC AND S.SITE=ZSD.SITE
JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true'
LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
WHERE ZSD.SITE = #{site}
<if test="itemNumber != null and itemNumber != ''" >
AND CFB.VALUE LIKE '%'||#{itemNumber}||'%'
@ -388,6 +402,9 @@
<if test="operation != null and operation != ''" >
AND ZSD.OPERATION = #{operation}
</if>
<if test="operationDescription != null and operationDescription != ''" >
AND OT.DESCRIPTION = #{operationDescription}
</if>
<if test="item != null and item != ''" >
AND I.ITEM = #{item}
</if>
@ -404,6 +421,16 @@
</otherwise>
</choose>
</if>
<if test="lastoperationStatus != null and lastoperationStatus != ''" >
<choose>
<when test="lastoperationStatus != 'NOTCOMPLETE'.toString()">
AND zsd.DISPATCH_SEQ = SS.STEP_SEQUENCE
</when>
<otherwise>
AND zsd.DISPATCH_SEQ != SS.STEP_SEQUENCE
</otherwise>
</choose>
</if>
<if test="operationStatus != null and operationStatus != ''" >
<choose>
<when test="operationStatus != 'OTHER'.toString()">

17
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
Unescape Escape View File

@ -199,13 +199,20 @@ public class ShopOrderReleaseController {
@ResponseBody
@PostMapping("/UpdateWorkmanship")
public R updateWorkmanship(@RequestBody UpdateWKSBparam updateWKSBparam){
Boolean flag = true;
StringBuffer message = new StringBuffer();
try{
for (ShopOrderRelease shopOrderRelease:updateWKSBparam.getShopOrderList()){
shopOrderReleaseService.changerouterRevision(shopOrderRelease,updateWKSBparam.getType());
}
flag = shopOrderReleaseService.changerouterRevision(updateWKSBparam.getShopOrderList(),message,updateWKSBparam.getType());
}catch (Exception e){
return R.failed(e.getMessage());
flag = false;
message.append(e.getMessage());
}
if (flag){
message.insert(0, "更新成功");
return R.ok(message.toString());
}else {
message.insert(0, "已是最新版本：");
return R.failed(message.toString());
}
return R.ok("更改成功!");
}
}

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
Unescape Escape View File

@ -99,7 +99,7 @@ public interface ShopOrderReleaseService {
*/
void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList) throws IOException;
void changerouterRevision(ShopOrderRelease shopOrderRelease,String type);
Boolean changerouterRevision(List<ShopOrderRelease> shopOrderRelease,StringBuffer message,String type);
// void changeBomRevision(ShopOrderRelease shopOrderRelease) ;
}

100
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
Unescape Escape View File

@ -370,55 +370,71 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
}
@Override
public void changerouterRevision(ShopOrderRelease shopOrderRelease,String type) {
public Boolean changerouterRevision(List<ShopOrderRelease> shopOrderReleaseList,StringBuffer message,String type) {
ChangeProductionServiceInterface changeProductionService = null;
ChangeProductionContext changeProductionContext = new ChangeProductionContext();
ChangeProductionRequest changeProductionRequest = new ChangeProductionRequest();
List<String> sfcList = new ArrayList<>();
String shopOrderBo = shopOrderRelease.getShopOrderBo();
ShopOrder shopOrderModel = shopOrderService.getById(shopOrderBo);
/**
* 通过工单号找SFC
*/
List<String> stringList = shopOrderReleaseMapper.findSfc(shopOrderModel.getShopOrder());
if (!stringList.isEmpty()){
for (int j = 0; j < stringList.size(); j++) {
sfcList.add(stringList.get(j));
Boolean flag = true;
for (ShopOrderRelease shopOrderRelease:shopOrderReleaseList){
String shopOrderBo = shopOrderRelease.getShopOrderBo();
ShopOrder shopOrderModel = shopOrderService.getById(shopOrderBo);
/**
* 通过工单号找SFC
*/
List<String> stringList = shopOrderReleaseMapper.findSfc(shopOrderModel.getShopOrder());
if (!stringList.isEmpty()){
for (int j = 0; j < stringList.size(); j++) {
sfcList.add(stringList.get(j));
}
}
/**
* 通过工单号找目前最新的工艺路线、版本号
*/
RouterDTO routerDTO=shopOrderReleaseMapper.findNewRouter(shopOrderModel.getShopOrder());
if (routerDTO.getRevision().equals(shopOrderRelease.getRevision())){
flag = false;
message.append("工单[" + shopOrderRelease.getShopOrder() + "]工艺路线是最新的，无需更新！");
continue;
}
if (routerDTO!=null&&type.equals("A")){
changeProductionContext.setNewRouter(routerDTO.getRouter());
changeProductionContext.setNewRouterRevision(routerDTO.getRevision());
changeProductionRequest.setOperationPlacementType(OperationPlacementTypeEnum.CURRENT_OPERATION);
}
/**
* 通过工单号找目前最新的BOM号、版本
*/
Bom bom=shopOrderReleaseMapper.findNewBom(shopOrderModel.getShopOrder());
if (bom.getRevision().equals(shopOrderRelease.getBomrevision())){
flag = false;
message.append("工单[" + shopOrderRelease.getShopOrder() + "]BOM版本是最新的，无需更新！");
continue;
}
if (bom!=null&&type.equals("B")){
changeProductionContext.setNewBom(bom.getBom());
changeProductionContext.setNewBomRevision(bom.getRevision());
}
}
/**
* 通过工单号找目前最新的工艺路线、版本号
*/
RouterDTO routerDTO=shopOrderReleaseMapper.findNewRouter(shopOrderModel.getShopOrder());
if (routerDTO!=null&&type.equals("A")){
changeProductionContext.setNewRouter(routerDTO.getRouter());
changeProductionContext.setNewRouterRevision(routerDTO.getRevision());
changeProductionRequest.setOperationPlacementType(OperationPlacementTypeEnum.CURRENT_OPERATION);
}
/**
* 通过工单号找目前最新的BOM号、版本
*/
Bom bom=shopOrderReleaseMapper.findNewBom(shopOrderModel.getShopOrder());
if (bom!=null&&type.equals("B")){
changeProductionContext.setNewBom(bom.getBom());
changeProductionContext.setNewBomRevision(bom.getRevision());
}
try {
changeProductionService = MEServices.create("com.sap.me.production", "ChangeProductionService", CommonMethods.getSite());
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
changeProductionRequest.setAllowDoneSfcs(true);
changeProductionRequest.setSfcList(sfcList);
changeProductionRequest.setChangeProductionContextType(changeProductionContext);
try {
changeProductionService.changeProduction(changeProductionRequest);
} catch (com.sap.me.frame.domain.BusinessException e) {
throw com.foreverwin.modular.core.exception.BusinessException.build(Exceptions.convert(e).toString());
} catch (Exception e) {
throw com.foreverwin.modular.core.exception.BusinessException.build(Exceptions.getRootCauseException(e).getMessage());
try {
changeProductionService = MEServices.create("com.sap.me.production", "ChangeProductionService", CommonMethods.getSite());
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
changeProductionRequest.setAllowDoneSfcs(true);
changeProductionRequest.setSfcList(sfcList);
changeProductionRequest.setChangeProductionContextType(changeProductionContext);
try {
changeProductionService.changeProduction(changeProductionRequest);
} catch (com.sap.me.frame.domain.BusinessException e) {
throw com.foreverwin.modular.core.exception.BusinessException.build(Exceptions.convert(e).toString());
} catch (Exception e) {
throw com.foreverwin.modular.core.exception.BusinessException.build(Exceptions.getRootCauseException(e).getMessage());
}
}
return flag;
}

Write Preview
Loading…
Cancel
Save