新增倒仓功能点

depot-qualitycheck.iml

@@ -0,0 +1,245 @@
+<?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: org.springframework.boot:spring-boot-starter-web:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.31" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.31" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.31" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.9.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-eureka-server:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-server:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-client:1.9.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.19.1" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.19.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.eureka:eureka-core:1.9.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-codec-http:4.1.24.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-epoll:4.1.24.Final" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.netty:netty-transport-native-unix-common:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-config:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-config-client:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.0.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.5.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.5.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.5.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-java8:9.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.24.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-data-redis:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" 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" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.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.0.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-spring-boot-starter-jaxws:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-spring-boot-autoconfigure:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.2.4" 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.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.2.4" 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.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web-services:2.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.0.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.ws:spring-ws-core:3.0.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:3.0.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+  </component>
+</module>

src/main/java/com/chinaitop/depot/pushs/service/PushsService.java

@@ -1,13 +0,0 @@
-package com.chinaitop.depot.pushs.service;
-
-
-public interface PushsService {
-
-
-	//出入库将倒仓通知单记录传回库级平台进行展示
-	String updateChangeStorageHouse(String ChangeStorageHouseData);
-
-	//出入库取库级平台倒仓通知单数据
-	String getContractDatas(String orgId, String ids);
-
-}

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -1,71 +0,0 @@
-package com.chinaitop.depot.pushs.service.impl;
-
-
-import com.alibaba.fastjson.JSON;
-import com.chinaitop.depot.pushs.service.PushsService;
-import com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseDefaultMapper;
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop;
-import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
-import com.chinaitop.depot.storage.utils.ParameterUtil;
-import com.chinaitop.depot.storage.utils.ResponseEntity;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class PushServiceImpl implements PushsService {
-	
-    final static Logger logger  =  LoggerFactory.getLogger(PushServiceImpl.class );
-
-
-	@Resource
-	private StorageChangeStoragehouseDefaultMapper storageChangeStoragehouseDefaultMapper;
-
-	@Resource
-	private StorageChangeStoragehouseRopService storageChangeStoragehouseRopService;
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public String updateChangeStorageHouse(String ChangeStorageHouseData) {
-		String retS = "Success";
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			StorageChangeStoragehouseRop storageChangeStoragehouseRop = (StorageChangeStoragehouseRop) mapper.readValue(ChangeStorageHouseData, StorageChangeStoragehouseRop.class);
-			storageChangeStoragehouseRopService.insertChangeStorageHouse(storageChangeStoragehouseRop);
-		} catch (IOException e) {
-			return retS = "error";
-		}
-		return retS;
-	}
-
-
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public String getContractDatas(String orgId, String ids) {
-		//查出数据
-		Map<String,Object> mapCondition = new HashMap<String, Object>();
-		if(ParameterUtil.isnotnull(ids)){
-			List<String> conList = Arrays.asList(ids.split(","));
-			mapCondition.put("ids",conList);
-		}
-		if(ParameterUtil.isnotnull(orgId)){
-			mapCondition.put("orgId",orgId);
-		}
-		List<Map<String,Object>> mainList =storageChangeStoragehouseDefaultMapper.contractData(mapCondition);
-
-		Map<String,Object> mapData = new HashMap<String, Object>();
-		mapData.put("status", "success");
-		mapData.put("mainData", mainList);
-		return JSON.toJSONString(ResponseEntity.ok(mapData));
-	}
-}

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.java

@@ -1,13 +1,12 @@
 package com.chinaitop.depot.storage.mapper;
 
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault;
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample;
-
 public interface StorageChangeStoragehouseDefaultMapper {
     int countByExample(StorageChangeStoragehouseDefaultExample example);
 
@@ -22,8 +21,6 @@ public interface StorageChangeStoragehouseDefaultMapper {
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
 
     int updateByExample(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
-
-    List<Map<String,Object>> contractData(Map<String, Object> map);
-
-    List<StorageChangeStoragehouseDefault> selectAllDate(int orgIds);
+    
+    List<Map<String,Object>> contractData(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.xml

@@ -7,6 +7,7 @@
     <result column="apply_no" property="applyNo" jdbcType="VARCHAR" />
     <result column="apply_time" property="applyTime" jdbcType="TIMESTAMP" />
     <result column="out_storehouse" property="outStorehouse" jdbcType="INTEGER" />
+    <result column="out_storehouse_name" property="outStorehouseName" jdbcType="VARCHAR" />
     <result column="out_warehouse" property="outWarehouse" jdbcType="INTEGER" />
     <result column="out_warehouse_name" property="outWarehouseName" jdbcType="VARCHAR" />
     <result column="food_war" property="foodWar" jdbcType="INTEGER" />
@@ -16,6 +17,7 @@
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
+    <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
     <result column="into_warehouse_name" property="intoWarehouseName" jdbcType="VARCHAR" />
     <result column="detail_war" property="detailWar" jdbcType="INTEGER" />
@@ -82,9 +84,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_warehouse, out_warehouse_name, 
-    food_war, food_nature, bit_weigh, out_before, apply_firm, create_time, into_storehouse, 
-    into_warehouse, into_warehouse_name, detail_war, food_number, out_after, oper_staff
+    changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
+    out_warehouse, out_warehouse_name, food_war, food_nature, bit_weigh, out_before, 
+    apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, into_warehouse_name, 
+    detail_war, food_number, out_after, oper_staff
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" >
     select
@@ -107,20 +110,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
-    insert into storage_change_storagehouse_default (changehouse_no, org_id, apply_no,
-      apply_time, out_storehouse, out_warehouse, 
-      out_warehouse_name, food_war, food_nature, 
-      bit_weigh, out_before, apply_firm, 
-      create_time, into_storehouse, into_warehouse, 
-      into_warehouse_name, detail_war, food_number, 
-      out_after, oper_staff)
+    insert into storage_change_storagehouse_default (changehouse_no, org_id, apply_no, 
+      apply_time, out_storehouse, out_storehouse_name, 
+      out_warehouse, out_warehouse_name, food_war, 
+      food_nature, bit_weigh, out_before, 
+      apply_firm, create_time, into_storehouse, 
+      into_storehouse_name, into_warehouse, into_warehouse_name, 
+      detail_war, food_number, out_after, 
+      oper_staff)
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
-      #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outWarehouse,jdbcType=INTEGER}, 
-      #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, #{foodNature,jdbcType=VARCHAR}, 
-      #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,jdbcType=VARCHAR}, #{applyFirm,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, #{intoWarehouse,jdbcType=INTEGER}, 
-      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
-      #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR})
+      #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
+      #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
+      #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,jdbcType=VARCHAR}, 
+      #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, 
+      #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, #{intoWarehouseName,jdbcType=VARCHAR}, 
+      #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, 
+      #{operStaff,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
     insert into storage_change_storagehouse_default
@@ -140,6 +145,9 @@
       <if test="outStorehouse != null" >
         out_storehouse,
       </if>
+      <if test="outStorehouseName != null" >
+        out_storehouse_name,
+      </if>
       <if test="outWarehouse != null" >
         out_warehouse,
       </if>
@@ -167,6 +175,9 @@
       <if test="intoStorehouse != null" >
         into_storehouse,
       </if>
+      <if test="intoStorehouseName != null" >
+        into_storehouse_name,
+      </if>
       <if test="intoWarehouse != null" >
         into_warehouse,
       </if>
@@ -202,6 +213,9 @@
       <if test="outStorehouse != null" >
         #{outStorehouse,jdbcType=INTEGER},
       </if>
+      <if test="outStorehouseName != null" >
+        #{outStorehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="outWarehouse != null" >
         #{outWarehouse,jdbcType=INTEGER},
       </if>
@@ -229,6 +243,9 @@
       <if test="intoStorehouse != null" >
         #{intoStorehouse,jdbcType=INTEGER},
       </if>
+      <if test="intoStorehouseName != null" >
+        #{intoStorehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="intoWarehouse != null" >
         #{intoWarehouse,jdbcType=INTEGER},
       </if>
@@ -273,6 +290,9 @@
       <if test="record.outStorehouse != null" >
         out_storehouse = #{record.outStorehouse,jdbcType=INTEGER},
       </if>
+      <if test="record.outStorehouseName != null" >
+        out_storehouse_name = #{record.outStorehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="record.outWarehouse != null" >
         out_warehouse = #{record.outWarehouse,jdbcType=INTEGER},
       </if>
@@ -300,6 +320,9 @@
       <if test="record.intoStorehouse != null" >
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
       </if>
+      <if test="record.intoStorehouseName != null" >
+        into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="record.intoWarehouse != null" >
         into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
       </if>
@@ -330,6 +353,7 @@
       apply_no = #{record.applyNo,jdbcType=VARCHAR},
       apply_time = #{record.applyTime,jdbcType=TIMESTAMP},
       out_storehouse = #{record.outStorehouse,jdbcType=INTEGER},
+      out_storehouse_name = #{record.outStorehouseName,jdbcType=VARCHAR},
       out_warehouse = #{record.outWarehouse,jdbcType=INTEGER},
       out_warehouse_name = #{record.outWarehouseName,jdbcType=VARCHAR},
       food_war = #{record.foodWar,jdbcType=INTEGER},
@@ -339,6 +363,7 @@
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
+      into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
       into_warehouse_name = #{record.intoWarehouseName,jdbcType=VARCHAR},
       detail_war = #{record.detailWar,jdbcType=INTEGER},
@@ -349,7 +374,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-   <select id="contractData" parameterType="java.util.Map" resultType="java.util.HashMap">
+  <select id="contractData" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT DISTINCT
         storagehouse.*
     FROM

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.java

@@ -3,8 +3,6 @@ package com.chinaitop.depot.storage.mapper;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample;
 import java.util.List;
-
-import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
 import org.apache.ibatis.annotations.Param;
 
 public interface StorageChangeStoragehouseRopMapper {
@@ -21,6 +19,4 @@ public interface StorageChangeStoragehouseRopMapper {
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
 
     int updateByExample(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
-
-    int updateByPrimaryKeySelective(StorageChangeStoragehouseRop record);
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.xml

@@ -11,8 +11,8 @@
     <result column="out_warehouse" property="outWarehouse" jdbcType="INTEGER" />
     <result column="out_warehouse_name" property="outWarehouseName" jdbcType="VARCHAR" />
     <result column="food_war" property="foodWar" jdbcType="INTEGER" />
-    <result column="food_nature" property="foodNature" jdbcType="VARCHAR" />
     <result column="food_status" property="foodStatus" jdbcType="VARCHAR" />
+    <result column="food_nature" property="foodNature" jdbcType="VARCHAR" />
     <result column="bit_weigh" property="bitWeigh" jdbcType="VARCHAR" />
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
@@ -22,9 +22,10 @@
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
     <result column="into_warehouse_name" property="intoWarehouseName" jdbcType="VARCHAR" />
     <result column="detail_war" property="detailWar" jdbcType="INTEGER" />
-    <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
     <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
+    <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
+    <result column="oper_staff" property="operStaff" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -86,9 +87,9 @@
   </sql>
   <sql id="Base_Column_List" >
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
-    out_warehouse, out_warehouse_name, food_war, food_nature, food_status, bit_weigh, 
+    out_warehouse, out_warehouse_name, food_war, food_status, food_nature, bit_weigh, 
     out_before, apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, 
-    into_warehouse_name, detail_war, goal_number, food_number, out_after
+    into_warehouse_name, detail_war, food_number, goal_number, out_after, oper_staff
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" >
     select
@@ -111,22 +112,24 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
-    insert into storage_change_storagehouse_rop (changehouse_no, org_id, apply_no,
+    insert into storage_change_storagehouse_rop (changehouse_no, org_id, apply_no, 
       apply_time, out_storehouse, out_storehouse_name, 
       out_warehouse, out_warehouse_name, food_war, 
-      food_nature, food_status, bit_weigh, 
+      food_status, food_nature, bit_weigh, 
       out_before, apply_firm, create_time, 
       into_storehouse, into_storehouse_name, into_warehouse, 
-      into_warehouse_name, detail_war, goal_number, 
-      food_number, out_after)
+      into_warehouse_name, detail_war, food_number, 
+      goal_number, out_after, oper_staff
+      )
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
-      #{foodNature,jdbcType=VARCHAR}, #{foodStatus,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, 
+      #{foodStatus,jdbcType=VARCHAR}, #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, 
       #{outBefore,jdbcType=VARCHAR}, #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
-      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{goalNumber,jdbcType=DECIMAL}, 
-      #{foodNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR})
+      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
+      #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
     insert into storage_change_storagehouse_rop
@@ -158,12 +161,12 @@
       <if test="foodWar != null" >
         food_war,
       </if>
-      <if test="foodNature != null" >
-        food_nature,
-      </if>
       <if test="foodStatus != null" >
         food_status,
       </if>
+      <if test="foodNature != null" >
+        food_nature,
+      </if>
       <if test="bitWeigh != null" >
         bit_weigh,
       </if>
@@ -191,15 +194,18 @@
       <if test="detailWar != null" >
         detail_war,
       </if>
-      <if test="goalNumber != null" >
-        goal_number,
-      </if>
       <if test="foodNumber != null" >
         food_number,
       </if>
+      <if test="goalNumber != null" >
+        goal_number,
+      </if>
       <if test="outAfter != null" >
         out_after,
       </if>
+      <if test="operStaff != null" >
+        oper_staff,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="changehouseNo != null" >
@@ -229,12 +235,12 @@
       <if test="foodWar != null" >
         #{foodWar,jdbcType=INTEGER},
       </if>
-      <if test="foodNature != null" >
-        #{foodNature,jdbcType=VARCHAR},
-      </if>
       <if test="foodStatus != null" >
         #{foodStatus,jdbcType=VARCHAR},
       </if>
+      <if test="foodNature != null" >
+        #{foodNature,jdbcType=VARCHAR},
+      </if>
       <if test="bitWeigh != null" >
         #{bitWeigh,jdbcType=VARCHAR},
       </if>
@@ -262,15 +268,18 @@
       <if test="detailWar != null" >
         #{detailWar,jdbcType=INTEGER},
       </if>
-      <if test="goalNumber != null" >
-        #{goalNumber,jdbcType=DECIMAL},
-      </if>
       <if test="foodNumber != null" >
         #{foodNumber,jdbcType=DECIMAL},
       </if>
+      <if test="goalNumber != null" >
+        #{goalNumber,jdbcType=DECIMAL},
+      </if>
       <if test="outAfter != null" >
         #{outAfter,jdbcType=VARCHAR},
       </if>
+      <if test="operStaff != null" >
+        #{operStaff,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" resultType="java.lang.Integer" >
@@ -309,12 +318,12 @@
       <if test="record.foodWar != null" >
         food_war = #{record.foodWar,jdbcType=INTEGER},
       </if>
-      <if test="record.foodNature != null" >
-        food_nature = #{record.foodNature,jdbcType=VARCHAR},
-      </if>
       <if test="record.foodStatus != null" >
         food_status = #{record.foodStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.foodNature != null" >
+        food_nature = #{record.foodNature,jdbcType=VARCHAR},
+      </if>
       <if test="record.bitWeigh != null" >
         bit_weigh = #{record.bitWeigh,jdbcType=VARCHAR},
       </if>
@@ -342,15 +351,18 @@
       <if test="record.detailWar != null" >
         detail_war = #{record.detailWar,jdbcType=INTEGER},
       </if>
-      <if test="record.goalNumber != null" >
-        goal_number = #{record.goalNumber,jdbcType=DECIMAL},
-      </if>
       <if test="record.foodNumber != null" >
         food_number = #{record.foodNumber,jdbcType=DECIMAL},
       </if>
+      <if test="record.goalNumber != null" >
+        goal_number = #{record.goalNumber,jdbcType=DECIMAL},
+      </if>
       <if test="record.outAfter != null" >
         out_after = #{record.outAfter,jdbcType=VARCHAR},
       </if>
+      <if test="record.operStaff != null" >
+        oper_staff = #{record.operStaff,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -367,8 +379,8 @@
       out_warehouse = #{record.outWarehouse,jdbcType=INTEGER},
       out_warehouse_name = #{record.outWarehouseName,jdbcType=VARCHAR},
       food_war = #{record.foodWar,jdbcType=INTEGER},
-      food_nature = #{record.foodNature,jdbcType=VARCHAR},
       food_status = #{record.foodStatus,jdbcType=VARCHAR},
+      food_nature = #{record.foodNature,jdbcType=VARCHAR},
       bit_weigh = #{record.bitWeigh,jdbcType=VARCHAR},
       out_before = #{record.outBefore,jdbcType=VARCHAR},
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
@@ -378,86 +390,10 @@
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
       into_warehouse_name = #{record.intoWarehouseName,jdbcType=VARCHAR},
       detail_war = #{record.detailWar,jdbcType=INTEGER},
-      goal_number = #{record.goalNumber,jdbcType=DECIMAL},
       food_number = #{record.foodNumber,jdbcType=DECIMAL},
-      out_after = #{record.outAfter,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="map" >
-    update storage_change_storagehouse_rop
-    <set >
-      <if test="record.changehouseNo != null" >
-        changehouse_no = #{record.changehouseNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgId != null" >
-        org_id = #{record.orgId,jdbcType=INTEGER},
-      </if>
-      <if test="record.applyNo != null" >
-        apply_no = #{record.applyNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.applyTime != null" >
-        apply_time = #{record.applyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.outStorehouse != null" >
-        out_storehouse = #{record.outStorehouse,jdbcType=INTEGER},
-      </if>
-      <if test="record.outStorehouseName != null" >
-        out_storehouse_name = #{record.outStorehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.outWarehouse != null" >
-        out_warehouse = #{record.outWarehouse,jdbcType=INTEGER},
-      </if>
-      <if test="record.outWarehouseName != null" >
-        out_warehouse_name = #{record.outWarehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.foodWar != null" >
-        food_war = #{record.foodWar,jdbcType=INTEGER},
-      </if>
-      <if test="record.foodNature != null" >
-        food_nature = #{record.foodNature,jdbcType=VARCHAR},
-      </if>
-      <if test="record.foodStatus != null" >
-        food_status = #{record.foodStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bitWeigh != null" >
-        bit_weigh = #{record.bitWeigh,jdbcType=VARCHAR},
-      </if>
-      <if test="record.outBefore != null" >
-        out_before = #{record.outBefore,jdbcType=VARCHAR},
-      </if>
-      <if test="record.applyFirm != null" >
-        apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null" >
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.intoStorehouse != null" >
-        into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
-      </if>
-      <if test="record.intoStorehouseName != null" >
-        into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.intoWarehouse != null" >
-        into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
-      </if>
-      <if test="record.intoWarehouseName != null" >
-        into_warehouse_name = #{record.intoWarehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.detailWar != null" >
-        detail_war = #{record.detailWar,jdbcType=INTEGER},
-      </if>
-      <if test="record.goalNumber != null" >
-        goal_number = #{record.goalNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="record.foodNumber != null" >
-        food_number = #{record.foodNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="record.outAfter != null" >
-        out_after = #{record.outAfter,jdbcType=VARCHAR},
-      </if>
-    </set>
+      goal_number = #{record.goalNumber,jdbcType=DECIMAL},
+      out_after = #{record.outAfter,jdbcType=VARCHAR},
+      oper_staff = #{record.operStaff,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefault.java

@@ -16,6 +16,8 @@ public class StorageChangeStoragehouseDefault {
 
     private Integer outStorehouse;
 
+    private String outStorehouseName;
+
     private Integer outWarehouse;
 
     private String outWarehouseName;
@@ -34,6 +36,8 @@ public class StorageChangeStoragehouseDefault {
 
     private Integer intoStorehouse;
 
+    private String intoStorehouseName;
+
     private Integer intoWarehouse;
 
     private String intoWarehouseName;
@@ -127,6 +131,22 @@ public class StorageChangeStoragehouseDefault {
     }
 
     /**
+     * 倒出仓房名称
+     * @return out_storehouse_name 倒出仓房名称
+     */
+    public String getOutStorehouseName() {
+        return outStorehouseName;
+    }
+
+    /**
+     * 倒出仓房名称
+     * @param outStorehouseName 倒出仓房名称
+     */
+    public void setOutStorehouseName(String outStorehouseName) {
+        this.outStorehouseName = outStorehouseName == null ? null : outStorehouseName.trim();
+    }
+
+    /**
      * 倒出货位
      * @return out_warehouse 倒出货位
      */
@@ -271,6 +291,22 @@ public class StorageChangeStoragehouseDefault {
     }
 
     /**
+     * 倒入仓房名称
+     * @return into_storehouse_name 倒入仓房名称
+     */
+    public String getIntoStorehouseName() {
+        return intoStorehouseName;
+    }
+
+    /**
+     * 倒入仓房名称
+     * @param intoStorehouseName 倒入仓房名称
+     */
+    public void setIntoStorehouseName(String intoStorehouseName) {
+        this.intoStorehouseName = intoStorehouseName == null ? null : intoStorehouseName.trim();
+    }
+
+    /**
      * 倒入货位
      * @return into_warehouse 倒入货位
      */

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefaultExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-04-10
+     * storage_change_storagehouse_default 2020-06-26
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -438,6 +438,76 @@ public class StorageChangeStoragehouseDefaultExample {
             return (Criteria) this;
         }
 
+        public Criteria andOutStorehouseNameIsNull() {
+            addCriterion("out_storehouse_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameIsNotNull() {
+            addCriterion("out_storehouse_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameEqualTo(String value) {
+            addCriterion("out_storehouse_name =", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameNotEqualTo(String value) {
+            addCriterion("out_storehouse_name <>", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameGreaterThan(String value) {
+            addCriterion("out_storehouse_name >", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("out_storehouse_name >=", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameLessThan(String value) {
+            addCriterion("out_storehouse_name <", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameLessThanOrEqualTo(String value) {
+            addCriterion("out_storehouse_name <=", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameLike(String value) {
+            addCriterion("out_storehouse_name like", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameNotLike(String value) {
+            addCriterion("out_storehouse_name not like", value, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameIn(List<String> values) {
+            addCriterion("out_storehouse_name in", values, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameNotIn(List<String> values) {
+            addCriterion("out_storehouse_name not in", values, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameBetween(String value1, String value2) {
+            addCriterion("out_storehouse_name between", value1, value2, "outStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutStorehouseNameNotBetween(String value1, String value2) {
+            addCriterion("out_storehouse_name not between", value1, value2, "outStorehouseName");
+            return (Criteria) this;
+        }
+
         public Criteria andOutWarehouseIsNull() {
             addCriterion("out_warehouse is null");
             return (Criteria) this;
@@ -1028,6 +1098,76 @@ public class StorageChangeStoragehouseDefaultExample {
             return (Criteria) this;
         }
 
+        public Criteria andIntoStorehouseNameIsNull() {
+            addCriterion("into_storehouse_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameIsNotNull() {
+            addCriterion("into_storehouse_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameEqualTo(String value) {
+            addCriterion("into_storehouse_name =", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameNotEqualTo(String value) {
+            addCriterion("into_storehouse_name <>", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameGreaterThan(String value) {
+            addCriterion("into_storehouse_name >", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("into_storehouse_name >=", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameLessThan(String value) {
+            addCriterion("into_storehouse_name <", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameLessThanOrEqualTo(String value) {
+            addCriterion("into_storehouse_name <=", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameLike(String value) {
+            addCriterion("into_storehouse_name like", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameNotLike(String value) {
+            addCriterion("into_storehouse_name not like", value, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameIn(List<String> values) {
+            addCriterion("into_storehouse_name in", values, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameNotIn(List<String> values) {
+            addCriterion("into_storehouse_name not in", values, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameBetween(String value1, String value2) {
+            addCriterion("into_storehouse_name between", value1, value2, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIntoStorehouseNameNotBetween(String value1, String value2) {
+            addCriterion("into_storehouse_name not between", value1, value2, "intoStorehouseName");
+            return (Criteria) this;
+        }
+
         public Criteria andIntoWarehouseIsNull() {
             addCriterion("into_warehouse is null");
             return (Criteria) this;
@@ -1430,7 +1570,7 @@ public class StorageChangeStoragehouseDefaultExample {
     }
 
     /**
-     * storage_change_storagehouse_default 2020-04-10
+     * storage_change_storagehouse_default 2020-06-26
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRop.java

@@ -24,10 +24,10 @@ public class StorageChangeStoragehouseRop {
 
     private Integer foodWar;
 
-    private String foodNature;
-
     private String foodStatus;
 
+    private String foodNature;
+
     private String bitWeigh;
 
     private String outBefore;
@@ -46,23 +46,25 @@ public class StorageChangeStoragehouseRop {
 
     private Integer detailWar;
 
-    private BigDecimal goalNumber;
-
     private BigDecimal foodNumber;
 
+    private BigDecimal goalNumber;
+
     private String outAfter;
 
+    private String operStaff;
+
     /**
-     * 通知单编号
-     * @return changehouse_no 通知单编号
+     * 倒仓通知单编号
+     * @return changehouse_no 倒仓通知单编号
      */
     public String getChangehouseNo() {
         return changehouseNo;
     }
 
     /**
-     * 通知单编号
-     * @param changehouseNo 通知单编号
+     * 倒仓通知单编号
+     * @param changehouseNo 倒仓通知单编号
      */
     public void setChangehouseNo(String changehouseNo) {
         this.changehouseNo = changehouseNo == null ? null : changehouseNo.trim();
@@ -197,22 +199,6 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
-     * 粮食性质
-     * @return food_nature 粮食性质
-     */
-    public String getFoodNature() {
-        return foodNature;
-    }
-
-    /**
-     * 粮食性质
-     * @param foodNature 粮食性质
-     */
-    public void setFoodNature(String foodNature) {
-        this.foodNature = foodNature == null ? null : foodNature.trim();
-    }
-
-    /**
      * 完成状态
      * @return food_status 完成状态
      */
@@ -229,6 +215,22 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
+     * 粮食性质
+     * @return food_nature 粮食性质
+     */
+    public String getFoodNature() {
+        return foodNature;
+    }
+
+    /**
+     * 粮食性质
+     * @param foodNature 粮食性质
+     */
+    public void setFoodNature(String foodNature) {
+        this.foodNature = foodNature == null ? null : foodNature.trim();
+    }
+
+    /**
      * 是否称重
      * @return bit_weigh 是否称重
      */
@@ -373,35 +375,35 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
-     * 目标数量
-     * @return goal_number 目标数量
+     * 粮食数量(公斤)
+     * @return food_number 粮食数量(公斤)
      */
-    public BigDecimal getGoalNumber() {
-        return goalNumber;
+    public BigDecimal getFoodNumber() {
+        return foodNumber;
     }
 
     /**
-     * 目标数量
-     * @param goalNumber 目标数量
+     * 粮食数量(公斤)
+     * @param foodNumber 粮食数量(公斤)
      */
-    public void setGoalNumber(BigDecimal goalNumber) {
-        this.goalNumber = goalNumber;
+    public void setFoodNumber(BigDecimal foodNumber) {
+        this.foodNumber = foodNumber;
     }
 
     /**
-     * 完成数量(公斤)
-     * @return food_number 完成数量(公斤)
+     * 目标数量
+     * @return goal_number 目标数量
      */
-    public BigDecimal getFoodNumber() {
-        return foodNumber;
+    public BigDecimal getGoalNumber() {
+        return goalNumber;
     }
 
     /**
-     * 完成数量(公斤)
-     * @param foodNumber 完成数量(公斤)
+     * 目标数量
+     * @param goalNumber 目标数量
      */
-    public void setFoodNumber(BigDecimal foodNumber) {
-        this.foodNumber = foodNumber;
+    public void setGoalNumber(BigDecimal goalNumber) {
+        this.goalNumber = goalNumber;
     }
 
     /**
@@ -419,4 +421,20 @@ public class StorageChangeStoragehouseRop {
     public void setOutAfter(String outAfter) {
         this.outAfter = outAfter == null ? null : outAfter.trim();
     }
+
+    /**
+     * 操作人员
+     * @return oper_staff 操作人员
+     */
+    public String getOperStaff() {
+        return operStaff;
+    }
+
+    /**
+     * 操作人员
+     * @param operStaff 操作人员
+     */
+    public void setOperStaff(String operStaff) {
+        this.operStaff = operStaff == null ? null : operStaff.trim();
+    }
 }

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRopExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-01-16
+     * storage_change_storagehouse_rop 2020-06-26
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -698,143 +698,143 @@ public class StorageChangeStoragehouseRopExample {
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureIsNull() {
-            addCriterion("food_nature is null");
+        public Criteria andFoodStatusIsNull() {
+            addCriterion("food_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureIsNotNull() {
-            addCriterion("food_nature is not null");
+        public Criteria andFoodStatusIsNotNull() {
+            addCriterion("food_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureEqualTo(String value) {
-            addCriterion("food_nature =", value, "foodNature");
+        public Criteria andFoodStatusEqualTo(String value) {
+            addCriterion("food_status =", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureNotEqualTo(String value) {
-            addCriterion("food_nature <>", value, "foodNature");
+        public Criteria andFoodStatusNotEqualTo(String value) {
+            addCriterion("food_status <>", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureGreaterThan(String value) {
-            addCriterion("food_nature >", value, "foodNature");
+        public Criteria andFoodStatusGreaterThan(String value) {
+            addCriterion("food_status >", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureGreaterThanOrEqualTo(String value) {
-            addCriterion("food_nature >=", value, "foodNature");
+        public Criteria andFoodStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("food_status >=", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureLessThan(String value) {
-            addCriterion("food_nature <", value, "foodNature");
+        public Criteria andFoodStatusLessThan(String value) {
+            addCriterion("food_status <", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureLessThanOrEqualTo(String value) {
-            addCriterion("food_nature <=", value, "foodNature");
+        public Criteria andFoodStatusLessThanOrEqualTo(String value) {
+            addCriterion("food_status <=", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureLike(String value) {
-            addCriterion("food_nature like", value, "foodNature");
+        public Criteria andFoodStatusLike(String value) {
+            addCriterion("food_status like", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureNotLike(String value) {
-            addCriterion("food_nature not like", value, "foodNature");
+        public Criteria andFoodStatusNotLike(String value) {
+            addCriterion("food_status not like", value, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureIn(List<String> values) {
-            addCriterion("food_nature in", values, "foodNature");
+        public Criteria andFoodStatusIn(List<String> values) {
+            addCriterion("food_status in", values, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureNotIn(List<String> values) {
-            addCriterion("food_nature not in", values, "foodNature");
+        public Criteria andFoodStatusNotIn(List<String> values) {
+            addCriterion("food_status not in", values, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureBetween(String value1, String value2) {
-            addCriterion("food_nature between", value1, value2, "foodNature");
+        public Criteria andFoodStatusBetween(String value1, String value2) {
+            addCriterion("food_status between", value1, value2, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNatureNotBetween(String value1, String value2) {
-            addCriterion("food_nature not between", value1, value2, "foodNature");
+        public Criteria andFoodStatusNotBetween(String value1, String value2) {
+            addCriterion("food_status not between", value1, value2, "foodStatus");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusIsNull() {
-            addCriterion("food_status is null");
+        public Criteria andFoodNatureIsNull() {
+            addCriterion("food_nature is null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusIsNotNull() {
-            addCriterion("food_status is not null");
+        public Criteria andFoodNatureIsNotNull() {
+            addCriterion("food_nature is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusEqualTo(String value) {
-            addCriterion("food_status =", value, "foodStatus");
+        public Criteria andFoodNatureEqualTo(String value) {
+            addCriterion("food_nature =", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusNotEqualTo(String value) {
-            addCriterion("food_status <>", value, "foodStatus");
+        public Criteria andFoodNatureNotEqualTo(String value) {
+            addCriterion("food_nature <>", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusGreaterThan(String value) {
-            addCriterion("food_status >", value, "foodStatus");
+        public Criteria andFoodNatureGreaterThan(String value) {
+            addCriterion("food_nature >", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("food_status >=", value, "foodStatus");
+        public Criteria andFoodNatureGreaterThanOrEqualTo(String value) {
+            addCriterion("food_nature >=", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusLessThan(String value) {
-            addCriterion("food_status <", value, "foodStatus");
+        public Criteria andFoodNatureLessThan(String value) {
+            addCriterion("food_nature <", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusLessThanOrEqualTo(String value) {
-            addCriterion("food_status <=", value, "foodStatus");
+        public Criteria andFoodNatureLessThanOrEqualTo(String value) {
+            addCriterion("food_nature <=", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusLike(String value) {
-            addCriterion("food_status like", value, "foodStatus");
+        public Criteria andFoodNatureLike(String value) {
+            addCriterion("food_nature like", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusNotLike(String value) {
-            addCriterion("food_status not like", value, "foodStatus");
+        public Criteria andFoodNatureNotLike(String value) {
+            addCriterion("food_nature not like", value, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusIn(List<String> values) {
-            addCriterion("food_status in", values, "foodStatus");
+        public Criteria andFoodNatureIn(List<String> values) {
+            addCriterion("food_nature in", values, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusNotIn(List<String> values) {
-            addCriterion("food_status not in", values, "foodStatus");
+        public Criteria andFoodNatureNotIn(List<String> values) {
+            addCriterion("food_nature not in", values, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusBetween(String value1, String value2) {
-            addCriterion("food_status between", value1, value2, "foodStatus");
+        public Criteria andFoodNatureBetween(String value1, String value2) {
+            addCriterion("food_nature between", value1, value2, "foodNature");
             return (Criteria) this;
         }
 
-        public Criteria andFoodStatusNotBetween(String value1, String value2) {
-            addCriterion("food_status not between", value1, value2, "foodStatus");
+        public Criteria andFoodNatureNotBetween(String value1, String value2) {
+            addCriterion("food_nature not between", value1, value2, "foodNature");
             return (Criteria) this;
         }
 
@@ -1428,123 +1428,123 @@ public class StorageChangeStoragehouseRopExample {
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberIsNull() {
-            addCriterion("goal_number is null");
+        public Criteria andFoodNumberIsNull() {
+            addCriterion("food_number is null");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberIsNotNull() {
-            addCriterion("goal_number is not null");
+        public Criteria andFoodNumberIsNotNull() {
+            addCriterion("food_number is not null");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberEqualTo(BigDecimal value) {
-            addCriterion("goal_number =", value, "goalNumber");
+        public Criteria andFoodNumberEqualTo(BigDecimal value) {
+            addCriterion("food_number =", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotEqualTo(BigDecimal value) {
-            addCriterion("goal_number <>", value, "goalNumber");
+        public Criteria andFoodNumberNotEqualTo(BigDecimal value) {
+            addCriterion("food_number <>", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberGreaterThan(BigDecimal value) {
-            addCriterion("goal_number >", value, "goalNumber");
+        public Criteria andFoodNumberGreaterThan(BigDecimal value) {
+            addCriterion("food_number >", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("goal_number >=", value, "goalNumber");
+        public Criteria andFoodNumberGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("food_number >=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberLessThan(BigDecimal value) {
-            addCriterion("goal_number <", value, "goalNumber");
+        public Criteria andFoodNumberLessThan(BigDecimal value) {
+            addCriterion("food_number <", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("goal_number <=", value, "goalNumber");
+        public Criteria andFoodNumberLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("food_number <=", value, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberIn(List<BigDecimal> values) {
-            addCriterion("goal_number in", values, "goalNumber");
+        public Criteria andFoodNumberIn(List<BigDecimal> values) {
+            addCriterion("food_number in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotIn(List<BigDecimal> values) {
-            addCriterion("goal_number not in", values, "goalNumber");
+        public Criteria andFoodNumberNotIn(List<BigDecimal> values) {
+            addCriterion("food_number not in", values, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("goal_number between", value1, value2, "goalNumber");
+        public Criteria andFoodNumberBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("food_number between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andGoalNumberNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("goal_number not between", value1, value2, "goalNumber");
+        public Criteria andFoodNumberNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("food_number not between", value1, value2, "foodNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberIsNull() {
-            addCriterion("food_number is null");
+        public Criteria andGoalNumberIsNull() {
+            addCriterion("goal_number is null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberIsNotNull() {
-            addCriterion("food_number is not null");
+        public Criteria andGoalNumberIsNotNull() {
+            addCriterion("goal_number is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberEqualTo(BigDecimal value) {
-            addCriterion("food_number =", value, "foodNumber");
+        public Criteria andGoalNumberEqualTo(BigDecimal value) {
+            addCriterion("goal_number =", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotEqualTo(BigDecimal value) {
-            addCriterion("food_number <>", value, "foodNumber");
+        public Criteria andGoalNumberNotEqualTo(BigDecimal value) {
+            addCriterion("goal_number <>", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThan(BigDecimal value) {
-            addCriterion("food_number >", value, "foodNumber");
+        public Criteria andGoalNumberGreaterThan(BigDecimal value) {
+            addCriterion("goal_number >", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("food_number >=", value, "foodNumber");
+        public Criteria andGoalNumberGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("goal_number >=", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThan(BigDecimal value) {
-            addCriterion("food_number <", value, "foodNumber");
+        public Criteria andGoalNumberLessThan(BigDecimal value) {
+            addCriterion("goal_number <", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("food_number <=", value, "foodNumber");
+        public Criteria andGoalNumberLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("goal_number <=", value, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberIn(List<BigDecimal> values) {
-            addCriterion("food_number in", values, "foodNumber");
+        public Criteria andGoalNumberIn(List<BigDecimal> values) {
+            addCriterion("goal_number in", values, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotIn(List<BigDecimal> values) {
-            addCriterion("food_number not in", values, "foodNumber");
+        public Criteria andGoalNumberNotIn(List<BigDecimal> values) {
+            addCriterion("goal_number not in", values, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("food_number between", value1, value2, "foodNumber");
+        public Criteria andGoalNumberBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("goal_number between", value1, value2, "goalNumber");
             return (Criteria) this;
         }
 
-        public Criteria andFoodNumberNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("food_number not between", value1, value2, "foodNumber");
+        public Criteria andGoalNumberNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("goal_number not between", value1, value2, "goalNumber");
             return (Criteria) this;
         }
 
@@ -1617,6 +1617,76 @@ public class StorageChangeStoragehouseRopExample {
             addCriterion("out_after not between", value1, value2, "outAfter");
             return (Criteria) this;
         }
+
+        public Criteria andOperStaffIsNull() {
+            addCriterion("oper_staff is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffIsNotNull() {
+            addCriterion("oper_staff is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffEqualTo(String value) {
+            addCriterion("oper_staff =", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffNotEqualTo(String value) {
+            addCriterion("oper_staff <>", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffGreaterThan(String value) {
+            addCriterion("oper_staff >", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffGreaterThanOrEqualTo(String value) {
+            addCriterion("oper_staff >=", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffLessThan(String value) {
+            addCriterion("oper_staff <", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffLessThanOrEqualTo(String value) {
+            addCriterion("oper_staff <=", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffLike(String value) {
+            addCriterion("oper_staff like", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffNotLike(String value) {
+            addCriterion("oper_staff not like", value, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffIn(List<String> values) {
+            addCriterion("oper_staff in", values, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffNotIn(List<String> values) {
+            addCriterion("oper_staff not in", values, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffBetween(String value1, String value2) {
+            addCriterion("oper_staff between", value1, value2, "operStaff");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperStaffNotBetween(String value1, String value2) {
+            addCriterion("oper_staff not between", value1, value2, "operStaff");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -1630,7 +1700,7 @@ public class StorageChangeStoragehouseRopExample {
     }
 
     /**
-     * storage_change_storagehouse_rop 2020-01-16
+     * storage_change_storagehouse_rop 2020-06-26
      */
     public static class Criterion {
         private String condition;

src/main/java/com/chinaitop/depot/storage/service/impl/StorageChangeStoragehouseRopServiceImpl.java

@@ -55,7 +55,8 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
 	public Map<String, Object> add(String change) {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
         try {
-            
+			StorageChangeStoragehouseDefaultExample StorageChangeStoragehouseDefaultExample = new StorageChangeStoragehouseDefaultExample();
+			com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample.Criteria criteria = StorageChangeStoragehouseDefaultExample.createCriteria();
             // JSON字符串转对象
             JSONObject jsonObject = JSONObject.parseObject(change);
             StorageChangeStoragehouseDefault storageChangeStoragehouseDefault = new StorageChangeStoragehouseDefault();
@@ -99,16 +100,21 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
              storageChangeStoragehouseDefault.setFoodWar(grainKind); //品种
              storageChangeStoragehouseDefault.setDetailWar(grainDetailKind); //明细品种
              storageChangeStoragehouseDefault.setFoodNature(grainAttribute); //粮油性质
-             
-             storageChangeStoragehouseDefaultMapper.insert(storageChangeStoragehouseDefault);
-        	
-            modelMap.put("status", "success");
+			 criteria.andApplyNoEqualTo(jsonObject.getString("applyNo"));
+			 criteria.andOrgIdEqualTo(jsonObject.getInteger("orgId"));
+			 List<StorageChangeStoragehouseDefault> list = storageChangeStoragehouseDefaultMapper.selectByExample(StorageChangeStoragehouseDefaultExample);
+             if(list == null || list.size() ==0 ){
+				 storageChangeStoragehouseDefaultMapper.insert(storageChangeStoragehouseDefault);
+				 modelMap.put("status", "success");
+			 }else{
+				 modelMap.put("status", "数据存在");
+			 }
+
         } catch (Exception e) {
             e.printStackTrace();
             modelMap.put("status", "error");
             modelMap.put("msg", "保存失败！");
         } 
-		
 		return modelMap;
 	}
 }

src/main/java/com/chinaitop/depot/unissoft/model/ResponseEntity.java

@@ -1,98 +0,0 @@
-package com.chinaitop.depot.unissoft.model;
-
-
-
-import java.io.Serializable;
-
-//返回基类
-public class ResponseEntity<T> implements Serializable {
-
-    private static final long serialVersionUID = -2825436079063723409L;
-
-    //成功
-    private static final String OK = "200";
-    //失败
-    private static final String FAILED = "600";
-    private static final String BUSSINESS_FAILED = "550";
-    private static final String UNAUTHENTICATION = "401";
-
-    private String retCode;
-    private String message;
-    private T data;
-
-    public String getRetCode() {
-        return retCode;
-    }
-
-    public void setRetCode(String retCode) {
-        this.retCode = retCode;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    private static <T> ResponseEntity<T> buildResponse(String retCode, String message, T data){
-        ResponseEntity<T> responseEntity = new ResponseEntity<T>();
-        responseEntity.retCode = retCode;
-        responseEntity.message = message;
-        responseEntity.data = data;
-        return responseEntity;
-    }
-
-    public static <T> ResponseEntity<T> ok(){
-        return buildResponse(ResponseEntity.OK,"success",null);
-    }
-    public static <T> ResponseEntity<T> ok(T data){
-        return buildResponse(ResponseEntity.OK,"success",data);
-
-    }
-    public static <T> ResponseEntity<T> ok(String message, T data){
-        return buildResponse(ResponseEntity.OK,message,data);
-    }
-
-
-    public static <T> ResponseEntity<T> failed(String message){
-        return buildResponse(ResponseEntity.FAILED,message,null);
-    }
-
-    public static <T> ResponseEntity<T> businessFailed(String message){
-        return buildResponse(ResponseEntity.BUSSINESS_FAILED,message,null);
-    }
-
-    public static <T> ResponseEntity<T> unauthentication(String message){
-        return buildResponse(ResponseEntity.UNAUTHENTICATION,message,null);
-    }
-
-    private String state;
-    private String msg;
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}
-

src/main/java/com/chinaitop/depot/unissoft/serviceconfig/CxfConfig.java

@@ -1,54 +0,0 @@
-package com.chinaitop.depot.unissoft.serviceconfig;
-
-
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBus;
-import org.apache.cxf.jaxws.EndpointImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.chinaitop.depot.unissoft.webservice.ContractPassService;
-import com.chinaitop.depot.unissoft.webservice.ContractPassServiceImpl;
-import com.chinaitop.depot.unissoft.webservice.NoticePassService;
-import com.chinaitop.depot.unissoft.webservice.NoticePassServiceImpl;
-
-import javax.xml.ws.Endpoint;
-
-
-@Configuration
-public class CxfConfig {
-	/*
-	 * @Bean public ServletRegistrationBean dispatcherServlet() { return new
-	 * ServletRegistrationBean(new CXFServlet(),"/business/*"); }
-	 */
-    @Bean(name = Bus.DEFAULT_BUS_ID)
-    public SpringBus springBus() {
-        return new SpringBus();
-    }
-
-    //倒仓
-    @Bean
-    public ContractPassService contractPassService() {
-        return new ContractPassServiceImpl();
-    }
-    @Bean
-    public Endpoint uploadContractData() {
-        EndpointImpl endpoint = new EndpointImpl(springBus(), contractPassService());
-        endpoint.publish("/selectContractData");
-        return endpoint;
-    }
-
-    //出入库-库级平台
-    @Bean
-    public NoticePassService noticePassService() {
-        return  new NoticePassServiceImpl();
-    }
-    @Bean
-    public Endpoint uploadNoticeData() {
-        EndpointImpl endpoint = new EndpointImpl(springBus(), noticePassService());
-        endpoint.publish("/updateChangeStorageHouse");
-        return endpoint;
-    }
-
-}

src/main/java/com/chinaitop/depot/unissoft/webservice/ContractPassService.java

@@ -1,15 +0,0 @@
-package com.chinaitop.depot.unissoft.webservice;
-
-
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-
-@WebService
-public interface ContractPassService {
-
-    //倒仓通知单接口-(市平台-库级平台-出入库)
-    public String getContractDatas(@WebParam(name = "orgId") String orgId, @WebParam(name = "ids") String ids);
-
-}

src/main/java/com/chinaitop/depot/unissoft/webservice/ContractPassServiceImpl.java

@@ -1,26 +0,0 @@
-package com.chinaitop.depot.unissoft.webservice;
-
-
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-
-import com.chinaitop.depot.pushs.service.PushsService;
-
-@Service
-@SuppressWarnings("all")
-@WebService(serviceName="selectContractData",
-		endpointInterface="com.chinaitop.depot.unissoft.webservice.ContractPassService",
-		targetNamespace = "http://webservice.unissoft.depot.chinaitop.com/")
-public class ContractPassServiceImpl implements ContractPassService {
-
-	@Resource
-	private PushsService PushsService;
-
-
-	@Override
-	public String getContractDatas(String orgId, String ids) {
-		return PushsService.getContractDatas(orgId, ids);
-	}
-}

src/main/java/com/chinaitop/depot/unissoft/webservice/NoticePassService.java

@@ -1,16 +0,0 @@
-package com.chinaitop.depot.unissoft.webservice;
-
-
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-
-@WebService
-public interface NoticePassService {
-
-	//倒仓通知单记录接口-(出入库-库级平台)
-	//changeStorageHouseData  出入库数据以json格式传给库级平台
-    public String updateContractStatus(@WebParam(name = "changeStorageHouseData") String changeStorageHouseData);
-
-}

src/main/java/com/chinaitop/depot/unissoft/webservice/NoticePassServiceImpl.java

@@ -1,26 +0,0 @@
-package com.chinaitop.depot.unissoft.webservice;
-
-
-import com.chinaitop.depot.pushs.service.PushsService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-
-@Service
-@SuppressWarnings("all")
-@WebService(serviceName="updateChangeStorageHouse",
-		endpointInterface="com.chinaitop.depot.unissoft.webservice.NoticePassService",
-		targetNamespace = "http://webservice.unissoft.depot.chinaitop.com/")
-public class NoticePassServiceImpl implements NoticePassService {
-
-	@Resource
-	private PushsService PushsService;
-
-	@Override
-	public String updateContractStatus(String changeStorageHouseData) {
-		// TODO Auto-generated method stub
-		return PushsService.updateChangeStorageHouse(changeStorageHouseData);
-	}
-	
-}