山西

Dockerfile

@@ -0,0 +1,5 @@
+FROM 192.168.123.25:31104/unis/java:8
+
+ADD ./target/depot-qualitycheck.jar /root
+CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-qualitycheck.jar --depot-qualitycheck.server.enable-self-preservation=false"]
+EXPOSE 9010

pom.xml

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.chinaitop</groupId>
+	<artifactId>depot-qualitycheck</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>depot-qualitycheck</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.2.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<!-- 引入spring boot自带的pagehelper插件 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
+		</dependency>
+
+		<!--log4j-->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+		</dependency>
+
+		<!-- 二维码包-->
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+			<version>3.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>javase</artifactId>
+			<version>3.3.1</version>
+		</dependency>
+		<!-- 二维码包end-->
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- 加载mybatis逆向生成工具包 -->
+        <dependency>
+		    <groupId>org.mybatis.generator</groupId>
+		    <artifactId>mybatis-generator-core</artifactId>
+		    <!-- 注意版本.这里我使用的是1.3.2 -->
+		    <version>1.3.2</version>
+		</dependency>
+		<!-- 调用webService的cxf jar包 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-rt-transports-http</artifactId>
+				<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http-jetty</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<!-- JSONObject jar包 -->
+		<dependency>
+		    <groupId>net.sf.json-lib</groupId>    
+		    <artifactId>json-lib</artifactId>    
+		    <version>2.4</version>    
+		    <classifier>jdk15</classifier>    
+		</dependency>
+		<!-- 阿里巴巴json -->
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.4</version>
+		</dependency>
+		<!-- httpclient -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.6</version>
+		</dependency>
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+</project>

src/main/java/com/chinaitop/DatePermissionInterceptor.java

@@ -0,0 +1,165 @@
+package com.chinaitop;
+
+import com.chinaitop.depot.storage.utils.DataPolicyEngine;
+import com.chinaitop.depot.storage.utils.RedisUtil;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.TablesNamesFinder;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.ReflectorFactory;
+import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
+import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Sql执行时间记录拦截器
+ */
+@Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class })})
+@Component
+public class DatePermissionInterceptor implements Interceptor {
+	
+	private static final ObjectFactory DEFAULT_OBJECT_FACTORY = new DefaultObjectFactory();
+    private static final ObjectWrapperFactory DEFAULT_OBJECT_WRAPPER_FACTORY = new DefaultObjectWrapperFactory();
+    private static final ReflectorFactory DEFAULT_REFLECTOR_FACTORY = new DefaultReflectorFactory();
+
+	@Autowired
+	private RedisUtil redisUtil;
+	
+	@Override
+	public Object intercept(Invocation invocation) throws Throwable {
+		
+		StatementHandler statementHandler = (StatementHandler) invocation.getTarget();
+        MetaObject metaStatementHandler = MetaObject.forObject(statementHandler, DEFAULT_OBJECT_FACTORY,
+                DEFAULT_OBJECT_WRAPPER_FACTORY, DEFAULT_REFLECTOR_FACTORY);
+        
+        MappedStatement mappedStatement = (MappedStatement) metaStatementHandler.getValue("delegate.mappedStatement");
+        
+		final BoundSql boundSql = statementHandler.getBoundSql();
+		String bouString = boundSql.getSql();// 获取执行sql 
+		
+		//sql是查询的才进行权限过滤且不过滤t_url_config表的数据
+	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase()) && 
+	    		!bouString.contains("t_url_config")) {
+			//通过本地线程获取库id
+			Object threadLocalObj = DataPolicyEngine.get();
+			String orgId = null;
+			if(threadLocalObj != null) {
+				orgId = ObjectUtils.toString(threadLocalObj);
+			}
+			if(orgId!=null) {
+				//机构单独查询时使用递归查询，可以查询机构下级机构
+				if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
+					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
+							+ " WHERE FIND_IN_SET(org_id,getChildrenOrg("+orgId+"))) org_info ");
+				}else if(!"com.chinaitop.depot.storage.mapper.StorageStorehouseBusinessMapper.saveStorehouseBusinessFromFcbgz".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.getStoreQualityList".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.queryPrimaryKey".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckSonMapper.selectByExample".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.getAllQualityMain".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.getAllQualityInfo".equals(mappedStatement.getId())
+				&& !"com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper.getAllFoodStocks".equals(mappedStatement.getId())){
+					//解析sql中的表名
+					Statement statement = CCJSqlParserUtil.parse(bouString);
+					Select selectStatement = (Select)statement;
+					TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+					List<String> result = tablesNamesFinder.getTableList(selectStatement);
+					
+					Set<String> tableNames = new HashSet<String>();// 定义需要替换的table信息列表
+					//获取业务表信息数据
+					List<String> tableList = (List<String>)redisUtil.lGetAll("tableList").get(0);
+					for(int i=0;i<result.size();i++) {
+						for (int j = 0; j < tableList.size(); j++) {// 处理查看sql中是否有业务表
+							if (result.get(i).equals(ObjectUtils.toString(tableList.get(j)))) {// 是否存在业务表
+								tableNames.add(result.get(i));
+							}
+						}
+					}
+					
+					if (tableNames != null && tableNames.size() > 0) {// sql中存在业务表进行sql拼接数据重新检索
+						if(result.size() >= 2) {//sql中存在2张及以上表
+							for (String table : tableNames) {// 进行业务表的数据权限替换
+								table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+								bouString = bouString.replaceAll(table, "(SELECT * from " + table
+										+ " WHERE org_id = '"+orgId+"') ");
+							}
+						}else {//sql中是单表
+							for (String table : tableNames) {// 进行业务表的数据权限替换
+								if(bouString.contains(table+" ")) {//防止是单表查询，表后面没有空格的时候替换不了
+									table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+								}
+								bouString = bouString.replaceAll(table, "(SELECT * from " + table
+										+ " WHERE org_id = '"+orgId+"') "+table+" ");
+							}
+						}
+
+						/*bouString = bouString.replaceAll(table, "(SELECT b.* from " + table
+						+ " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");*/
+						
+					}
+				}
+				
+				
+				//metaStatementHandler.setValue("delegate.boundSql.sql", bouString);
+
+				Field field = getField(boundSql, "sql");
+				if (field != null) {
+					try {
+						field.setAccessible(true);
+						field.set(boundSql, bouString);
+					} catch (IllegalArgumentException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IllegalAccessException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		
+	    }
+			
+		return invocation.proceed();
+		
+
+	}
+
+	private static Field getField(Object obj, String fieldName) {
+		Field field = null;
+		for (Class<?> clazz = obj.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+			try {
+				field = clazz.getDeclaredField(fieldName);
+				break;
+			} catch (NoSuchFieldException e) {
+				// 这里不用做处理，子类没有该字段可能对应的父类有，都没有就返回null。
+			}
+		}
+		return field;
+	}
+
+	@Override
+	public Object plugin(Object target) {
+		return Plugin.wrap(target, this);
+	}
+
+	@Override
+	public void setProperties(Properties properties) {
+	}
+
+}

src/main/java/com/chinaitop/DepotQualitycheckApplication.java

@@ -0,0 +1,18 @@
+package com.chinaitop;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@EnableEurekaClient
+@EnableDiscoveryClient
+@SpringBootApplication
+@MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
+public class DepotQualitycheckApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DepotQualitycheckApplication.class, args);
+	}
+}

src/main/java/com/chinaitop/HelloWebXml.java

@@ -0,0 +1,12 @@
+package com.chinaitop;
+ 
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class HelloWebXml extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(DepotQualitycheckApplication.class);
+    }
+ 
+}

src/main/java/com/chinaitop/SwaggerConfig.java

@@ -0,0 +1,34 @@
+package com.chinaitop;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.chinaitop.depot.storage.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("智能粮库管理平台api文档")
+                .description("质量管理")
+                .termsOfServiceUrl("http://10.10.1.25:9001")
+                .version("1.0")
+                .build();
+    }
+}

src/main/java/com/chinaitop/depot/storage/controller/JkqCrkController.java

@@ -0,0 +1,523 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample;
+import com.chinaitop.depot.storage.service.StorageKcglJkqyqApplyDefaultService;
+import com.chinaitop.depot.storage.utils.DateJsonValueProcessor;
+import com.chinaitop.depot.storage.utils.HTTPUtils;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.sf.json.JsonConfig;
+
+@RestController
+@RequestMapping(value="/JkqCrkController")
+@Api(value= "JkqCrkController", description = "架空期查询类")
+public class JkqCrkController {
+
+	
+	@Resource
+	private StorageKcglJkqyqApplyDefaultService storageKcglJkqyqApplyDefaultService;
+
+	// 获取出入库ip地址
+	@Value("${report-Url}")
+	private String changeUrl;
+	
+	@RequestMapping(value="/getApplyList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="架空期申请查询", notes = "支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name="pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name="isUpload", value = "状态", paramType = "query"),
+		@ApiImplicitParam(name="sqrqA", value = "申请日期始", paramType = "query"),
+		@ApiImplicitParam(name="sqrqB", value = "申请日期末", paramType = "query")
+	})
+	public PageInfo<StorageKcglJkqyqDefault> getApplyList(Integer pageNum, Integer pageSize,HttpServletRequest request,
+			String sqrqA, String sqrqB, Integer isUpload) {
+
+		StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		//单位ID
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		//申请日期
+		if(sqrqA != null && !"".equals(sqrqA)) {
+			Date starDate = ParameterUtil.string2datetime(sqrqA + " 00:00:00");
+			criteria.andSqrqGreaterThanOrEqualTo(starDate);
+		}
+		if(sqrqB != null && !"".equals(sqrqB)) {
+			Date starDate = ParameterUtil.string2datetime(sqrqB + " 23:59:59");
+			criteria.andSqrqLessThanOrEqualTo(starDate);
+		}
+		//状态
+		if(isUpload != null && !"".equals(isUpload)) {
+			criteria.andIsUploadEqualTo(isUpload);
+		}
+		example.setOrderByClause("create_date desc");
+		List<StorageKcglJkqyqDefault> list = null;
+		try {
+			list = storageKcglJkqyqApplyDefaultService.findByList(example);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		PageInfo<StorageKcglJkqyqDefault> pageInfo = new PageInfo<StorageKcglJkqyqDefault>(list);
+		return pageInfo;
+	}
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/add", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="新增架空期延期申请", notes = "新增架空期延期申请")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "overFlag", value = "标志位(根据标志位区分新增与修改)", paramType = "form"),
+			@ApiImplicitParam(name = "overheadApplyJson", value = "JSON数据对象", paramType = "form"),
+			@ApiImplicitParam(name = "overheadAddDcslson", value = "JSON数据对象", paramType = "form")
+	})
+	public Map<String, Object> add(HttpServletRequest request,Integer overFlag, String overheadApplyJson, String overheadAddDcslson, String fileIds) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Date date = new Date();
+		String yqsqNo = null;
+		String isUpload = null;
+		JSONObject overhear = null;
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		if (null != overheadApplyJson && !"".equals(overheadApplyJson)) {
+			overhear = JSONObject.parseObject(overheadApplyJson);
+			yqsqNo = (overhear.get("yqsqNo") == null?"":overhear.get("yqsqNo").toString());
+			isUpload = (overhear.get("isUpload") == null?"0":overhear.get("isUpload").toString());
+		}
+		try {
+			// JSON字符串转对象
+			if(overFlag == 0) {
+			ObjectMapper mapper = new ObjectMapper();
+			StorageKcglJkqyqDefault storageKcglJkqyqDefault = (StorageKcglJkqyqDefault) mapper.readValue(overheadApplyJson, StorageKcglJkqyqDefault.class);
+			storageKcglJkqyqDefault.setCreateDate(date);
+			storageKcglJkqyqDefault.setOrgId(orgId);
+			storageKcglJkqyqDefault.setIsUpload(0);
+			storageKcglJkqyqApplyDefaultService.addDataKcglJkqyqDefault(storageKcglJkqyqDefault);
+			StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+			com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+			if (orgId != null && !"".equals(orgId)) {
+				criteria.andOrgIdEqualTo(orgId);
+			}
+			if(yqsqNo !=null && !"".equals(yqsqNo)) {
+				criteria.andYqsqNoEqualTo(yqsqNo);
+			}
+			List<StorageKcglJkqyqDefault> list = storageKcglJkqyqApplyDefaultService.selectByExample(example);
+			Integer yqsqId = list.get(0).getId();
+			storageKcglJkqyqApplyDefaultService.updateFileByFileIdsAndBid(fileIds, yqsqId, "jkq");
+			//添加子表字段
+			List<StorageKcglJkqyqApplyDefault> StorageKcglJkqyqApplyDefaultList = null;
+			 if (overheadAddDcslson != null) {
+				 StorageKcglJkqyqApplyDefaultList = (List<StorageKcglJkqyqApplyDefault>)mapper.readValue(overheadAddDcslson, new TypeReference<List<StorageKcglJkqyqApplyDefault>>(){});
+	            }
+			// 新增子表.
+		        if (StorageKcglJkqyqApplyDefaultList != null && StorageKcglJkqyqApplyDefaultList.size() > 0) {
+		            for (StorageKcglJkqyqApplyDefault StorageKcglJkqyqApplyDefault : StorageKcglJkqyqApplyDefaultList) {
+		            	StorageKcglJkqyqApplyDefault.setOrgId(orgId);
+		            	StorageKcglJkqyqApplyDefault.setUpdatetime(date);
+		            	StorageKcglJkqyqApplyDefault.setYqsqNo(yqsqNo);
+		            	StorageKcglJkqyqApplyDefault.setIsUpload(Integer.parseInt(isUpload));
+		            	storageKcglJkqyqApplyDefaultService.addDataKcglJkqyqDefault1(StorageKcglJkqyqApplyDefault);
+		            }
+		        }
+			}else if(overFlag == 1){
+				ObjectMapper mapper = new ObjectMapper();
+				StorageKcglJkqyqDefault storageKcglJkqyqDefault = (StorageKcglJkqyqDefault) mapper.readValue(overheadApplyJson, StorageKcglJkqyqDefault.class);
+				storageKcglJkqyqDefault.setCreateDate(date);
+				storageKcglJkqyqDefault.setOrgId(orgId);
+				storageKcglJkqyqApplyDefaultService.updateDataKcglJkqyqDefault(storageKcglJkqyqDefault);
+				StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+				com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+				if (orgId != null && !"".equals(orgId)) {
+					criteria.andOrgIdEqualTo(orgId);
+				}
+				if(yqsqNo !=null && !"".equals(yqsqNo)) {
+					criteria.andYqsqNoEqualTo(yqsqNo);
+				}
+				List<StorageKcglJkqyqDefault> list = storageKcglJkqyqApplyDefaultService.selectByExample(example);
+				Integer yqsqId = list.get(0).getId();
+				storageKcglJkqyqApplyDefaultService.updateFileByFileIdsAndBid(fileIds, yqsqId, "jkq");
+				//添加子表字段
+				//添加子表字段
+				List<StorageKcglJkqyqApplyDefault> StorageKcglJkqyqApplyDefaultList = null;
+				 if (overheadAddDcslson != null) {
+					 StorageKcglJkqyqApplyDefaultList = (List<StorageKcglJkqyqApplyDefault>)mapper.readValue(overheadAddDcslson, new TypeReference<List<StorageKcglJkqyqApplyDefault>>(){});
+		            }
+				// 新增子表.
+			        if (StorageKcglJkqyqApplyDefaultList != null && StorageKcglJkqyqApplyDefaultList.size() > 0) {
+			            for (StorageKcglJkqyqApplyDefault StorageKcglJkqyqApplyDefaul : StorageKcglJkqyqApplyDefaultList) {
+			            	StorageKcglJkqyqApplyDefaul.setOrgId(orgId);
+			            	StorageKcglJkqyqApplyDefaul.setUpdatetime(date);
+			            	StorageKcglJkqyqApplyDefaul.setYqsqNo(yqsqNo);
+			            	storageKcglJkqyqApplyDefaultService.updateDataKcglJkqyqDefault1(StorageKcglJkqyqApplyDefaul);
+			            }
+			        }
+			}
+			modelMap.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "保存失败！");
+		}
+		return modelMap;
+	}
+	@RequestMapping(value = "/findOverheadData",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期数据列表", notes = "查询架空期信息列表")
+	@ApiImplicitParams({
+	@ApiImplicitParam(name = "applyNo", value = "架空期延期申请单号", paramType = "query"),
+	@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+	})
+	public Map<String, Object> findOverheadData(String applyNo,Integer orgId){
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+		if(applyNo != null && !"".equals(applyNo)) {
+			criteria.andYqsqNoEqualTo(applyNo);
+		}
+		if(orgId != null && !"".equals(orgId)) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		List<StorageKcglJkqyqDefault> list = storageKcglJkqyqApplyDefaultService.selectByExample(example);
+		modelMap.put("DataKcglJkqyqDefaultList", list);
+		StorageKcglJkqyqApplyDefaultExample detailExamle = new StorageKcglJkqyqApplyDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample.Criteria detailCriteria = detailExamle.createCriteria();
+		if(applyNo != null && !"".equals(applyNo)) {
+			detailCriteria.andYqsqNoEqualTo(applyNo);
+		}
+		if(orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrgIdEqualTo(orgId);
+		}
+		List<StorageKcglJkqyqApplyDefault> detailList = storageKcglJkqyqApplyDefaultService.selectBy1Example(detailExamle);
+		modelMap.put("DataKcglJkqyqDefault1List", detailList);
+		List<BusinessFile> fileList= storageKcglJkqyqApplyDefaultService.getByBid(list.get(0).getId(), "jkq", null, null);
+		modelMap.put("fileList", fileList);
+		return modelMap;
+	}
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/removeOverApplyData",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="删除一条延期申请数据", notes = "删除一条延期申请数据")
+	@ApiImplicitParams({
+	@ApiImplicitParam(name = "yqsqNo", value = "倒仓申请单号", paramType = "query"),
+	})
+	public Map<String, Object> removeOverApplyData(HttpServletRequest request, String yqsqNo){
+		Map<String, Object> map = new HashMap<String, Object>();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		try {
+			StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+		if(yqsqNo != null && !"".equals(yqsqNo)) {
+			criteria.andYqsqNoEqualTo(yqsqNo);
+		}
+		if(orgId != null && !"".equals(orgId)) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		storageKcglJkqyqApplyDefaultService.removeOverData(example);
+		StorageKcglJkqyqApplyDefaultExample detailExamle = new StorageKcglJkqyqApplyDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample.Criteria detailCriteria = detailExamle.createCriteria();
+		if(yqsqNo != null && !"".equals(yqsqNo)) {
+			detailCriteria.andYqsqNoEqualTo(yqsqNo);
+		}
+		if(orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrgIdEqualTo(orgId);
+		}
+		storageKcglJkqyqApplyDefaultService.removeOver1Data(detailExamle);
+		map.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			map.put("status", "error");
+			map.put("msg", "保存失败！");
+		}
+		return map;
+	}
+	@SuppressWarnings({ "null" })
+	@RequestMapping(value = "/getJkqOveHeadList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期延期日期", notes = "查询架空期延期日期")
+	public PageInfo<Map<String, Object>> getJkqOveHeadList(HttpServletRequest request, Integer pageNum, Integer pageSize){
+		Date date = null;
+		Date yqDate = null;
+		long time1 = 0;
+        long time2 = 0;
+		Date nowDate = new Date();//获取当前时间
+		Calendar cal = Calendar.getInstance();
+		Calendar cal1 = Calendar.getInstance();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+    	Map<String, Object> map = new HashMap<String, Object>();
+    	List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
+    	List<Map<String, Object>> lastList = new ArrayList<Map<String, Object>>();
+    	map.put("orgId", orgId);
+    	map.put("executeType", 3156);
+        List<Map<String, Object>> list = storageKcglJkqyqApplyDefaultService.getjkqPlanList(map);
+        for (Map<String, Object> countMap : list) {
+        	countMap.put("orgId", orgId);
+        	countList = storageKcglJkqyqApplyDefaultService.getjkqDataDayList(countMap);
+        	for (Map<String, Object> lastMap : countList) {
+        		Double zcsl = 0.0;
+        		Double srsl = 0.0;
+        		Integer warningDay = 0;
+        		Integer isUpload = 0;
+        		long  yqsqTime = 0;
+        		if(lastMap != null && !lastMap.isEmpty()){
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("jkqEnd")) {
+						String yqtime = (String) lastEntry.getValue();
+						try {
+							date = format1.parse(yqtime);
+							cal.setTime(date);
+							if(yqtime.length() != 0) {
+								break;
+							}
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("overhead_period")) {
+						Integer overheadPeriod =(Integer) lastEntry.getValue();
+						cal.add(Calendar.MONTH, overheadPeriod);
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("zcsl")) {
+						zcsl =(Double) lastEntry.getValue();
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("srsl")) {
+						srsl =(Double) lastEntry.getValue();
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("warning_day")) {
+						warningDay =(Integer) lastEntry.getValue();
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+        			if(lastEntry.getKey().equals("is_Upload")) {
+        				isUpload =(Integer) lastEntry.getValue();
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("sqyq_time")) {
+						String yqwTime =sdf.format(lastEntry.getValue());
+						try {
+							yqDate = format1.parse(yqwTime);
+							cal1.setTime(yqDate);
+							yqsqTime = cal1.getTimeInMillis();
+							if(yqwTime.length() != 0) {
+								break;
+							}
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+						break;
+					}
+				}
+        		try { 
+            		String dateString = format.format(nowDate);
+                	String timea= format.format(cal.getTime());
+    				cal.setTime(sdf.parse(dateString));
+    				time1 = cal.getTimeInMillis();
+    		        cal.setTime(sdf.parse(timea));
+    		        time2 = cal.getTimeInMillis();
+    		        long between_days=(time2-time1)/(1000*3600*24);
+    		        Integer rengTime = Integer.parseInt(String.valueOf(between_days));
+    		        if(isUpload == 2) {
+    		        	//isUpload为2表示延期申请上传
+    		        	long betdays=(yqsqTime-time1)/(1000*3600*24);
+        		        Integer rTime = Integer.parseInt(String.valueOf(betdays));
+    		        	if(rTime < warningDay ) {
+    		        		if(zcsl > srsl) {
+        		        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+        		        					if (lastEntry.getKey().equals("jkqEnd")) {
+        	    								lastEntry.setValue(timea);
+        	    								lastList.add(lastMap);
+        	    								break;
+        		        			}
+        						}
+        		        	}
+    		        	}else {
+    		        		break;
+    		        	}
+    		        }else {
+    		        	  if(rengTime < warningDay) {
+    	    		        	if(zcsl > srsl) {
+    	    		        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+    	    		        					if (lastEntry.getKey().equals("jkqEnd")) {
+    	    	    								lastEntry.setValue(timea);
+    	    	    								lastList.add(lastMap);
+    	    	    								break;
+    	    		        			}
+    	    						}
+    	    		        	}
+    	    		        }
+    		        }
+    			} catch (ParseException e) {
+    				// TODO Auto-generated catch block
+    				e.printStackTrace();
+    				}
+				}
+        	}
+		}
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(lastList);
+        return pageInfo;
+	}
+	@RequestMapping(value = "/findSqyqTime",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期延期日期", notes = "查询架空期延期日期")
+	@ApiImplicitParams({
+	@ApiImplicitParam(name = "modifydate", value = "架空期轮出日期", paramType = "query"),
+	@ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
+	@ApiImplicitParam(name = "hwh", value = "货位ID", paramType = "query")
+	})
+	public PageInfo<StorageKcglJkqyqApplyDefault> findSqyqTime(HttpServletRequest request, Integer ch, Integer hwh){
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		StorageKcglJkqyqApplyDefaultExample detailExamle = new StorageKcglJkqyqApplyDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample.Criteria detailCriteria = detailExamle.createCriteria();
+		if(ch != null && !"".equals(ch)) {
+			detailCriteria.andChEqualTo(ch);
+		}
+		if(hwh != null && !"".equals(hwh)) {
+			detailCriteria.andHwhEqualTo(hwh);
+		}
+		if(orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrgIdEqualTo(orgId);
+		}
+		detailExamle.setOrderByClause(" updatetime DESC");
+		List<StorageKcglJkqyqApplyDefault> detailList = storageKcglJkqyqApplyDefaultService.selectBy1Example(detailExamle);
+		PageInfo<StorageKcglJkqyqApplyDefault> pageInfo = new PageInfo<StorageKcglJkqyqApplyDefault>(detailList);
+		return pageInfo;
+	}
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/present", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "架空期延期申请提交数据到省平台审批", notes = "架空期延期申请提交数据到省平台审批")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "yqsqNo", value = "延期申请单号", paramType = "query") })
+	public Map<String, Object> present(HttpServletRequest request, String yqsqNo, Integer isUpload) {
+		String str = "";
+		String jso = "";
+		String strs = "";
+		JsonConfig config = new JsonConfig(); 
+		StorageKcglJkqyqDefault dataKcglJkq = new StorageKcglJkqyqDefault();
+		StorageKcglJkqyqApplyDefault dataKcglJkq1 = new StorageKcglJkqyqApplyDefault();
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		//主表
+		StorageKcglJkqyqDefaultExample example = new StorageKcglJkqyqDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample.Criteria criteria = example.createCriteria();
+		//子表
+		StorageKcglJkqyqApplyDefaultExample detailExamle = new StorageKcglJkqyqApplyDefaultExample();
+		com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample.Criteria detailCriteria = detailExamle.createCriteria();
+		if (yqsqNo != null && !"".equals(yqsqNo)) {
+			criteria.andYqsqNoEqualTo(yqsqNo);
+			detailCriteria.andYqsqNoEqualTo(yqsqNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			criteria.andOrgIdEqualTo(orgId);
+			detailCriteria.andOrgIdEqualTo(orgId);
+		}
+		//获取主表数据
+		jso = "{\"DataKcglJkqyqDefault\":[";
+		List<StorageKcglJkqyqDefault> list = storageKcglJkqyqApplyDefaultService.selectByExample(example);
+		for (StorageKcglJkqyqDefault storageKcglJkqyqDefault : list) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageKcglJkqyqDefault,config);//将java对象转换为json对象
+			strs = strs + json.toString();
+		}
+		jso = jso + strs + "],";
+		//获取子表数据
+		List<StorageKcglJkqyqApplyDefault> detailList = storageKcglJkqyqApplyDefaultService.selectBy1Example(detailExamle);
+		jso = jso+"\"DataKcglJkqyqDefault1\":[";
+		for (StorageKcglJkqyqApplyDefault storageKcglJkqyqApplyDefault : detailList) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageKcglJkqyqApplyDefault,config);//将java对象转换为json对象
+			str = str + json.toString() + ",";
+		}
+		if(str!=null && str.length()>0) {
+			str = str.substring(0, str.length()-1);
+		}
+		jso = jso + str + "]}";
+		try {
+		String url = changeUrl+"/business-management/changeStoragehous/saveJcq";
+        String count= HTTPUtils.doPost(url,jso);
+        if(count.contains("Success") || count.contains("200")){
+        	if(isUpload == 0) {
+        		dataKcglJkq.setIsUpload(1);
+        		dataKcglJkq.setYqsqNo(yqsqNo);
+        		storageKcglJkqyqApplyDefaultService.updateJkqStatus(dataKcglJkq);
+        		dataKcglJkq1.setIsUpload(1);
+        		dataKcglJkq1.setYqsqNo(yqsqNo);
+        		storageKcglJkqyqApplyDefaultService.updateJkq1Status(dataKcglJkq1);
+        	}
+            modelMap.put("status", "success");
+            modelMap.put("msg", "成功！");
+        }
+	 } catch (Exception e){
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+		return modelMap;
+	}
+	
+	@PostMapping(value = "/UpdateJkqStatus")
+	@ApiOperation(value = "架空期延期申请省平台审批后修改数据", notes = "架空期延期申请省平台审批后修改数据")
+	public String UpdateJkqStatus(String jkqData) {
+		String retS = "Success";
+		StorageKcglJkqyqApplyDefault detail1 = new StorageKcglJkqyqApplyDefault();
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			StorageKcglJkqyqDefault storageKcglJkqyqDefault = (StorageKcglJkqyqDefault) mapper.readValue(jkqData, StorageKcglJkqyqDefault.class);
+			//修改主表状态
+			storageKcglJkqyqApplyDefaultService.updateJkqIsUpload(storageKcglJkqyqDefault);
+			detail1.setIsUpload(storageKcglJkqyqDefault.getIsUpload());
+			detail1.setYqsqNo(storageKcglJkqyqDefault.getYqsqNo());
+			//通过yqsqNo修改子表状态
+			storageKcglJkqyqApplyDefaultService.updateJkq1Status(detail1);
+		} catch (IOException e) {
+			return retS = "error";
+		}
+		return retS;
+	}
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseTaskController.java

@@ -0,0 +1,645 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample.Criteria;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseTaskDetailService;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseTaskService;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseWorkTaskService;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
+import com.chinaitop.depot.storage.utils.DateJsonValueProcessor;
+import com.chinaitop.depot.storage.utils.HTTPUtils;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.chinaitop.depot.storage.utils.createKC;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.sf.json.JsonConfig;
+
+/**
+ * @author liangs
+ * @Date 2019/06/14
+ */
+@RestController
+@RequestMapping(value = "/StorageChangeStoragehouseTaskController")
+@Api(value = "StorageChangeStoragehouseTaskController", description = "倒仓作业类")
+public class StorageChangeStoragehouseTaskController {
+
+	@Resource
+	private StorageChangeStoragehouseTaskService storageChangeStoragehouseTaskService;
+
+	@Resource
+	private StorageChangeStoragehouseTaskDetailService storageChangeStoragehouseTaskDetailService;
+
+	@Resource
+	private StorageFoodbasicInfoService foodbasicInfoService;
+
+	@Resource
+	private StorageChangeStoragehouseWorkTaskService storageChangeStoragehouseWorkTaskService;
+
+	// 获取出入库ip地址
+	@Value("${crk-webservice}")
+	private String url;
+	
+	// 获取出入库ip地址
+	@Value("${report-Url}")
+	private String changeUrl;
+	
+	
+	@RequestMapping(value = "/getList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询倒仓申请列表", notes = "查询倒仓申请信息列表，支持分页")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "businessNo", value = "倒仓业务单号", paramType = "query"),
+			@ApiImplicitParam(name = "applyTimeA", value = "申请日期A", paramType = "query"),
+			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
+	public PageInfo<StorageChangeStoragehouseTask> getList(Integer pageNum, Integer pageSize, String businessNo,
+			String applyTimeA, String applyTimeB, Integer orgId) {
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		if (pageNum != null && pageSize != null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		// 拼接查询条件
+		if (businessNo != null && !"".equals(businessNo)) {
+			Criteria.andBusinessNoLike("%" + businessNo + "%");
+		}
+		
+		if (applyTimeA != null && !"".equals(applyTimeA)) {
+			Date starDate = ParameterUtil.string2datetime(applyTimeA + " 00:00:00");
+			Criteria.andApplyTimeGreaterThanOrEqualTo(starDate);
+		}
+		if (applyTimeB != null && !"".equals(applyTimeB)) {
+			Date starDate = ParameterUtil.string2datetime(applyTimeB + " 23:59:59");
+			Criteria.andApplyTimeLessThanOrEqualTo(starDate);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		example.setOrderByClause("apply_time asc");
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		PageInfo<StorageChangeStoragehouseTask> pageInfo = new PageInfo<StorageChangeStoragehouseTask>(list);
+		return pageInfo;
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value = "新增倒仓信息", notes = "新增倒仓信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "storeChangeStoragehouseJson", value = "JSON数据对象", paramType = "form"),
+			@ApiImplicitParam(name = "change", value = "标志位判断新增修改", paramType = "query"),
+			@ApiImplicitParam(name = "crk_ip", value = "出入库ip地址", paramType = "query"),
+			@ApiImplicitParam(name = "storeChangeStorageaddDcsl", value = "JSON数据对象", paramType = "query"), 
+			@ApiImplicitParam(name = "fileIds", value = "文件", paramType = "query") })
+	public Map<String, Object> edit(HttpServletRequest request, Integer change, String crk_ip, String storeChangeStoragehouseJson,
+			String storeChangeStorageaddDcsl, String fileIds) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Date date = new Date();
+		JSONObject changeStorage = null;
+		String businessNo = null;
+		String crk_adr = "";
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		if (null != storeChangeStoragehouseJson && !"".equals(storeChangeStoragehouseJson)) {
+			changeStorage = JSONObject.parseObject(storeChangeStoragehouseJson);
+			businessNo = (changeStorage.get("businessNo") == null ? "" : changeStorage.get("businessNo").toString());
+		}
+		try {
+			// JSON字符串转对象
+			ObjectMapper mapper = new ObjectMapper();
+			/*
+			 * mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+			 */
+			// 添加主表字段
+			if (change == 0) {
+				StorageChangeStoragehouseTask storageChangeStoragehouseTask = (StorageChangeStoragehouseTask) mapper
+						.readValue(storeChangeStoragehouseJson, StorageChangeStoragehouseTask.class);
+				storageChangeStoragehouseTask.setCreateDate(date);
+				storageChangeStoragehouseTask.setOrgId(orgId);
+				storageChangeStoragehouseTask.setIsUpload(0);
+				storageChangeStoragehouseTaskService.addStorageChangeStoragehouseTask(storageChangeStoragehouseTask);
+				StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+				Criteria Criteria = example.createCriteria();
+				if (orgId != null && !"".equals(orgId)) {
+					Criteria.andOrgIdEqualTo(orgId);
+				}
+				if(businessNo != null && !"".equals(businessNo)) {
+					Criteria.andBusinessNoEqualTo(businessNo);
+				}
+				List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+				Integer storageId = list.get(0).getId();
+				storageChangeStoragehouseTaskService.updateFileByFileIdsAndBid(fileIds, storageId, "change");
+				// 添加子表字段
+				List<StorageChangeStoragehouseTaskDetail> storageChangeStoragehouseTaskDetailList = null;
+				if (storeChangeStorageaddDcsl != null) {
+					storageChangeStoragehouseTaskDetailList = (List<StorageChangeStoragehouseTaskDetail>) mapper
+							.readValue(storeChangeStorageaddDcsl,new TypeReference<List<StorageChangeStoragehouseTaskDetail>>() {
+					});
+				}
+				// 新增仓房货位数量质量标准子表.
+				if (storageChangeStoragehouseTaskDetailList != null
+						&& storageChangeStoragehouseTaskDetailList.size() > 0) {
+					for (StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail : storageChangeStoragehouseTaskDetailList) {
+						storageChangeStoragehouseTaskDetail.setOrg_id(orgId);
+						storageChangeStoragehouseTaskDetail.setUpdateTime(date);
+						storageChangeStoragehouseTaskDetail.setBusinessNo(businessNo);
+//						Object[] parameters = new Object[10];
+//						parameters[0] = storageChangeStoragehouseTaskDetail.getOrg_id() + "";
+//						parameters[1] = storageChangeStoragehouseTaskDetail.getLspz() + "";
+//						// parameters[2] = null; 明细品种
+//						parameters[3] = storageChangeStoragehouseTaskDetail.getStorehouseId() + "";
+//						parameters[4] = storageChangeStoragehouseTaskDetail.getWarehouseId() + "";
+//						parameters[5] = storageChangeStoragehouseTaskDetail.getHouseId() + "";
+//						parameters[6] = storageChangeStoragehouseTaskDetail.getWareId() + "";
+//						// parameters[7] = null; 粮食性质
+//						parameters[8] = storageChangeStoragehouseTaskDetail.getPourInNum() + "";
+//						parameters[9] = 1 + ""; // 1:新增；2：修改；3：删除
+//						crk_adr = url;
+//						String str = createKC.createKC("ChangeWarehouse", crk_adr, parameters);
+//						if ("true".equals(str)) {
+//							modelMap.put("status", "success");
+//						} else {
+//							modelMap.put("status", "error");
+//							modelMap.put("msg", "保存失败，倒仓数据同步异常，请联系管理员！");
+//						}
+						storageChangeStoragehouseTaskDetailService.addStorageChangeStoragehouseTaskDetail(storageChangeStoragehouseTaskDetail);
+					}
+				}
+			} else if (change == 1) {
+				StorageChangeStoragehouseTask storageChangeStoragehouseTask = (StorageChangeStoragehouseTask) mapper
+						.readValue(storeChangeStoragehouseJson, StorageChangeStoragehouseTask.class);
+				storageChangeStoragehouseTask.setCreateDate(date);
+				storageChangeStoragehouseTask.setOrgId(orgId);
+				storageChangeStoragehouseTaskService.updateStorageChangeStoragehouseTask(storageChangeStoragehouseTask);
+				StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+				Criteria Criteria = example.createCriteria();
+				if (orgId != null && !"".equals(orgId)) {
+					Criteria.andOrgIdEqualTo(orgId);
+				}
+				if(businessNo != null && !"".equals(businessNo)) {
+					Criteria.andBusinessNoEqualTo(businessNo);
+				}
+				List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+				Integer storageId = list.get(0).getId();
+				storageChangeStoragehouseTaskService.updateFileByFileIdsAndBid(fileIds, storageId, "change");
+				// 添加子表字段
+				List<StorageChangeStoragehouseTaskDetail> storageChangeStoragehouseTaskDetailList = null;
+				if (storeChangeStorageaddDcsl != null) {
+					storageChangeStoragehouseTaskDetailList = (List<StorageChangeStoragehouseTaskDetail>) mapper
+							.readValue(storeChangeStorageaddDcsl,
+									new TypeReference<List<StorageChangeStoragehouseTaskDetail>>() {
+									});
+				}
+				// 新增仓房货位数量质量标准子表.
+				if (storageChangeStoragehouseTaskDetailList != null
+						&& storageChangeStoragehouseTaskDetailList.size() > 0) {
+					for (StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail : storageChangeStoragehouseTaskDetailList) {
+						storageChangeStoragehouseTaskDetail.setOrg_id(orgId);
+						storageChangeStoragehouseTaskDetail.setUpdateTime(date);
+						storageChangeStoragehouseTaskDetail.setBusinessNo(businessNo);
+						storageChangeStoragehouseTaskDetailService.updateStorageChangeStoragehouseTaskDetail(storageChangeStoragehouseTaskDetail);
+						if(storageChangeStoragehouseTaskDetail.getId() == null) {
+							storageChangeStoragehouseTaskDetailService.addStorageChangeStoragehouseTaskDetail(storageChangeStoragehouseTaskDetail);
+						}
+					}
+				}
+			}
+			modelMap.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "保存失败！");
+		}
+		return modelMap;
+	}
+
+	@RequestMapping(value = "/findChangeData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询倒仓数据列表", notes = "查询倒仓申请信息列表")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "businessNo", value = "倒仓申请单号", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
+	public Map<String, Object> findChangeData(String businessNo, Integer orgId) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		if (businessNo != null && !"".equals(businessNo)) {
+			Criteria.andBusinessNoEqualTo(businessNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		modelMap.put("ChangeStoragehouseTask", list);
+		StorageChangeStoragehouseTaskDetailExample detailExamle = new StorageChangeStoragehouseTaskDetailExample();
+		com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample.Criteria detailCriteria = detailExamle
+				.createCriteria();
+		if (businessNo != null && !"".equals(businessNo)) {
+			detailCriteria.andBusinessNoEqualTo(businessNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrg_idEqualTo(orgId);
+		}
+		List<StorageChangeStoragehouseTaskDetail> detailList = storageChangeStoragehouseTaskDetailService
+				.selectByExample(detailExamle);
+		modelMap.put("StorageChangeStoragehouseTaskDetail", detailList);
+		List<BusinessFile> fileList= storageChangeStoragehouseTaskService.getByBid(list.get(0).getId(), "change", null, null);
+		modelMap.put("fileList", fileList);
+		return modelMap;
+	}
+
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/removeChangeData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value = "删除一条倒仓数据", notes = "删除一条倒仓数据")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "businessNo", value = "倒仓申请单号", paramType = "query"), })
+	public Map<String, Object> removeChangeData(HttpServletRequest request, String businessNo) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		try {
+			StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+			Criteria Criteria = example.createCriteria();
+			if (businessNo != null && !"".equals(businessNo)) {
+				Criteria.andBusinessNoEqualTo(businessNo);
+			}
+			if (orgId != null && !"".equals(orgId)) {
+				Criteria.andOrgIdEqualTo(orgId);
+			}
+			storageChangeStoragehouseTaskService.removeChangeData(example);
+			StorageChangeStoragehouseTaskDetailExample detailExamle = new StorageChangeStoragehouseTaskDetailExample();
+			com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample.Criteria detailCriteria = detailExamle
+					.createCriteria();
+			if (businessNo != null && !"".equals(businessNo)) {
+				detailCriteria.andBusinessNoEqualTo(businessNo);
+			}
+			if (orgId != null && !"".equals(orgId)) {
+				detailCriteria.andOrg_idEqualTo(orgId);
+			}
+			storageChangeStoragehouseTaskDetailService.removeChangeData(detailExamle);
+			map.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			map.put("status", "error");
+			map.put("msg", "保存失败！");
+		}
+		return map;
+	}
+
+	@RequestMapping(value = "/getWorkPageInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询倒仓申请列表", notes = "查询倒仓申请信息列表，支持分页")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "planStartDateA", value = "计划开始日期A", paramType = "query"),
+			@ApiImplicitParam(name = "planStartDateB", value = "计划开始日期B", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
+	public PageInfo<StorageChangeStoragehouseTask> getWorkPageInfo(Integer pageNum, Integer pageSize, Integer orgId,
+			String planStartDateA, String planStartDateB) {
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		String planType = "ChangeWork";
+		if (pageNum != null && pageSize != null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		if (planStartDateA != null && !"".equals(planStartDateA)) {
+			Date starDate = ParameterUtil.string2datetime(planStartDateA + " 00:00:00");
+			Criteria.andPlanStartDateGreaterThanOrEqualTo(starDate);
+		}
+		if (planStartDateB != null && !"".equals(planStartDateB)) {
+			Date starDate = ParameterUtil.string2datetime(planStartDateB + " 23:59:59");
+			Criteria.andPlanStartDateLessThanOrEqualTo(starDate);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		if (planType != null && !"".equals(planType)) {
+			Criteria.andPlanTypeLessThanOrEqualTo(planType);
+		}
+		example.setOrderByClause("apply_time asc");
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		PageInfo<StorageChangeStoragehouseTask> pageInfo = new PageInfo<StorageChangeStoragehouseTask>(list);
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/getChangeDataPageInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询倒仓申请审批通过数据", notes = "查询倒仓申请审批通过数据，支持分页")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "applyStatus", value = "审核状态", paramType = "query"), })
+	public PageInfo<StorageChangeStoragehouseTaskDetail> getChangeDataPageInfo(HttpServletRequest request,
+			Integer pageNum, Integer pageSize, Integer applyStatus) {
+		StorageChangeStoragehouseTaskDetailExample detailExamle = new StorageChangeStoragehouseTaskDetailExample();
+		com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample.Criteria Criteria = detailExamle
+				.createCriteria();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		if (pageNum != null && pageSize != null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrg_idEqualTo(orgId);
+		}
+		if (applyStatus != null && !"".equals(applyStatus)) {
+			Criteria.andApplyStatusEqualTo(applyStatus);
+		}
+		List<StorageChangeStoragehouseTaskDetail> list = storageChangeStoragehouseTaskDetailService
+				.selectByExample(detailExamle);
+		PageInfo<StorageChangeStoragehouseTaskDetail> pageInfo = new PageInfo<StorageChangeStoragehouseTaskDetail>(
+				list);
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/fandChangeWorkData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询主表数据列表", notes = "查询倒仓工作列表")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "businessNo", value = "倒仓申请单号", paramType = "query"), })
+	public Map<String, Object> fandChangeWorkData(HttpServletRequest request, String businessNo) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		Criteria Criteria = example.createCriteria();
+		if (businessNo != null && !"".equals(businessNo)) {
+			Criteria.andBusinessNoEqualTo(businessNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		modelMap.put("ChangeStoragehouseTask", list);
+		return modelMap;
+	}
+
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/updataChangeWork", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value = "新增倒仓作业数据并更新倒仓申请主表", notes = "新增倒仓作业数据并更新倒仓申请主表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "storeChangeStoragehouseJson", value = "JSON数据对象", paramType = "form"),
+			@ApiImplicitParam(name = "storeChangeStorageaddDcsl", value = "JSON数据对象", paramType = "form") })
+	public Map<String, Object> updataChangeWork(HttpServletRequest request, String storeChangeStoragehouseJson,
+			String storeChangeStorageaddDcsl) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Date date = new Date();
+		JSONObject changeStorage = null;
+		String workNo = null;
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		if (null != storeChangeStoragehouseJson && !"".equals(storeChangeStoragehouseJson)) {
+			changeStorage = JSONObject.parseObject(storeChangeStoragehouseJson);
+			workNo = (changeStorage.get("workNo") == null ? "" : changeStorage.get("workNo").toString());
+		}
+		try {
+			// JSON字符串转对象
+			ObjectMapper mapper = new ObjectMapper();
+			// 添加子表字段
+			List<StorageChangeStoragehouseWorkTask> StorageChangeStoragehouseWorkTaskList = null;
+			if (storeChangeStorageaddDcsl != null) {
+				StorageChangeStoragehouseWorkTaskList = (List<StorageChangeStoragehouseWorkTask>) mapper.readValue(
+						storeChangeStorageaddDcsl, new TypeReference<List<StorageChangeStoragehouseWorkTask>>() {
+						});
+			}
+			// 新增仓房货位数量质量标准子表.
+			if (StorageChangeStoragehouseWorkTaskList != null && StorageChangeStoragehouseWorkTaskList.size() > 0) {
+				for (StorageChangeStoragehouseWorkTask storageChangeStoragehouseWorkTask : StorageChangeStoragehouseWorkTaskList) {
+					storageChangeStoragehouseWorkTask.setOrg_id(orgId);
+					storageChangeStoragehouseWorkTask.setCreateDate(date);
+					storageChangeStoragehouseWorkTask.setWorkNo(workNo);
+					// 只有同步出入库数据，才保存
+					storageChangeStoragehouseWorkTaskService.addStorageChangeStoragehouseTaskDetail(storageChangeStoragehouseWorkTask);
+					// 添加主表字段
+					StorageChangeStoragehouseTask storageChangeStoragehouseTask = (StorageChangeStoragehouseTask) mapper
+							.readValue(storeChangeStoragehouseJson, StorageChangeStoragehouseTask.class);
+					storageChangeStoragehouseTask.setCreateDate(date);
+					storageChangeStoragehouseTask.setOrgId(orgId);
+					storageChangeStoragehouseTask.setPlanType("ChangeWork");
+					storageChangeStoragehouseTask.setWorkNo(workNo);
+					storageChangeStoragehouseTaskService.updateStorageChangeStoragehouseTask(storageChangeStoragehouseTask);
+				}
+			}
+			modelMap.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "保存失败！");
+		}
+		return modelMap;
+	}
+
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/findWorkData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "查询倒仓数据列表", notes = "查询倒仓申请信息列表")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "workNo", value = "倒仓申请单号", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
+	public Map<String, Object> findWorkData(String workNo, Integer orgId) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		if (workNo != null && !"".equals(workNo)) {
+			Criteria.andWorkNoEqualTo(workNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		modelMap.put("ChangeStoragehouseTask", list);
+		StorageChangeStoragehouseWorkTaskExample detailExamle = new StorageChangeStoragehouseWorkTaskExample();
+		com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample.Criteria detailCriteria = detailExamle
+				.createCriteria();
+		if (workNo != null && !"".equals(workNo)) {
+			detailCriteria.andWorkNoEqualTo(workNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrg_idEqualTo(orgId);
+		}
+		List<StorageChangeStoragehouseWorkTask> detailList = storageChangeStoragehouseWorkTaskService
+				.selectByExample(detailExamle);
+		modelMap.put("StorageChangeStoragehouseWorkTask", detailList);
+		return modelMap;
+	}
+
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/present", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "倒仓申请提交数据到省平台审批", notes = "倒仓申请提交数据到省平台审批")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "changestorageJson", value = "倒仓数据json串", paramType = "query") })
+	public Map<String, Object> present(HttpServletRequest request, String changestorageJson) {
+		String str = "";
+		String jso = "";
+		String strs = "";
+		JsonConfig config = new JsonConfig(); 
+		//点击提交后修改审核状态
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		//主表
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		//子表
+		StorageChangeStoragehouseTaskDetailExample detailExamle = new StorageChangeStoragehouseTaskDetailExample();
+		com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample.Criteria detailCriteria = detailExamle
+				.createCriteria();
+		try {
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		StorageChangeStoragehouseTask storageChangeIsUpload = (StorageChangeStoragehouseTask) mapper
+				.readValue(changestorageJson, StorageChangeStoragehouseTask.class);
+		if (storageChangeIsUpload.getBusinessNo() != null && !"".equals(storageChangeIsUpload.getBusinessNo())) {
+			detailCriteria.andBusinessNoEqualTo(storageChangeIsUpload.getBusinessNo());
+			Criteria.andBusinessNoEqualTo(storageChangeIsUpload.getBusinessNo());
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrg_idEqualTo(orgId);
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		//获取主表数据
+		jso = "{\"ChangeStoragehouseTask\":[";
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		for (StorageChangeStoragehouseTask storageChangeStoragehouseTask : list) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageChangeStoragehouseTask,config);//将java对象转换为json对象
+			strs = strs + json.toString();
+		}
+		jso = jso + strs + "],";
+		//获取子表数据
+		List<StorageChangeStoragehouseTaskDetail> detailList = storageChangeStoragehouseTaskDetailService.selectByExample(detailExamle);
+		jso = jso+"\"StorageChangeStoragehouseTaskDetail\":[";
+		for (StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail : detailList) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageChangeStoragehouseTaskDetail,config);//将java对象转换为json对象
+			str = str + json.toString() + ",";
+		}
+		if(str!=null && str.length()>0) {
+		str = str.substring(0, str.length()-1);
+		}
+		jso = jso + str + "]}";
+		
+		String url = changeUrl+"/business-management/changeStoragehous/save";
+        String count= HTTPUtils.doPost(url,jso);
+        if(count.contains("Success") || count.contains("200")){
+        	//判断IsUpload等于0为未上传数据
+        	if(storageChangeIsUpload.getIsUpload() == 0) {
+        		if (storageChangeIsUpload.getBusinessNo() != null && !"".equals(storageChangeIsUpload.getBusinessNo())) {
+        			Criteria.andBusinessNoEqualTo(storageChangeIsUpload.getBusinessNo());
+        		}
+        		if (orgId != null && !"".equals(orgId)) {
+        			Criteria.andOrgIdEqualTo(orgId);
+        		}
+        		for (StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail : detailList) {
+        			storageChangeStoragehouseTaskDetail.setApplyStatus(1);
+        			storageChangeStoragehouseTaskDetailService.updateStorageChangeStoragehouseTaskDetail(storageChangeStoragehouseTaskDetail);
+        		}
+        		storageChangeIsUpload.setIsUpload(1);
+        		storageChangeStoragehouseTaskService.updateStorageChangeStoragehouseTask(storageChangeIsUpload);
+        	}
+            modelMap.put("status", "success");
+            modelMap.put("msg", "成功！");
+        }
+	 } catch (Exception e){
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+		return modelMap;
+	}
+
+
+	@SuppressWarnings("unlikely-arg-type")
+	@RequestMapping(value = "/up", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value = "提交数据到省平台审批", notes = "提交数据到省平台审批")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "businessNo", value = "倒仓申请单号", paramType = "query") })
+	public Map<String, Object> up(HttpServletRequest request, String businessNo) {
+		String str = "";
+		String jso = "";
+		String strs = "";
+		JsonConfig config = new JsonConfig(); 
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+		//主表
+		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
+		Criteria Criteria = example.createCriteria();
+		//子表
+		StorageChangeStoragehouseTaskDetailExample detailExamle = new StorageChangeStoragehouseTaskDetailExample();
+		com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample.Criteria detailCriteria = detailExamle
+				.createCriteria();
+		if (businessNo != null && !"".equals(businessNo)) {
+			detailCriteria.andBusinessNoEqualTo(businessNo);
+			Criteria.andBusinessNoEqualTo(businessNo);
+		}
+		if (orgId != null && !"".equals(orgId)) {
+			detailCriteria.andOrg_idEqualTo(orgId);
+			Criteria.andOrgIdEqualTo(orgId);
+		}
+		//获取主表数据
+		jso = "{\"ChangeStoragehouseTask\":[";
+		List<StorageChangeStoragehouseTask> list = storageChangeStoragehouseTaskService.selectByExample(example);
+		for (StorageChangeStoragehouseTask storageChangeStoragehouseTask : list) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageChangeStoragehouseTask,config);//将java对象转换为json对象
+			strs = strs + json.toString();
+		}
+		jso = jso + strs + "],";
+		//获取子表数据
+		List<StorageChangeStoragehouseTaskDetail> detailList = storageChangeStoragehouseTaskDetailService.selectByExample(detailExamle);
+		jso = jso+"\"StorageChangeStoragehouseTaskDetail\":[";
+		for (StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail : detailList) {
+			config.registerJsonValueProcessor(Date.class, new DateJsonValueProcessor("yyyy-MM-dd"));  
+			net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(storageChangeStoragehouseTaskDetail,config);//将java对象转换为json对象
+			str = str + json.toString() + ",";
+		}
+		str = str.substring(0, str.length()-1);
+		jso = jso + str + "]}";
+		try {
+		String url = changeUrl+"/business-management/changeStoragehous/save";
+		
+        String count= HTTPUtils.doPost(url,jso);
+        
+        if(count.contains("Success") || count.contains("200")){
+            modelMap.put("status", "success");
+            modelMap.put("msg", "成功！");
+        }
+	 } catch (Exception e){
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+		return modelMap;
+	}
+	
+	@PostMapping(value = "/UpdateDcStatus")
+	@ApiOperation(value = "倒仓申请提交数据到省平台审批修改数据", notes = "倒仓申请提交数据到省平台审批修改数据")
+	public String UpdateDcStatus(String DcData) {
+		String retS = "Success";
+		StorageChangeStoragehouseTaskDetail detail = new StorageChangeStoragehouseTaskDetail();
+		try {
+			//修改主表状态和原因
+			ObjectMapper mapper = new ObjectMapper();
+			StorageChangeStoragehouseTask storageChangeIsUpload = (StorageChangeStoragehouseTask) mapper.readValue(DcData, StorageChangeStoragehouseTask.class);
+			storageChangeStoragehouseTaskService.updateDcStatus(storageChangeIsUpload);
+			//修改子表状态
+			detail.setApplyStatus(storageChangeIsUpload.getIsUpload());
+			detail.setBusinessNo(storageChangeIsUpload.getBusinessNo());
+			storageChangeStoragehouseTaskDetailService.updateDcStatus1(detail);
+		} catch (IOException e) {
+			return retS = "error";
+		}
+		return retS;
+	}
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageDumpController.java

@@ -0,0 +1,214 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.storage.model.StorageDump;
+import com.chinaitop.depot.storage.model.StorageDumpExample;
+import com.chinaitop.depot.storage.model.StorageDumpExample.Criteria;
+import com.chinaitop.depot.storage.service.StorageDumpService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.chinaitop.depot.storage.utils.createKC;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/StorageDumpController")
+@Api(value= "StorageDumpController", description = "转储管理控制类")
+public class StorageDumpController {
+
+	@Resource
+	private StorageDumpService storageDumpService;
+	
+	// 获取ip地址
+    @Value("${crk-webservice}")
+    private String url;
+    
+	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询转储管理列表", notes = "查询转储管理信息列表，支持分页")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+			@ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+			@ApiImplicitParam(name = "ylsxz", value = "原粮食性质", paramType = "query"),
+			@ApiImplicitParam(name = "xlsxz", value = "转储后性质", paramType = "query"),
+			@ApiImplicitParam(name = "startTime", value = "业务发生起始时间", paramType = "query"),
+			@ApiImplicitParam(name = "endTime", value = "业务发生终止时间", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+	})
+	public PageInfo<StorageDump> getList(Integer pageNum, Integer pageSize,
+										Integer houseId, Integer wareId, Integer ylsxz, Integer xlsxz, 
+										String startTime, String endTime, Integer orgId) {
+
+		StorageDumpExample example = new StorageDumpExample();
+		Criteria criteria = example.createCriteria();
+
+		/* 仓房ID */
+		if (null != houseId) {
+			criteria.andHouseIdEqualTo(houseId);
+		}
+
+		/* 货位id */
+		if (null != wareId) {
+			criteria.andWareIdEqualTo(wareId);
+		}
+
+		/* 原粮食性质 */
+		if (null != ylsxz) {
+			criteria.andYLsxzEqualTo(ylsxz);
+		}
+
+		/* 变动后粮食性质 */
+		if (null != xlsxz) {
+			criteria.andXLsxzEqualTo(xlsxz);
+		}
+
+		/* 变动后粮食性质 */
+		if (null != xlsxz) {
+			criteria.andXLsxzEqualTo(xlsxz);
+		}
+
+		if (null != startTime && !"".equals(startTime)) {
+			Date starDate = ParameterUtil.string2datetime(startTime + " 00:00:00");
+			criteria.andBusinessCreateTimeGreaterThanOrEqualTo(starDate);
+		}
+
+		if (ParameterUtil.isnotnull(endTime)) {
+			Date endDate = ParameterUtil.string2datetime(endTime + " 23:59:59");
+			criteria.andBusinessCreateTimeLessThanOrEqualTo(endDate);
+		}
+
+		/* 单位 */
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		List<StorageDump> list = storageDumpService.findCondition(example);
+
+		PageInfo<StorageDump> pageInfo = new PageInfo<StorageDump>(list);
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/edit",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询转储数据详情", notes = "查询转储数据详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "数据ID", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+	})
+	public StorageDump edit(Integer id, Integer orgId) {
+
+		StorageDump dump = null;
+
+		if (0 != id) {
+			dump = storageDumpService.findByParmaryKey(id);
+		} else {
+			dump = new StorageDump();
+			dump.setBusinessCreateTime(new Date());
+		}
+
+		return dump;
+	}
+
+	@RequestMapping(value = "/selectYswData",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询验收完的数据", notes = "查询验收完的数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+	public PageInfo<Map<String, Object>> selectYswData(HttpServletRequest request, Integer pageNum, Integer pageSize) {
+
+		List<Map<String, Object>> list = null;
+		PageInfo<Map<String, Object>> pageInfo = null;
+
+		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		try {
+			list = storageDumpService.selectYswData(orgId);
+			pageInfo = new PageInfo<Map<String, Object>>(list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/save",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+	@ApiOperation(value="保存转储数数据记录", notes = "保存转储数数据记录")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "dumpJson", value = "数据对象串", paramType = "form"),
+			@ApiImplicitParam(name = "crk_ip", value = "出入库连接IP", paramType = "form")
+	})
+	public Map<String, Object> save(String dumpJson, String crk_ip) {
+
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		String crk_adr = "";
+
+		try {
+			/* JSON字符串转对象 */
+			ObjectMapper mapper = new ObjectMapper();
+			List<StorageDump> storageDumpList = mapper.readValue(dumpJson, new TypeReference<List<StorageDump>>(){});
+			for (StorageDump storageDump : storageDumpList) {
+
+				/* 先调用出入库接口生成转储的业务的台账信息，生成失败不可保存转储数据***start */
+				Object[] parameters = new Object[9];
+				parameters[0] = storageDump.getOrgId() + "";
+				parameters[1] = storageDump.getLspz() + "";
+				//parameters[2] = null;
+				parameters[3] = storageDump.getHouseId() + "";
+				parameters[4] = storageDump.getWareId() + "";
+				parameters[5] = storageDump.getxLsxz() + "";
+				parameters[6] = storageDump.getyLsxz() + "";
+				parameters[7] = storageDump.getClsl() + "";
+				parameters[8] = 1 + ""; //1:新增；2：修改；3：删除
+				crk_adr = crk_ip+url;
+				String str = createKC.createKC("ChangeGrainAttribute", crk_adr, parameters);
+				/* *****end******/
+				//只有成功生成库存才可以保存，否则不可以保存
+				if ("true".equals(str)) {
+					storageDump.setCreateTime(new Date());  //创建时间
+					storageDumpService.save(storageDump);
+				} else {
+					modelMap.put("status", "error");
+					modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
+					return modelMap;
+				}
+			}
+
+			modelMap.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
+		}
+		return modelMap;
+	}
+
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoCheckController.java

@@ -0,0 +1,115 @@
+package com.chinaitop.depot.storage.controller;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoCheckService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/19
+ */
+@RestController
+@RequestMapping(value={"/foodbasicinfocheck"})
+@Api(value= "StorageFoodbasicInfoCheckController", description = "粮情专卡中质量检测记录控制类")
+public class StorageFoodbasicInfoCheckController {
+    @Resource
+    private StorageFoodbasicInfoCheckService foodbasicInfoCheckService;
+
+    /**
+     * 粮食质量检测记录,分页获取
+     */
+    @RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询粮食质量检测记录列表", notes = "查询粮食质量检测记录列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情卡Id", paramType = "query")
+    })
+    public PageInfo<StorageFoodbasicInfoCheck> listPage(Integer pageNum, Integer pageSize, Integer houseId, Integer warehouseId, Integer foodbasicinfoId){
+
+        StorageFoodbasicInfoCheckExample foodbasicInfoCheckExample = new StorageFoodbasicInfoCheckExample();
+        StorageFoodbasicInfoCheckExample.Criteria criteria = foodbasicInfoCheckExample.createCriteria();
+        if(ParameterUtil.isnotnull(houseId)){
+            criteria.andHouseIdEqualTo(houseId);
+        }
+        if(ParameterUtil.isnotnull(warehouseId)){
+            criteria.andWarehouseIdEqualTo(warehouseId);
+        }
+        if(ParameterUtil.isnotnull(foodbasicinfoId)){
+            criteria.andFoodbasicinfoIdEqualTo(foodbasicinfoId);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<StorageFoodbasicInfoCheck> list = foodbasicInfoCheckService.queryByFoodbasicInfoCheck(foodbasicInfoCheckExample);
+
+        PageInfo<StorageFoodbasicInfoCheck> pageInfo = new PageInfo<StorageFoodbasicInfoCheck>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 新增粮食质量检测记录,从第三方检查选择数据保存到粮食质量检测记录中
+     * @param houseId
+     * @param warehouseId
+     * @param foodbasicinfoId
+     * @param qualitycheckId
+     * @return
+     */
+    @RequestMapping(value="/saveSelectcheck", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="新增粮食质量检测记录(从第三方检查选择数据保存到粮食质量检测记录中)", notes = "新增粮食质量检测记录,从第三方检查选择数据保存到粮食质量检测记录中")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "form"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "form"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情卡Id", paramType = "form"),
+            @ApiImplicitParam(name = "qualitycheckId", value = "对应质量管理信息Id", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "orgId", paramType = "form")
+    })
+    public Map<String, Object> save(Integer houseId,Integer warehouseId,Integer foodbasicinfoId, Integer qualitycheckId,Integer orgId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        StorageFoodbasicInfoCheck foodbasicInfoCheck = new StorageFoodbasicInfoCheck();
+        try {
+            foodbasicInfoCheck.setHouseId(houseId);
+            foodbasicInfoCheck.setWarehouseId(warehouseId);
+            foodbasicInfoCheck.setFoodbasicinfoId(foodbasicinfoId);
+            foodbasicInfoCheck.setQualitycheckId(qualitycheckId);
+            foodbasicInfoCheck.setOrgId(orgId);
+
+            foodbasicInfoCheckService.save(foodbasicInfoCheck);
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+    /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/loadDataById",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id加载粮食质量检测记录", notes = "根据id加载粮食质量检测记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+    })
+    public StorageFoodbasicInfoCheck loadDataById(int id){
+        return foodbasicInfoCheckService.loadDataById(id);
+    }
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoController.java

@@ -0,0 +1,248 @@
+package com.chinaitop.depot.storage.controller;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample.Criteria;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+import com.chinaitop.depot.storage.model.vo.StorageQualitycheckVo;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
+import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/26
+ */
+@RestController
+@RequestMapping(value={"/foodbasicinfo"})
+@Api(value= "StorageFoodbasicInfoController", description = "粮情专卡控制类")
+public class StorageFoodbasicInfoController {
+    @Resource
+    private StorageFoodbasicInfoService foodbasicInfoService;
+
+    @Resource
+    private StorageQualitycheckSonService qualitycheckSonService;
+
+    /**
+     * 得到当前仓的粮情专卡
+     * @return
+     */
+    @RequestMapping(value="/getFoodbasicInfoByHouseId",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="根据仓号,货位号查找对应粮情专卡", notes = "根据仓号,货位号查找对应粮情专卡")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
+    })
+    public List<StorageFoodbasicinfo> getFoodbasicInfoByHouseId(Integer houseId, Integer warehouseId){
+    	StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+        if(houseId != null) {
+            foodbasicinfo.setHouseId(houseId);
+        }
+        if(warehouseId != null) {
+            foodbasicinfo.setWarehouseId(warehouseId);
+        }
+    	List<StorageFoodbasicinfo>  list = foodbasicInfoService.getByHouseIdAndWarehouseId(foodbasicinfo);
+       
+    	return list;
+    }
+    /**
+     * 新增粮情专卡的数据进行保存
+     * @param foodbasicinfoJson
+     * @return
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="封仓生成粮情专卡", notes = "封仓生成粮情专卡")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "foodbasicinfoJson", value = "粮情专卡基本信息JSON数据对象", paramType = "form"),
+            @ApiImplicitParam(name = "storageQualitycheckJson", value = "粮情专卡JSON数据对象", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "用户标识", paramType = "orgId")
+    })
+    public Map<String, Object> save(String foodbasicinfoJson,String storageQualitycheckJson,Integer orgId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        ObjectMapper objectMapper=new ObjectMapper();
+        StorageFoodbasicinfo foodbasicInfo = new StorageFoodbasicinfo();
+        StorageQualitycheckVo qualitycheckVo = new StorageQualitycheckVo();
+        try {
+            //①保存储粮信息
+            qualitycheckVo = (StorageQualitycheckVo)objectMapper.readValue(storageQualitycheckJson,StorageQualitycheckVo.class);
+            foodbasicInfo = (StorageFoodbasicinfo)objectMapper.readValue(foodbasicinfoJson,StorageFoodbasicinfo.class);
+            foodbasicInfoService.save(foodbasicInfo,qualitycheckVo,orgId);
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+
+    /**
+     * 得到粮情专卡列表pageinfo
+     */
+    @RequestMapping(value = "/basicinfoPageInfo",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询粮情专卡列表", notes = "查询粮情专卡列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
+    })
+    public PageInfo<StorageFoodbasicinfo> basicinfoPageInfo(Integer pageNum, Integer pageSize ,
+                                                            Integer houseId, Integer warehouseId){
+        StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+        if(houseId != null){
+            foodbasicinfo.setHouseId(houseId);
+        }
+        if(warehouseId != null){
+            foodbasicinfo.setWarehouseId(warehouseId);
+        }
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        //0:最新数据   1:历史数据
+        foodbasicinfo.setHistoryStatus(0);
+        List<StorageFoodbasicinfo>  list = foodbasicInfoService.selectByExample(foodbasicinfo);
+
+        PageInfo<StorageFoodbasicinfo> pageInfo = new PageInfo<StorageFoodbasicinfo>(list);
+        return pageInfo;
+
+    }
+
+
+    /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     * @throws Exception 
+     */
+    @RequestMapping(value = "/loadDataById", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id加载粮情专卡信息", notes = "根据id加载粮情专卡信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+    })
+    public StorageFoodbasicinfo loadDataById(Integer id) throws Exception{
+        if(id != null && !"".equals(id)){
+        	StorageFoodbasicinfo foodbasicinfo = foodbasicInfoService.loadDataById(id);
+            List<StorageFoodbasicinfo>  list = foodbasicInfoService.getByHouseIdAndWarehouseId(foodbasicinfo);
+			if (list.size() > 0 && list != null){
+
+                foodbasicinfo = list.get(0);
+
+                List<StorageQualitycheckSon> SqsList =  qualitycheckSonService.getQualitycheckSonByFoodbasicinfoCheck(list.get(0).getId());
+                for(StorageQualitycheckSon sqk : SqsList){
+                    if(sqk.getNumbering()== 6996 ){
+                        foodbasicinfo.setFatIndex(sqk.getSetValue());
+                        continue;
+                    }
+                    if(sqk.getNumbering() == 6995 ){
+                        foodbasicinfo.setPeroxideValue(sqk.getSetValue());
+                        continue;
+                    }
+                }
+            }
+            return foodbasicinfo;
+        }else {
+            return new StorageFoodbasicinfo();
+        }
+    }
+
+    /**
+     * 查询粮情转卡数据--粮情分析报告专用
+     * @return
+     */
+    @RequestMapping(value="/getGrainSituation", produces = MediaType.APPLICATION_JSON_VALUE, method= RequestMethod.GET)
+    @ApiOperation(value="查询一条粮情专卡数据", notes = "查询一条粮情专卡数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+            @ApiImplicitParam(name="wareId", value="货位ID", paramType="query")
+    })
+    public Map<String, Object> getGrainSituation(Integer houseId, Integer wareId){
+        Map<String, Object> map = new HashMap<>();
+
+        StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+        if(houseId != null){
+            foodbasicinfo.setHouseId(houseId);
+        }
+        if(wareId != null){
+            foodbasicinfo.setWarehouseId(wareId);
+        }
+        foodbasicinfo.setHistoryStatus(0);
+        List<StorageFoodbasicinfo> basicInfo = foodbasicInfoService.selectByExample(foodbasicinfo);
+
+        if (null != basicInfo && basicInfo.size() > 0) {
+            map.put("houseType", Integer.parseInt(basicInfo.get(0).getHouseType()));
+            map.put("subType", basicInfo.get(0).getSubType());
+            map.put("recorder", basicInfo.get(0).getRecorder());
+        }
+        return map;
+    }
+
+    @RequestMapping(value = "/setFoodBasicInfoHistoryStatus", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value = "根据仓房和货位名称更新当前粮情专卡为历史记录", notes = "根据仓房和货位名称更新当前粮情专卡为历史记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "form"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "form")
+    })
+    public Map<String, Object> setFoodBasicInfoHistoryStatus(Integer houseId, Integer warehouseId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        if (ParameterUtil.isnotnull(houseId) &&ParameterUtil.isnotnull(warehouseId) ) {
+            foodbasicInfoService.setFoodBasicInfoHistoryStatus(houseId,warehouseId);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    @RequestMapping(value = "/findByCondition", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "根据条件查询粮情专卡数据", notes = "根据条件查询粮情专卡数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+            @ApiImplicitParam(name = "lsnq", value = "粮食年期", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "lsxz", value = "粮食性质", paramType = "query")
+    })
+    public List<StorageFoodbasicinfo> findByCondition(Integer houseId, Integer warehouseId, Integer lsnq, Integer lspz, Integer lsxz) {
+
+    	List<StorageFoodbasicinfo> list = null;
+
+    	StorageFoodbasicinfoExample example = new StorageFoodbasicinfoExample();
+    	Criteria criteria = example.createCriteria();
+
+        if (ParameterUtil.isnotnull(houseId)) {
+        	criteria.andHouseIdEqualTo(houseId);
+        }
+        if (ParameterUtil.isnotnull(warehouseId) ) {
+        	criteria.andWarehouseIdEqualTo(warehouseId);
+        }
+        if (ParameterUtil.isnotnull(lsnq)) {
+        	criteria.andGrowYearEqualTo(lsnq);
+        }
+        if (ParameterUtil.isnotnull(lspz) ) {
+        	criteria.andSubTypeDetailedEqualTo(lspz);
+        }
+        if (ParameterUtil.isnotnull(lsxz)) {
+        	criteria.andQualityEqualTo(lsxz.toString());
+        }
+
+        list = foodbasicInfoService.findByCondition(example);
+
+        return list;
+    }
+
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoLocationController.java

@@ -0,0 +1,147 @@
+package com.chinaitop.depot.storage.controller;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoLocationService;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/20
+ */
+@RestController
+@RequestMapping(value = {"/foodbasicinfolocation"})
+@Api(value= "StorageFoodbasicInfoLocationController", description = "粮情专卡中货位变更控制类")
+public class StorageFoodbasicInfoLocationController {
+    @Resource
+    private StorageFoodbasicInfoLocationService foodbasicInfoLocationService;
+    @Resource
+    private StorageFoodbasicInfoService foodbasicInfoService;
+    /**
+     * 粮食基本信息货位变更记录分页获取
+     * @throws Exception 
+     */
+    @RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查询粮食基本信息货位变更记录列表", notes = "查询粮食基本信息货位变更记录列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情卡Id", paramType = "query")
+    })
+    public PageInfo<StorageFoodbasicInfoLocation> listPage(Integer pageNum, Integer pageSize, Integer houseId, Integer warehouseId, Integer foodbasicinfoId) throws Exception{
+
+    	StorageFoodbasicInfoLocation location = new StorageFoodbasicInfoLocation();
+        if(houseId != null){
+            location.setHouseId(houseId);
+        }
+        if(warehouseId != null){
+        	location.setWarehouseId(warehouseId);
+        }
+        if(foodbasicinfoId != null){
+            location.setFoodbasicinfoId(foodbasicinfoId);
+        }
+        if(pageNum !=null && pageSize != null){
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageFoodbasicInfoLocation> list = foodbasicInfoLocationService.queryByFoodbasicInfoLocation(location);
+        PageInfo<StorageFoodbasicInfoLocation> pageInfo = new PageInfo<StorageFoodbasicInfoLocation>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 新增粮食基本信息货位变更记录
+     * @param foodinfoLocationJson
+     * @return
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="新增粮食基本信息货位变更记录", notes = "新增粮食基本信息货位变更记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "foodinfoLocationJson", value = "货位变更记录JSON数据", paramType = "form"),
+            @ApiImplicitParam(name = "warehouseCode", value = "新货位编码", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "登陆者Id", paramType = "form"),
+    })
+    public Map<String, Object> save(String foodinfoLocationJson,Integer orgId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageFoodbasicInfoLocation foodbasicInfoLocation = null;
+        try {
+            foodbasicInfoLocation = (StorageFoodbasicInfoLocation)mapper.readValue(foodinfoLocationJson, StorageFoodbasicInfoLocation.class);
+            foodbasicInfoLocation.setNewWarehouseCode(foodbasicInfoLocation.getWarehouseCode());
+            foodbasicInfoLocation.setOrgId(orgId);
+
+            //关联粮情专卡表
+            Integer houseId = foodbasicInfoLocation.getHouseId();
+            Integer warehouseId = foodbasicInfoLocation.getWarehouseId();
+
+            if(ParameterUtil.isnotnull(houseId) && ParameterUtil.isnotnull(warehouseId)){
+                StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+
+                if (houseId != null) {
+                    foodbasicinfo.setHouseId(houseId);
+                }
+                if (warehouseId != null) {
+                    foodbasicinfo.setWarehouseId(warehouseId);
+                }
+
+                List<StorageFoodbasicinfo>  list = foodbasicInfoService.getByHouseIdAndWarehouseId(foodbasicinfo);
+
+                Integer foodbaseInfoId = null;
+                if(list.size() > 0 && list != null){
+                    foodbasicinfo = list.get(0);
+                }
+                if(foodbasicinfo != null){
+                    foodbaseInfoId = foodbasicinfo.getId();
+                }
+                if(foodbaseInfoId != null){
+                    foodbasicInfoLocation.setFoodbasicinfoId(foodbaseInfoId);
+                }
+
+            }
+            foodbasicInfoLocationService.save(foodbasicInfoLocation);
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/loadDataById", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id加载货位变更记录", notes = "根据id加载货位变更记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+    })
+    public StorageFoodbasicInfoLocation loadDataById(Integer id){
+        if(id != null && !"".equals(id)){
+            return foodbasicInfoLocationService.loadDataById(id);
+        }else {
+            return new StorageFoodbasicInfoLocation();
+        }
+    }
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageOverheadSetController.java

@@ -0,0 +1,271 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.storage.model.StorageOverheadSet;
+import com.chinaitop.depot.storage.model.StorageOverheadSetExample;
+import com.chinaitop.depot.storage.model.StorageOverheadSetExample.Criteria;
+import com.chinaitop.depot.storage.service.StorageOverheadSetService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/StorageOverheadSetController")
+@Api(value= "StorageOverheadSetController", description = "架空期设置控制类")
+public class StorageOverheadSetController {
+
+	@Resource
+	private StorageOverheadSetService storageOverheadSetService;
+
+	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期设置列表", notes = "查询架空期设置信息列表，支持分页")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+	public PageInfo<StorageOverheadSet> getList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+
+		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"), "");
+
+		StorageOverheadSetExample example = new StorageOverheadSetExample();
+		Criteria criteria = example.createCriteria();
+
+		/* 单位 */
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
+		}
+
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		List<StorageOverheadSet> list = storageOverheadSetService.findConditions(example);
+
+		PageInfo<StorageOverheadSet> pageInfo = new PageInfo<StorageOverheadSet>(list);
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/edit",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期设置数据详情", notes = "查询架空期设置数据详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "数据ID", paramType = "query")
+	})
+	public StorageOverheadSet edit(Integer id) {
+
+		StorageOverheadSet overheadSet = null;
+
+		if (0 != id) {
+			overheadSet = storageOverheadSetService.findByKeyCondition(id);
+		} else {
+			overheadSet = new StorageOverheadSet();
+		}
+
+		return overheadSet;
+	}
+
+	@RequestMapping(value = "/save",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+	@ApiOperation(value="保存架空期设置数据记录", notes = "保存架空期设置数数据记录")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "overheadSetJson", value = "数据对象串", paramType = "form")
+	})
+	public Map<String, Object> save(String overheadSetJson) {
+
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+
+		try {
+			/* JSON字符串转对象 */
+			ObjectMapper mapper = new ObjectMapper();
+			StorageOverheadSet overheadSet = mapper.readValue(overheadSetJson, StorageOverheadSet.class);
+			overheadSet.setCreateDate(new Date());  //创建时间
+			if(overheadSet.getId() == null) {
+				storageOverheadSetService.insert(overheadSet);
+			}else {
+				storageOverheadSetService.update(overheadSet);
+			}
+			modelMap.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "保存失败！");
+		}
+		return modelMap;
+	}
+	@SuppressWarnings({ "null", "unused" })
+	@RequestMapping(value = "/findHwxz",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="查询架空期设置数据详情", notes = "查询架空期设置数据详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "hwxz", value = "粮食性质", paramType = "query")
+	})
+	public PageInfo<Map<String, Object>> findHwxz(HttpServletRequest request, String overheadGetJson, Integer pageNum, Integer pageSize) {
+		Date date = null;
+		long time1 = 0;
+        long time2 = 0;
+		Date nowDate = new Date();//获取当前时间
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		DateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"), "");
+		Map<String, Object> map = new HashMap<String, Object>();
+		List<Map<String, Object>> lastList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
+		JSONObject jsonObject = JSONObject.parseObject(overheadGetJson);
+		JSONArray array = jsonObject.getJSONArray("list");
+		for(int i = 0; i < array.size(); i++){
+			JSONObject object = (JSONObject) array.get(i);     //将array中的数据进行逐条转换
+			map.put("orgId", orgId);
+			map.put("lsxz", object.get("hwxz"));
+			map.put("ch", object.getString("ch"));
+			map.put("hwh", object.getString("hwh"));
+			map.put("executeType", 3156);
+	    	List<Map<String, Object>> list = storageOverheadSetService.getOverYqDaysList(map);
+	    	if(!list.equals("" ) && !list.isEmpty()) {
+        	for (Map<String, Object> lastMap : list) {
+        		Integer warningDay = 0;
+        		int bw = 4;  //初始化为正常
+        		String sqyqtime = null;
+        		Integer isUpload = 0;
+					try {
+						date = format1.parse((String) object.get("jkqEnd"));
+						cal.setTime(date);
+					} catch (ParseException e) {
+						e.printStackTrace();
+					}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("sqyq_time")) {
+						sqyqtime = sdf2.format(lastEntry.getValue());
+						break;
+					}
+				}
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("is_Upload")) {
+						isUpload = (Integer) lastEntry.getValue();
+						break;
+					}
+				}
+	    		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("overhead_period")) {
+						Integer overheadPeriod =(Integer) lastEntry.getValue();
+						cal.add(Calendar.MONTH, overheadPeriod);
+						break;
+					}
+				}
+						Double zcsl = Double.parseDouble(object.get("zcsl").toString());
+						Double srsl = Double.parseDouble(object.get("srsl").toString());
+        		for (Map.Entry<String, Object> lastEntry : lastMap.entrySet()) {
+					if (lastEntry.getKey().equals("warning_day")) {
+						warningDay =(Integer) lastEntry.getValue();
+						break;
+					}
+				}
+        		try { 
+            		String dateString = format.format(nowDate);
+                	String timea= format.format(cal.getTime());
+    				cal.setTime(sdf.parse(dateString));
+    				time1 = cal.getTimeInMillis();
+    		        cal.setTime(sdf.parse(timea));
+    		        time2 = cal.getTimeInMillis();
+    		        long between_days=(time2-time1)/(1000*3600*24);
+    		        Integer rengTime = Integer.parseInt(String.valueOf(between_days));
+	        		date = format1.parse((String) object.get("jkqEnd"));
+	        		object.replace("jkqEnd", timea);
+	        		object.put("bw", bw);
+	        		if(srsl < zcsl) {
+	        			object.put("srsl", 0);
+	        			object.remove("rq");
+	        			if(rengTime < 1) {
+	        				bw = 2;
+	        				object.put("bw", bw);
+	        			}else if(sqyqtime != null){
+	        					 long sqyq_days=(time2-time1)/(1000*3600*24);
+	        	    		       Integer sqTime = Integer.parseInt(String.valueOf(sqyq_days));
+	        					if(sqTime < warningDay ) {
+	        						if(isUpload == 2) {
+	        						bw = 3;
+	        						object.put("bw", bw);
+	        						object.put("sqyqTime", sqyqtime);
+	        						}else if(rengTime < warningDay) {
+	    	        					bw = 1;
+	    	        					object.put("bw", bw);
+	    	        				}else{
+	    	        					bw = 0;
+	    	            				object.put("bw", bw);
+	    	        				}
+	        					}else {
+	        						bw = 0;
+		        					object.put("bw", bw);
+	        					}
+	        			}else if(rengTime < warningDay) {
+	        					bw = 1;
+	        					object.put("bw", bw);
+	        				}else{
+	        					bw = 0;
+	            				object.put("bw", bw);
+	        				}
+	        			}
+
+	        		if(srsl >= zcsl) {
+	            		Integer planSp = Integer.parseInt((String) object.get("planSp")) ;
+	        			if(isUpload == 2) {
+	        				object.put("sqyqTime", sqyqtime);
+	        			}
+	        			if(planSp != 100) {
+	        				object.put("srsl", 0);
+		        			object.remove("rq");
+		        			bw = 5;
+		        			object.put("bw", bw);
+	        			} 
+	        		}
+    			} catch (ParseException e) {
+    				// TODO Auto-generated catch block
+    				e.printStackTrace();
+    			}
+			}
+        	countList.add(object);
+	    	}
+		}
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(countList);
+		pageInfo.setPageNum(pageNum);
+		pageInfo.setPageSize(pageSize); 
+        //由于结果是>startRow的，所以实际的需要+1
+        if (pageInfo.getSize() == 0) {
+        	pageInfo.setStartRow(0);
+        	pageInfo.setEndRow(0);
+        } else {
+        	pageInfo.setStartRow(pageInfo.getStartRow() + 1);
+            //计算实际的endRow（最后一页的时候特殊）
+        	pageInfo.setEndRow(pageInfo.getStartRow() - 1 +pageInfo.getSize());
+        }
+		return pageInfo;
+	}
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageQualityEventController.java

@@ -0,0 +1,127 @@
+package com.chinaitop.depot.storage.controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.storage.model.StorageQualityEvent;
+import com.chinaitop.depot.storage.model.StorageQualityEventExample;
+import com.chinaitop.depot.storage.model.StorageQualityEventExample.Criteria;
+import com.chinaitop.depot.storage.service.StorageQualityEventService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/qualityEvent")
+@Api(value= "StorageQualityEventController", description = "质量事件控制类")
+public class StorageQualityEventController {
+
+	@Resource
+	private StorageQualityEventService eventService;
+
+	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询质量事件列表", notes = "支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位Id", paramType = "query")
+    })
+	public PageInfo<StorageQualityEvent> getList(Integer pageNum, Integer pageSize, Integer houseId,
+			Integer wareId, Integer orgId) {
+
+		List<StorageQualityEvent> list = null;
+		PageInfo<StorageQualityEvent> pageInfo = null;
+
+		StorageQualityEventExample example = new StorageQualityEventExample();
+		Criteria criteria = example.createCriteria();
+		
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		if (null != houseId) {
+			criteria.andHouseIdEqualTo(houseId);
+		}
+		if (null != wareId) {
+			criteria.andWareIdEqualTo(wareId);
+		}
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+
+		list = eventService.findByCondition(example);
+		String czwt = "";
+		for (StorageQualityEvent event : list) {
+			czwt = event.getCzwt();
+			if (czwt.length() > 10) {
+				event.setCzwt(czwt.substring(0, 10)+"......");
+			}
+		}
+		pageInfo = new PageInfo<StorageQualityEvent>(list);
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/findByIdObj",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="按ID查询一条安全事件数据(包含附件信息)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键Id", paramType = "query")
+    })
+	public Map<String, Object> findByIdObj(Integer id) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		/* 查询质量事件主表数据  */
+		StorageQualityEvent qualityEvent = eventService.findByPrimaryKey(id);
+		if (null == qualityEvent) {
+			qualityEvent = new StorageQualityEvent();
+			qualityEvent.setInputDate(new Date());
+		}
+		map.put("qualityEvent", qualityEvent);
+
+		return map;
+	}
+
+	@RequestMapping(value = "/update",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="更新质量事件信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "event", value = "质量事件数据", paramType = "form")
+    })
+	public Map<String, Object> update(String event) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		/* 插入质量事件主表数据  */
+		ObjectMapper objectMapper = new ObjectMapper();
+		try {
+			StorageQualityEvent qualityEvent = objectMapper.readValue(event, StorageQualityEvent.class);
+
+			if (qualityEvent.getId() == null) {
+				eventService.save(qualityEvent);
+			} else {
+				eventService.update(qualityEvent);
+			}
+			map.put("status", "success");
+			map.put("id", qualityEvent.getId());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -0,0 +1,690 @@
+package com.chinaitop.depot.storage.controller;
+
+
+import com.chinaitop.depot.storage.model.*;
+import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
+import com.chinaitop.depot.storage.service.StorageQualitycheckService;
+import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
+import com.chinaitop.depot.storage.utils.DataSynchronization;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by product on 2017/10/11.
+ */
+@RestController
+@RequestMapping(value = {"/qualitycheck"})
+@Api(value= "StorageQualitycheckController", description = "质量管理控制类")
+public class StorageQualitycheckController {
+    @Resource
+    private StorageQualitycheckService storageQualitycheckService;
+
+    @Resource
+    private StorageQualitycheckSonService qualitycheckSonService;
+
+    /**
+     * 封仓管理中查询出未封仓的质量管理信息，已经封仓的不要展示
+     * 分页获取
+     */
+    @RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询质量管理列表", notes = "查询质量管理信息列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "qualitycheck", value = "实体类", paramType = "query"),
+            @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query")
+    })
+    public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
+                                                  StorageQualitycheck qualitycheck, String checktype,String checkResult) {
+    	StorageQualitycheck qualityCheck = new StorageQualitycheck();
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checktype)){
+            qualityCheck.setType(checktype);
+        }
+        // 仓房id.
+        if (qualitycheck.getHouseId() != null) {
+            qualityCheck.setHouseId(qualitycheck.getHouseId());
+
+        }
+        // 货位id.
+        if (qualitycheck.getWarehouseId() != null) {
+            qualityCheck.setWarehouseId(qualitycheck.getWarehouseId());
+        }
+        // 粮库id.
+        if (qualitycheck.getOrgId() != null) {
+            qualityCheck.setOrgId(qualitycheck.getOrgId());
+        }
+        
+        // 明细品种.
+        if (qualitycheck.getSubTypeDetailed() != null) {
+            qualityCheck.setSubTypeDetailed(qualitycheck.getSubTypeDetailed());
+        }
+        
+        // 等级.
+        if (qualitycheck.getLevel() != null) {
+            qualityCheck.setLevel(qualitycheck.getLevel());
+        }
+
+        //检验结果（0：合格 , 1 :不合格）
+
+        if (StringUtils.isNotBlank(checkResult)) {
+            qualityCheck.setCheckResult(checkResult);
+        }
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
+        //qualityCheck.setSealStatus("0");
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位).
+     * @param qualitycheck
+     * @return
+     */
+    @RequestMapping(value = "/getHouseOrWareList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位)", notes = "获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qualitycheck", value = "质量管理对象", paramType = "query")
+    })
+    public List<StorageQualitycheck> getHouseIdList(StorageQualitycheck qualitycheck) {
+        List<StorageQualitycheck> list = storageQualitycheckService.getHouseOrWareList(qualitycheck);
+        return list;
+    }
+    
+    /**
+     * 获取第三方检验的质量标准字符串(手动拼写)
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/getQualityStandardStr",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取第三方检验的质量标准字符串(手动拼写)", notes = "获取第三方检验的质量标准字符串(手动拼写)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "form"),
+    })
+    public Map<String, Object> getQualityStandardStr(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id == null) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "id为空，查询质量标准失败！");
+        } else {
+            String qualityStandardStr = storageQualitycheckService.getQualityStandardStr(id);
+            modelMap.put("status", "success");
+            modelMap.put("qualityStandard", qualityStandardStr);
+        }
+
+        return modelMap;
+    }
+    
+    
+
+    /**
+     * 新增和修改的数据进行保存
+     * @param qualitycheckJson
+     * @return
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增/修改数据", notes = "新增/修改数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qualitycheckJson", value = "质量基础信息JSON数据对象", paramType = "form"),
+            @ApiImplicitParam(name = "qualityOneJson", value = "质量检测信息JSON数据对象", paramType = "form")
+    })
+    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageQualitycheck qualitycheck = null;
+        List<StorageQualitycheckSon> qualitycheckone = null;
+        try {
+            qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
+            //默认0:未封仓   1:已封仓
+            qualitycheck.setSealStatus("0");
+            qualitycheck.setHistoryStatus(0);//0:最新数据   1:历史数据
+            Integer qualityCheckId = storageQualitycheckService.save(qualitycheck);
+            //关联保存日常检查和第三方检测的检测信息 如果为空则是对初检 验收等操作
+            if(StringUtils.isNoneBlank(qualityOneJson)){
+                qualitycheckone = mapper.readValue(qualityOneJson,  new TypeReference<List<StorageQualitycheckSon>>(){});
+                for (int i = 0; i < qualitycheckone.size(); i++) {
+                    qualitycheckone.get(i).setQualitycheckId(qualityCheckId);
+                    storageQualitycheckService.saveOne(qualitycheckone.get(i));
+                }
+            }
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/loadDataById" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id加载质量检查数据", notes = "根据id加载质量检查数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query"),
+    })
+    public StorageQualitycheck loadDataById(Integer id){
+        StorageQualitycheck qualitycheck=storageQualitycheckService.loadDataById(id);
+        return qualitycheck;
+    }
+
+    /**
+     * 根据主键id移除数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="按ID删除质量检查信息", notes = "按ID删除质量检查信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+    public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        storageQualitycheckService.remove(id);
+
+        //删除管理的数据
+        StorageQualitycheckSonExample qualitycheckSonExample = new StorageQualitycheckSonExample();
+        StorageQualitycheckSonExample.Criteria criteria = qualitycheckSonExample.createCriteria();
+        if(id != null){
+            criteria.andQualitycheckIdEqualTo(id);
+        }
+        qualitycheckSonService.removeSon(qualitycheckSonExample);
+        retMap.put("msg","success");
+        return retMap;
+    }
+
+    /**
+     * 封仓管理中查询出所有仓已经封仓或者未封仓的质量管理信息
+     * @param houseId
+     * @param warehouseId
+     * @return
+     */
+    @RequestMapping(value="/getFoodsealList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="封仓管理列表中查询出封仓或未封仓的质量管理信息", notes = "封仓管理列表中查询出封仓或未封仓的质量管理信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
+    })
+    public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize ,
+                                                  String houseId, String warehouseId) {
+    	StorageQualitycheck qualityCheck = new StorageQualitycheck();
+        if(StringUtils.isNoneBlank(houseId)){
+            qualityCheck.setHouseId(Integer.valueOf(houseId));
+
+        }
+        if(StringUtils.isNoneBlank(warehouseId)){
+            qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
+        }
+        qualityCheck.setType("1");///查找验收质量管理的信息
+
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+
+        List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 根据仓号,货位号以及类型查找对应质量检查信息
+     * @param houseId warehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findByStoreWarehouse", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据仓号,货位号以及类型查找对应质量检查信息", notes = "根据仓号,货位号以及类型查找对应质量检查信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "检查类型", paramType = "query"),
+            @ApiImplicitParam(name = "sealStatus", value = "封仓类型", paramType = "query")
+    })
+    public StorageQualitycheck findByStoreWarehouse(Integer houseId, Integer warehouseId, String type,String sealStatus) {
+    	StorageQualitycheck qualityCheckExample = new StorageQualitycheck();
+        StorageQualitycheck qualitycheck = null;
+        try {
+            if (houseId != null && !"".equals(houseId)) {
+                qualityCheckExample.setHouseId(houseId);
+
+            }
+            if(warehouseId != null && !"".equals(warehouseId)){
+                qualityCheckExample.setWarehouseId(warehouseId);
+            }
+            if(StringUtils.isNotBlank(type)){
+                qualityCheckExample.setType(type);//传入查找的质量类型
+            }
+
+            if(StringUtils.isNotBlank(sealStatus)){
+                qualityCheckExample.setSealStatus(sealStatus);//传入查找的质量类型
+            }
+            //0:最新数据  1:历史数据
+            qualityCheckExample.setHistoryStatus(0);
+            List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheck(qualityCheckExample);
+            if (null != list && list.size() > 0) {
+            	qualitycheck = list.get(0);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return qualitycheck;
+    }
+
+    /**
+     * 根据仓号,货位号以及类型查找对应封仓信息
+     * @param houseId warehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findByStoreWarehouseData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据仓号,货位号以及类型查找对应信息", notes = "根据仓号,货位号以及类型查找对应信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "检查类型", paramType = "query"),
+            @ApiImplicitParam(name = "id", value = "检查id", paramType = "query")
+    })
+    public StorageFoodbasicinfo findByStoreWarehouseData(Integer houseId, Integer warehouseId, String type , Integer id) {
+        StorageQualitycheck qualityCheckExample = new StorageQualitycheck();
+        StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+        try {
+            if (houseId != null && !"".equals(houseId)) {
+                qualityCheckExample.setHouseId(houseId);
+            }
+            if(warehouseId != null && !"".equals(warehouseId)){
+                qualityCheckExample.setWarehouseId(warehouseId);
+            }
+            if(StringUtils.isNotBlank(type)){
+                qualityCheckExample.setType(type);//传入查找的质量类型
+            }
+
+            if (id != null && !"".equals(id)) {
+                qualityCheckExample.setId(id);
+            }
+
+            //0:最新数据  1:历史数据
+            qualityCheckExample.setHistoryStatus(0);
+            //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
+            qualityCheckExample.setSealStatus("0");
+
+            //查看business_store_ware_detail中价格是否有
+            List<StorageQualitycheck> businessList = storageQualitycheckService.queryByQualitycheckusiness(qualityCheckExample);
+            if(null != businessList && businessList.size() > 0){
+                qualityCheckExample.setNotice(1);
+            }
+
+            List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheckData(qualityCheckExample);
+            if (null != list && list.size() > 0) {
+                foodbasicinfo.setHeight(list.get(0).getHeight());
+                foodbasicinfo.setDisperseCapacity(list.get(0).getDisperseCapacity());
+                foodbasicinfo.setKeepMethod(list.get(0).getKeepMethod());
+                foodbasicinfo.setPrice(list.get(0).getPrice());
+                foodbasicinfo.setStorageLocation(list.get(0).getDepotName());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return foodbasicinfo;
+    }
+
+    /**
+     * 查询第三方检查
+     * @param  foodbasicinfoId
+     * @return getThirdCheckList
+     */
+    @RequestMapping(value="/getThirdCheckList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查询获得第三方检查列表", notes = "查询获得第三方检查列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情专卡Id", paramType = "query"),
+
+    })
+    public PageInfo<StorageQualitycheck> getThirdCheckList(Integer pageNum, Integer pageSize , Integer houseId, Integer warehouseId,
+                                                           Integer foodbasicinfoId) {
+        StorageQualitycheck qualityCheck = new StorageQualitycheck();
+
+        if(foodbasicinfoId != null){
+            qualityCheck.setId(foodbasicinfoId);
+        }
+        if(houseId != null){
+            qualityCheck.setHouseId(houseId);
+        }
+        if(warehouseId != null){
+            qualityCheck.setWarehouseId(warehouseId);
+        }
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+
+        List<StorageQualitycheck> list = storageQualitycheckService.getThirdCheckList(qualityCheck);
+
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 和foodbasicinfoCheck关联得到粮情专卡中粮食质量检测记录(该记录包含当前仓房的验收信息和选择的第三方检验信息)
+     * @param houseId
+     * @param warehouseId
+     * @param foodbasicinfoId
+     * @return
+     */
+    @RequestMapping(value = "/getQualitycheckListByFoodbasicinfoCheck",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="和foodbasicinfoCheck关联得到粮情专卡中粮食质量检测记录", notes = "该记录包含当前仓房的验收信息和选择的第三方检验信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情专卡Id", paramType = "query"),
+
+    })
+    public List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(Integer houseId, Integer warehouseId, Integer foodbasicinfoId){
+        StorageQualitycheck qualityCheck = new StorageQualitycheck();
+        if(foodbasicinfoId != null){
+            qualityCheck.setId(foodbasicinfoId);
+        }
+        if(houseId != null){
+            qualityCheck.setHouseId(houseId);
+        }
+        if(warehouseId != null){
+            qualityCheck.setWarehouseId(warehouseId);
+        }
+        List<StorageQualitycheck> list = storageQualitycheckService.getQualitycheckListByFoodbasicinfoCheck(qualityCheck,foodbasicinfoId);
+
+        return list;
+    }
+
+    /**
+     * 获取第三方检查的不宜存的可用数据
+     * @return
+     */
+    
+    @RequestMapping(value = "/getStoreQualityList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET )
+    @ApiOperation(value="获取第三方检查的不宜存的可用数据", notes = "获取第三方检查的不宜存的可用数据")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "orgId", value = "粮库id", paramType = "query")
+
+    })
+    public List<Map<String,Object>> getStoreQualityList(Integer orgId){
+        List<Map<String,Object>> listQuality=storageQualitycheckService.getStoreQualityList(orgId);
+        return listQuality;
+    }
+
+    /**
+     * 获取第三方检查的不宜存的可用数据
+     * @return
+     */
+    @RequestMapping(value = "/getTrdStoreQualityList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET )
+    @ApiOperation(value="获取第三方检查的不宜存的可用数据(集合格式)", notes = "获取第三方检查的不宜存的可用数据(集合格式)")
+    public List<Map<String,Object>> getTrdStoreQualityList(){
+    	List<Map<String,Object>> listQuality=storageQualitycheckService.getTrdStoreQualityList();    
+        return listQuality;
+    }
+    
+    
+    @RequestMapping(value = "/setQualityCheckByHistoryStatus", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value = "根据仓房和货位名称更新当前质量管理为历史记录", notes = "根据仓房和货位名称更新当前质量管理为历史记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+    })
+    public Map<String, Object> setQualityCheckByHistoryStatus(Integer houseId, Integer warehouseId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        if (ParameterUtil.isnotnull(houseId) &&ParameterUtil.isnotnull(warehouseId) ) {
+            storageQualitycheckService.setQualityCheckByHistoryStatus(houseId,warehouseId);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 根据id查询质检信息
+     * @param ZZid
+     * @return
+     */
+    @RequestMapping(value="/getDataByZJId", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value = "根据id查询质检信息", notes = "根据id查询质检信息,计划验收模块用到。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ZZid", value = "质检id", paramType = "query")
+    })
+    public Map<String,Object> getDataByZJId(Integer id ,Integer ZZid) {
+        Map<String,Object> map = new HashMap<String, Object>();
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("ZZid", ZZid);
+        paramMap.put("id", id);
+        List<StorageQualitycheck> list = storageQualitycheckService.getDataByZJId(paramMap);
+        map.put("qualitycheck", list);
+        return map;
+    }
+    
+    
+    
+    /**
+     * 根据仓房和货位获取第三方检查的数据
+     * 分页获取
+     */
+    @RequestMapping(value = "/getListByhouseId",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="根据仓房和货位获取第三方检查的数据", notes = "支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseIds", value = "仓房id(数组)", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseIds", value = "货位id(数组)", paramType = "query")
+    })
+    public PageInfo<StorageQualitycheck> getListByhouseId(Integer pageNum, Integer pageSize,
+            Integer[] houseIds, Integer[] warehouseIds , String checktype) {
+    	StorageQualitycheck qualityCheck = new StorageQualitycheck();
+    	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checktype)){
+            qualityCheck.setType(checktype);
+        }
+        
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
+        qualityCheck.setSealStatus("0");
+        
+        List<StorageQualitycheck> qualityCheckList =null;
+        for (int i = 0; i < houseIds.length; i++) {
+        	for (int j = 0; j < warehouseIds.length; j++) {
+            	if(i==j){
+            		Integer houseId = houseIds[i];
+            		Integer warehouseId = warehouseIds[j];
+            		 	//仓房id.
+            	        if (qualityCheck.getHouseId() == null) {
+            	            qualityCheck.setHouseId(houseId);
+
+            	        }
+            	        // 货位id.
+            	        if (qualityCheck.getWarehouseId() == null) {
+            	            qualityCheck.setWarehouseId(warehouseId);
+            	        }
+            	        if (pageNum!=null && pageSize!=null) {
+            	            PageHelper.startPage(pageNum, pageSize);
+            	        }
+            	        
+            	        qualityCheckList = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+            	}
+    		}
+		}
+        
+       
+       
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(qualityCheckList);
+        return pageInfo;
+    }
+
+    @RequestMapping(value = "/getNewList",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="查询质量管理列表", notes = "查询质量管理信息列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "historyStatus", value = "数据状态", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+    })
+    public PageInfo<StorageQualitycheck> newListPage(Integer pageNum, Integer pageSize, Integer houseId, Integer wareId,
+                                                  String checkType, String checkResult, Integer historyStatus, Integer orgId) {
+    	StorageQualitycheckExample example = new StorageQualitycheckExample();
+    	Criteria criteria = example.createCriteria();
+
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checkType)){
+        	criteria.andTypeEqualTo(checkType);
+        }
+        // 仓房id.
+        if (houseId != null) {
+        	criteria.andHouseIdEqualTo(houseId);
+        }
+        // 货位id.
+        if (wareId != null) {
+        	criteria.andWarehouseIdEqualTo(wareId);
+        }
+        // 粮库id.
+        if (orgId != null) {
+        	criteria.andOrgIdEqualTo(orgId);
+        }
+
+        //检验结果（0：合格 , 1 :不合格）
+        if (StringUtils.isNotBlank(checkResult)) {
+        	criteria.andCheckResultEqualTo(checkResult);
+        }
+        //数据状态
+        if (null != historyStatus) {
+        	//0:最新数据  1:历史数据
+        	criteria.andHistoryStatusEqualTo(historyStatus);
+        }
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageQualitycheck> list = storageQualitycheckService.findByCondition(example);
+
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
+        return pageInfo;
+    }
+
+    //质检信息主表同步
+    @RequestMapping("/qualityMainSynchronization")
+    public void qualityMainSynchronization() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        List list = DataSynchronization.queryQualityMain();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityMain(paramMap);
+        for(Map qualitycheckMap:qualitycheckList) {
+            int num = 0;
+            for(int i=0;i<list.size();i++) {
+                Map<String,Object> map = (Map<String,Object>)list.get(i);
+                String zjid = ObjectUtils.toString(map.get("zjid"),"");//库点编码
+                String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
+                if(zjid.equals(ObjectUtils.toString(qualitycheckMap.get("zjid"),""))) {
+                    if(!refreshTime.equals(format.format(qualitycheckMap.get("updatetime")))) {
+                        DataSynchronization.updateQualityMain(map, qualitycheckMap);
+                    }
+                    break;
+                }else if(num == (list.size()-1)){
+                    DataSynchronization.insertQualityMain(qualitycheckMap);
+                }else {
+                    num = num+1;
+                }
+            }
+        }
+    }
+
+    //质检信息明细同步
+    @RequestMapping("/qualityInfoSynchronization")
+    public void qualityInfoSynchronization() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        List list = DataSynchronization.queryQualityMain();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        List<Map<String,Object>> qualitycheckList = storageQualitycheckService.getAllQualityInfo(paramMap);
+        for(Map qualitycheckMap:qualitycheckList) {
+            int num = 0;
+            for(int i=0;i<list.size();i++) {
+                Map<String,Object> map = (Map<String,Object>)list.get(i);
+                String zjid = ObjectUtils.toString(map.get("zjid"),"");//库点编码
+                String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
+                if(zjid.equals(ObjectUtils.toString(qualitycheckMap.get("zjid"),""))) {
+                    if(!refreshTime.equals(format.format(qualitycheckMap.get("updatetime")))) {
+                        DataSynchronization.updateQuality(map, qualitycheckMap);
+                    }
+                    break;
+                }else if(num == (list.size()-1)){
+                    DataSynchronization.insertQuality(qualitycheckMap);
+                }else {
+                    num = num+1;
+                }
+            }
+        }
+    }
+
+    //粮食库存同步
+    @RequestMapping("/foodStocksSynchronization")
+    public void foodStocksSynchronization() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        List list = DataSynchronization.queryQualityMain();
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        List<Map<String,Object>> foodStocksList = storageQualitycheckService.getAllFoodStocks(paramMap);
+        for(Map foodStocksMap:foodStocksList) {
+            int num = 0;
+            for(int i=0;i<list.size();i++) {
+                Map<String,Object> map = (Map<String,Object>)list.get(i);
+                String fcid = ObjectUtils.toString(map.get("fcid"),"");//库点编码
+                String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
+                if(fcid.equals(ObjectUtils.toString(foodStocksMap.get("fcid"),""))) {
+                    if(!refreshTime.equals(format.format(foodStocksMap.get("updatetime")))) {
+                        DataSynchronization.updateFoodStocks(map, foodStocksMap);
+                    }
+                    break;
+                }else if(num == (list.size()-1)){
+                    DataSynchronization.insertFoodStocks(foodStocksMap);
+                }else {
+                    num = num+1;
+                }
+            }
+        }
+    }
+
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckSonController.java

@@ -0,0 +1,80 @@
+package com.chinaitop.depot.storage.controller;
+
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
+import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/12/23
+ */
+@RestController
+@RequestMapping(value = {"/qualitycheckSon"})
+@Api(value= "StorageQualitycheckSonController", description = "质量管理中检测信息控制类")
+public class StorageQualitycheckSonController {
+    @Resource
+    private StorageQualitycheckSonService qualitycheckSonService;
+
+    /**
+     * 接收主表的id关联着子表的ktId
+     * @param qcSonId
+     * @return
+     */
+    @RequestMapping(value = "/findQualitycheckSonBySonId",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据质量检查id查询出关联的子表信息(包含检测信息)", notes = "根据质量检查id查询出关联的子表信息(包含检测信息)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qcSonId", value = "qcSonId", paramType = "query"),
+    })
+    public List<StorageQualitycheckSon> findKtDetailsByKtId(Integer qcSonId){
+        StorageQualitycheckSonExample storageQualitycheckSonExample = new StorageQualitycheckSonExample();
+        StorageQualitycheckSonExample.Criteria criteria = storageQualitycheckSonExample.createCriteria();
+        if(qcSonId != null){
+            criteria.andQualitycheckIdEqualTo(qcSonId);
+        }
+        return  qualitycheckSonService.findQualitycheckSonExample(storageQualitycheckSonExample);
+    }
+
+    /**
+     * 删除一条检测信息
+     * @param sonId 数据ID
+     * @return
+     */
+    @RequestMapping(value = "/removeSon", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="根据子表id质量检查的子表信息", notes = "根据子表id质量检查的子表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sonId", value = "sonId", paramType = "form"),
+    })
+    public Map<String, Object> removeSon(Integer sonId) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        //删除管理的数据
+        StorageQualitycheckSonExample qualitycheckSonExample = new StorageQualitycheckSonExample();
+        StorageQualitycheckSonExample.Criteria criteria = qualitycheckSonExample.createCriteria();
+        if(sonId != null){
+            criteria.andIdEqualTo(sonId);
+        }
+        try {
+            qualitycheckSonService.removeSon(qualitycheckSonExample);
+            map.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "error");
+            map.put("msg", "删除失败！");
+        }
+        return map;
+    }
+
+}

src/main/java/com/chinaitop/depot/storage/controller/StorageStorehouseBusinessController.java

@@ -0,0 +1,78 @@
+package com.chinaitop.depot.storage.controller;
+
+import com.chinaitop.depot.storage.service.StorageStorehouseBusinessService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: sunhongbing
+ * @Date: 2018/5/6
+ */
+@RestController
+@RequestMapping(value = {"/storehouseBusiness"})
+@Api(value= "StorageStorehouseBusinessController", description = "仓房业务信息控制类")
+public class StorageStorehouseBusinessController {
+    @Resource
+    private StorageStorehouseBusinessService businessService;
+
+    /**
+     * 根据分仓保管账中的仓房名称
+     * @return
+     */
+    @RequestMapping(value = "/getStorehouseListFromBusiness", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="仓房业务信息表获取仓房", notes = "该仓房从分仓保管账获得")
+    public Map<String, Object> getStorehouseListFromBusiness() throws Exception {
+        Map<String, Object> map = null;
+        map = businessService.getStorehouseData();
+        return map;
+    }
+
+    /**
+     * 根据分仓保管账中的仓房ID获取货位号
+     * @return
+     */
+    @RequestMapping(value = "/getWarehouseListFromBusiness", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据仓房业务信息表的仓房ID获取货位号", notes = "该货位从分仓保管账获得")
+    public Map<String, Object> getWarehouseListFromBusiness(Integer ch) throws Exception {
+        Map<String, Object> map = null;
+        if (ch!=null) {
+            map = businessService.getWarehouseData(ch);
+        }
+        return map;
+    }
+
+    /**
+     * 从分仓保管账中查数据插入到仓房业务表
+     */
+    @RequestMapping(value = "/insertStorehouseBusinessFromFcbgz", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="从分仓保管账中查数据插入到仓房业务表", notes = "从分仓保管账中查数据插入到仓房业务表")
+    public void insertStorehouseBusinessFromFcbgz() {
+        //从分仓保管账取出仓房和货位以及品种加入到仓房业务信息表中
+
+        businessService.saveStorehouseBusinessFromFcbgz();
+
+    }
+
+    @RequestMapping(value = "/updateAerationTaskStatus", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="更新一个仓房的作业状态", notes = "更新一个仓房的作业状态")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "form"),
+		@ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "form"),
+		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "form"),
+		@ApiImplicitParam(name = "aerationStatus", value = "通风状态(ON开启/OFF关闭)", paramType = "form")
+	})
+    public void updateAerationTaskStatus(Integer houseId, Integer wareId, Integer orgId, String aerationStatus) {
+        businessService.updateAerationStatus(houseId, wareId, orgId, aerationStatus);
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.storage.mapper;
+
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.BusinessFileExample;
+
+@Repository
+public interface BusinessFileMapper {
+    int countByExample(BusinessFileExample example);
+
+    int deleteByExample(BusinessFileExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessFile record);
+
+    int insertSelective(BusinessFile record);
+
+    List<BusinessFile> selectByExample(BusinessFileExample example);
+
+    BusinessFile selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessFile record, @Param("example") BusinessFileExample example);
+
+    int updateByExample(@Param("record") BusinessFile record, @Param("example") BusinessFileExample example);
+
+    int updateByPrimaryKeySelective(BusinessFile record);
+
+    int updateByPrimaryKey(BusinessFile record);
+}

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

@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.BusinessFileMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.BusinessFile" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="bid" property="bid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="file_name" property="fileName" jdbcType="VARCHAR" />
+    <result column="original_file_name" property="originalFileName" jdbcType="VARCHAR" />
+    <result column="file_type" property="fileType" jdbcType="VARCHAR" />
+    <result column="source" property="source" jdbcType="VARCHAR" />
+    <result column="remarks" property="remarks" jdbcType="VARCHAR" />
+    <result column="file_path" property="filePath" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="creater" property="creater" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, bid, type, file_name, original_file_name, file_type, source, remarks, file_path, 
+    create_time, update_time, creater, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.BusinessFileExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_file
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_file
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.BusinessFileExample" >
+    delete from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.BusinessFile" >
+    insert into business_file (id, bid, type, 
+      file_name, original_file_name, file_type, 
+      source, remarks, file_path, 
+      create_time, update_time, creater, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{bid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{fileName,jdbcType=VARCHAR}, #{originalFileName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
+      #{source,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=INTEGER}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.BusinessFile" >
+    insert into business_file
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="bid != null" >
+        bid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="fileName != null" >
+        file_name,
+      </if>
+      <if test="originalFileName != null" >
+        original_file_name,
+      </if>
+      <if test="fileType != null" >
+        file_type,
+      </if>
+      <if test="source != null" >
+        source,
+      </if>
+      <if test="remarks != null" >
+        remarks,
+      </if>
+      <if test="filePath != null" >
+        file_path,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="bid != null" >
+        #{bid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="originalFileName != null" >
+        #{originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null" >
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.BusinessFileExample" resultType="java.lang.Integer" >
+    select count(*) from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_file
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.bid != null" >
+        bid = #{record.bid,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileName != null" >
+        file_name = #{record.fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originalFileName != null" >
+        original_file_name = #{record.originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileType != null" >
+        file_type = #{record.fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.source != null" >
+        source = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null" >
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.filePath != null" >
+        file_path = #{record.filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null" >
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_file
+    set id = #{record.id,jdbcType=INTEGER},
+      bid = #{record.bid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      file_name = #{record.fileName,jdbcType=VARCHAR},
+      original_file_name = #{record.originalFileName,jdbcType=VARCHAR},
+      file_type = #{record.fileType,jdbcType=VARCHAR},
+      source = #{record.source,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      file_path = #{record.filePath,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      creater = #{record.creater,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.BusinessFile" >
+    update business_file
+    <set >
+      <if test="bid != null" >
+        bid = #{bid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        file_name = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="originalFileName != null" >
+        original_file_name = #{originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        file_type = #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null" >
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        file_path = #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.BusinessFile" >
+    update business_file
+    set bid = #{bid,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      file_name = #{fileName,jdbcType=VARCHAR},
+      original_file_name = #{originalFileName,jdbcType=VARCHAR},
+      file_type = #{fileType,jdbcType=VARCHAR},
+      source = #{source,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      file_path = #{filePath,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      creater = #{creater,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageChangeStoragehouseTaskDetailMapper {
+    int countByExample(StorageChangeStoragehouseTaskDetailExample example);
+
+    int deleteByExample(StorageChangeStoragehouseTaskDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageChangeStoragehouseTaskDetail record);
+
+    int insertSelective(StorageChangeStoragehouseTaskDetail record);
+
+    List<StorageChangeStoragehouseTaskDetail> selectByExample(StorageChangeStoragehouseTaskDetailExample example);
+
+    StorageChangeStoragehouseTaskDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageChangeStoragehouseTaskDetail record, @Param("example") StorageChangeStoragehouseTaskDetailExample example);
+
+    int updateByExample(@Param("record") StorageChangeStoragehouseTaskDetail record, @Param("example") StorageChangeStoragehouseTaskDetailExample example);
+
+    int updateByPrimaryKeySelective(StorageChangeStoragehouseTaskDetail record);
+
+    int updateByPrimaryKey(StorageChangeStoragehouseTaskDetail record);
+    
+    int updateBybusinessNo(StorageChangeStoragehouseTaskDetail record);
+}

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

@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseTaskDetailMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="org_id" jdbcType="INTEGER" />
+    <result column="businessNo" property="businessNo" jdbcType="VARCHAR" />
+    <result column="houseId" property="houseId" jdbcType="INTEGER" />
+    <result column="wareId" property="wareId" jdbcType="INTEGER" />
+    <result column="storehouseId" property="storehouseId" jdbcType="INTEGER" />
+    <result column="warehouseId" property="warehouseId" jdbcType="INTEGER" />
+    <result column="rksj" property="rksj" jdbcType="TIMESTAMP" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="lsxz" property="lsxz" jdbcType="VARCHAR" />
+    <result column="keepingWay" property="keepingWay" jdbcType="INTEGER" />
+    <result column="ccfs" property="ccfs" jdbcType="INTEGER" />
+    <result column="applyStatus" property="applyStatus" jdbcType="INTEGER" />
+    <result column="pourInNum" property="pourInNum" jdbcType="DECIMAL" />
+    <result column="pourOutNum" property="pourOutNum" jdbcType="DECIMAL" />
+    <result column="qichuNum" property="qichuNum" jdbcType="DECIMAL" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, businessNo, houseId, wareId, storehouseId, warehouseId, rksj, lspz, lsxz, 
+    keepingWay, ccfs, applyStatus, pourInNum, pourOutNum, qichuNum, updateTime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_task_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_task_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_change_storagehouse_task_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample" >
+    delete from storage_change_storagehouse_task_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    insert into storage_change_storagehouse_task_detail (id, org_id, businessNo, 
+      houseId, wareId, storehouseId, 
+      warehouseId, rksj, lspz, 
+      lsxz, keepingWay, ccfs, 
+      applyStatus, pourInNum, pourOutNum, 
+      qichuNum, updateTime)
+    values (#{id,jdbcType=INTEGER}, #{org_id,jdbcType=INTEGER}, #{businessNo,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{wareId,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER}, 
+      #{warehouseId,jdbcType=INTEGER}, #{rksj,jdbcType=TIMESTAMP}, #{lspz,jdbcType=INTEGER}, 
+      #{lsxz,jdbcType=VARCHAR}, #{keepingWay,jdbcType=INTEGER}, #{ccfs,jdbcType=INTEGER}, 
+      #{applyStatus,jdbcType=INTEGER}, #{pourInNum,jdbcType=DECIMAL}, #{pourOutNum,jdbcType=DECIMAL}, 
+      #{qichuNum,jdbcType=DECIMAL}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    insert into storage_change_storagehouse_task_detail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="org_id != null" >
+        org_id,
+      </if>
+      <if test="businessNo != null" >
+        businessNo,
+      </if>
+      <if test="houseId != null" >
+        houseId,
+      </if>
+      <if test="wareId != null" >
+        wareId,
+      </if>
+      <if test="storehouseId != null" >
+        storehouseId,
+      </if>
+      <if test="warehouseId != null" >
+        warehouseId,
+      </if>
+      <if test="rksj != null" >
+        rksj,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="lsxz != null" >
+        lsxz,
+      </if>
+      <if test="keepingWay != null" >
+        keepingWay,
+      </if>
+      <if test="ccfs != null" >
+        ccfs,
+      </if>
+      <if test="applyStatus != null" >
+        applyStatus,
+      </if>
+      <if test="pourInNum != null" >
+        pourInNum,
+      </if>
+      <if test="pourOutNum != null" >
+        pourOutNum,
+      </if>
+      <if test="qichuNum != null" >
+        qichuNum,
+      </if>
+      <if test="updateTime != null" >
+        updateTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="org_id != null" >
+        #{org_id,jdbcType=INTEGER},
+      </if>
+      <if test="businessNo != null" >
+        #{businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="rksj != null" >
+        #{rksj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        #{lsxz,jdbcType=VARCHAR},
+      </if>
+      <if test="keepingWay != null" >
+        #{keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="ccfs != null" >
+        #{ccfs,jdbcType=INTEGER},
+      </if>
+      <if test="applyStatus != null" >
+        #{applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="pourInNum != null" >
+        #{pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourOutNum != null" >
+        #{pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="qichuNum != null" >
+        #{qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample" resultType="java.lang.Integer" >
+    select count(*) from storage_change_storagehouse_task_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_change_storagehouse_task_detail
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.org_id != null" >
+        org_id = #{record.org_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.businessNo != null" >
+        businessNo = #{record.businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        houseId = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null" >
+        wareId = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseId != null" >
+        storehouseId = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouseId = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.rksj != null" >
+        rksj = #{record.rksj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null" >
+        lsxz = #{record.lsxz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keepingWay != null" >
+        keepingWay = #{record.keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="record.ccfs != null" >
+        ccfs = #{record.ccfs,jdbcType=INTEGER},
+      </if>
+      <if test="record.applyStatus != null" >
+        applyStatus = #{record.applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.pourInNum != null" >
+        pourInNum = #{record.pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pourOutNum != null" >
+        pourOutNum = #{record.pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.qichuNum != null" >
+        qichuNum = #{record.qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_change_storagehouse_task_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.org_id,jdbcType=INTEGER},
+      businessNo = #{record.businessNo,jdbcType=VARCHAR},
+      houseId = #{record.houseId,jdbcType=INTEGER},
+      wareId = #{record.wareId,jdbcType=INTEGER},
+      storehouseId = #{record.storehouseId,jdbcType=INTEGER},
+      warehouseId = #{record.warehouseId,jdbcType=INTEGER},
+      rksj = #{record.rksj,jdbcType=TIMESTAMP},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=VARCHAR},
+      keepingWay = #{record.keepingWay,jdbcType=INTEGER},
+      ccfs = #{record.ccfs,jdbcType=INTEGER},
+      applyStatus = #{record.applyStatus,jdbcType=INTEGER},
+      pourInNum = #{record.pourInNum,jdbcType=DECIMAL},
+      pourOutNum = #{record.pourOutNum,jdbcType=DECIMAL},
+      qichuNum = #{record.qichuNum,jdbcType=DECIMAL},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    update storage_change_storagehouse_task_detail
+    <set >
+      <if test="org_id != null" >
+        org_id = #{org_id,jdbcType=INTEGER},
+      </if>
+      <if test="businessNo != null" >
+        businessNo = #{businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        houseId = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        wareId = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        storehouseId = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        warehouseId = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="rksj != null" >
+        rksj = #{rksj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        lsxz = #{lsxz,jdbcType=VARCHAR},
+      </if>
+      <if test="keepingWay != null" >
+        keepingWay = #{keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="ccfs != null" >
+        ccfs = #{ccfs,jdbcType=INTEGER},
+      </if>
+      <if test="applyStatus != null" >
+        applyStatus = #{applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="pourInNum != null" >
+        pourInNum = #{pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourOutNum != null" >
+        pourOutNum = #{pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="qichuNum != null" >
+        qichuNum = #{qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    update storage_change_storagehouse_task_detail
+    set org_id = #{org_id,jdbcType=INTEGER},
+      businessNo = #{businessNo,jdbcType=VARCHAR},
+      houseId = #{houseId,jdbcType=INTEGER},
+      wareId = #{wareId,jdbcType=INTEGER},
+      storehouseId = #{storehouseId,jdbcType=INTEGER},
+      warehouseId = #{warehouseId,jdbcType=INTEGER},
+      rksj = #{rksj,jdbcType=TIMESTAMP},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=VARCHAR},
+      keepingWay = #{keepingWay,jdbcType=INTEGER},
+      ccfs = #{ccfs,jdbcType=INTEGER},
+      applyStatus = #{applyStatus,jdbcType=INTEGER},
+      pourInNum = #{pourInNum,jdbcType=DECIMAL},
+      pourOutNum = #{pourOutNum,jdbcType=DECIMAL},
+      qichuNum = #{qichuNum,jdbcType=DECIMAL},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!-- 通过businessNO修改子表状态 -->
+  <update id="updateBybusinessNo" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail" >
+    update storage_change_storagehouse_task_detail
+    <set >
+      <if test="applyStatus != null" >
+        applyStatus = #{applyStatus,jdbcType=INTEGER},
+      </if>
+    </set>
+    where businessNo = #{businessNo,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageChangeStoragehouseTaskMapper {
+    int countByExample(StorageChangeStoragehouseTaskExample example);
+
+    int deleteByExample(StorageChangeStoragehouseTaskExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageChangeStoragehouseTask record);
+
+    int insertSelective(StorageChangeStoragehouseTask record);
+
+    List<StorageChangeStoragehouseTask> selectByExample(StorageChangeStoragehouseTaskExample example);
+
+    StorageChangeStoragehouseTask selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageChangeStoragehouseTask record, @Param("example") StorageChangeStoragehouseTaskExample example);
+
+    int updateByExample(@Param("record") StorageChangeStoragehouseTask record, @Param("example") StorageChangeStoragehouseTaskExample example);
+
+    int updateByPrimaryKeySelective(StorageChangeStoragehouseTask record);
+
+    int updateByPrimaryKey(StorageChangeStoragehouseTask record);
+}

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

@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseTaskMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="work_no" property="workNo" jdbcType="VARCHAR" />
+    <result column="business_no" property="businessNo" jdbcType="VARCHAR" />
+    <result column="plan_pour_out_sum" property="planPourOutSum" jdbcType="DECIMAL" />
+    <result column="plan_pour_in_sum" property="planPourInSum" jdbcType="DECIMAL" />
+    <result column="apply_unit_id" property="applyUnitId" jdbcType="INTEGER" />
+    <result column="apply_unit_name" property="applyUnitName" jdbcType="VARCHAR" />
+    <result column="storage_unnit_person" property="storageUnnitPerson" jdbcType="VARCHAR" />
+    <result column="apply_time" property="applyTime" jdbcType="TIMESTAMP" />
+    <result column="plan_start_date" property="planStartDate" jdbcType="TIMESTAMP" />
+    <result column="plan_end_date" property="planEndDate" jdbcType="TIMESTAMP" />
+    <result column="work_team" property="workTeam" jdbcType="VARCHAR" />
+    <result column="work_group" property="workGroup" jdbcType="VARCHAR" />
+    <result column="change_reason" property="changeReason" jdbcType="VARCHAR" />
+    <result column="plan_type" property="planType" jdbcType="VARCHAR" />
+    <result column="apply_status" property="applyStatus" jdbcType="INTEGER" />
+    <result column="apply_date" property="applyDate" jdbcType="TIMESTAMP" />
+    <result column="apply_ieda" property="applyIeda" jdbcType="VARCHAR" />
+    <result column="is_upload" property="isUpload" jdbcType="INTEGER" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, create_date, work_no, business_no, plan_pour_out_sum, plan_pour_in_sum, 
+    apply_unit_id, apply_unit_name, storage_unnit_person, apply_time, plan_start_date, 
+    plan_end_date, work_team, work_group, change_reason, plan_type, apply_status, apply_date, 
+    apply_ieda, is_upload, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_task
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_change_storagehouse_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample" >
+    delete from storage_change_storagehouse_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask" >
+    insert into storage_change_storagehouse_task (id, org_id, create_date, 
+      work_no, business_no, plan_pour_out_sum, 
+      plan_pour_in_sum, apply_unit_id, apply_unit_name, 
+      storage_unnit_person, apply_time, plan_start_date, 
+      plan_end_date, work_team, work_group, 
+      change_reason, plan_type, apply_status, 
+      apply_date, apply_ieda, is_upload, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{workNo,jdbcType=VARCHAR}, #{businessNo,jdbcType=VARCHAR}, #{planPourOutSum,jdbcType=DECIMAL}, 
+      #{planPourInSum,jdbcType=DECIMAL}, #{applyUnitId,jdbcType=INTEGER}, #{applyUnitName,jdbcType=VARCHAR}, 
+      #{storageUnnitPerson,jdbcType=VARCHAR}, #{applyTime,jdbcType=TIMESTAMP}, #{planStartDate,jdbcType=TIMESTAMP}, 
+      #{planEndDate,jdbcType=TIMESTAMP}, #{workTeam,jdbcType=VARCHAR}, #{workGroup,jdbcType=VARCHAR}, 
+      #{changeReason,jdbcType=VARCHAR}, #{planType,jdbcType=VARCHAR}, #{applyStatus,jdbcType=INTEGER}, 
+      #{applyDate,jdbcType=TIMESTAMP}, #{applyIeda,jdbcType=VARCHAR}, #{isUpload,jdbcType=INTEGER}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask" >
+    insert into storage_change_storagehouse_task
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="workNo != null" >
+        work_no,
+      </if>
+      <if test="businessNo != null" >
+        business_no,
+      </if>
+      <if test="planPourOutSum != null" >
+        plan_pour_out_sum,
+      </if>
+      <if test="planPourInSum != null" >
+        plan_pour_in_sum,
+      </if>
+      <if test="applyUnitId != null" >
+        apply_unit_id,
+      </if>
+      <if test="applyUnitName != null" >
+        apply_unit_name,
+      </if>
+      <if test="storageUnnitPerson != null" >
+        storage_unnit_person,
+      </if>
+      <if test="applyTime != null" >
+        apply_time,
+      </if>
+      <if test="planStartDate != null" >
+        plan_start_date,
+      </if>
+      <if test="planEndDate != null" >
+        plan_end_date,
+      </if>
+      <if test="workTeam != null" >
+        work_team,
+      </if>
+      <if test="workGroup != null" >
+        work_group,
+      </if>
+      <if test="changeReason != null" >
+        change_reason,
+      </if>
+      <if test="planType != null" >
+        plan_type,
+      </if>
+      <if test="applyStatus != null" >
+        apply_status,
+      </if>
+      <if test="applyDate != null" >
+        apply_date,
+      </if>
+      <if test="applyIeda != null" >
+        apply_ieda,
+      </if>
+      <if test="isUpload != null" >
+        is_upload,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workNo != null" >
+        #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="businessNo != null" >
+        #{businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="planPourOutSum != null" >
+        #{planPourOutSum,jdbcType=DECIMAL},
+      </if>
+      <if test="planPourInSum != null" >
+        #{planPourInSum,jdbcType=DECIMAL},
+      </if>
+      <if test="applyUnitId != null" >
+        #{applyUnitId,jdbcType=INTEGER},
+      </if>
+      <if test="applyUnitName != null" >
+        #{applyUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="storageUnnitPerson != null" >
+        #{storageUnnitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="applyTime != null" >
+        #{applyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planStartDate != null" >
+        #{planStartDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planEndDate != null" >
+        #{planEndDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workTeam != null" >
+        #{workTeam,jdbcType=VARCHAR},
+      </if>
+      <if test="workGroup != null" >
+        #{workGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="changeReason != null" >
+        #{changeReason,jdbcType=VARCHAR},
+      </if>
+      <if test="planType != null" >
+        #{planType,jdbcType=VARCHAR},
+      </if>
+      <if test="applyStatus != null" >
+        #{applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="applyDate != null" >
+        #{applyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="applyIeda != null" >
+        #{applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="isUpload != null" >
+        #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample" resultType="java.lang.Integer" >
+    select count(*) from storage_change_storagehouse_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_change_storagehouse_task
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createDate != null" >
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.workNo != null" >
+        work_no = #{record.workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessNo != null" >
+        business_no = #{record.businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planPourOutSum != null" >
+        plan_pour_out_sum = #{record.planPourOutSum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.planPourInSum != null" >
+        plan_pour_in_sum = #{record.planPourInSum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.applyUnitId != null" >
+        apply_unit_id = #{record.applyUnitId,jdbcType=INTEGER},
+      </if>
+      <if test="record.applyUnitName != null" >
+        apply_unit_name = #{record.applyUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storageUnnitPerson != null" >
+        storage_unnit_person = #{record.storageUnnitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.applyTime != null" >
+        apply_time = #{record.applyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.planStartDate != null" >
+        plan_start_date = #{record.planStartDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.planEndDate != null" >
+        plan_end_date = #{record.planEndDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.workTeam != null" >
+        work_team = #{record.workTeam,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workGroup != null" >
+        work_group = #{record.workGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="record.changeReason != null" >
+        change_reason = #{record.changeReason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planType != null" >
+        plan_type = #{record.planType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.applyStatus != null" >
+        apply_status = #{record.applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.applyDate != null" >
+        apply_date = #{record.applyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.applyIeda != null" >
+        apply_ieda = #{record.applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isUpload != null" >
+        is_upload = #{record.isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_change_storagehouse_task
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      work_no = #{record.workNo,jdbcType=VARCHAR},
+      business_no = #{record.businessNo,jdbcType=VARCHAR},
+      plan_pour_out_sum = #{record.planPourOutSum,jdbcType=DECIMAL},
+      plan_pour_in_sum = #{record.planPourInSum,jdbcType=DECIMAL},
+      apply_unit_id = #{record.applyUnitId,jdbcType=INTEGER},
+      apply_unit_name = #{record.applyUnitName,jdbcType=VARCHAR},
+      storage_unnit_person = #{record.storageUnnitPerson,jdbcType=VARCHAR},
+      apply_time = #{record.applyTime,jdbcType=TIMESTAMP},
+      plan_start_date = #{record.planStartDate,jdbcType=TIMESTAMP},
+      plan_end_date = #{record.planEndDate,jdbcType=TIMESTAMP},
+      work_team = #{record.workTeam,jdbcType=VARCHAR},
+      work_group = #{record.workGroup,jdbcType=VARCHAR},
+      change_reason = #{record.changeReason,jdbcType=VARCHAR},
+      plan_type = #{record.planType,jdbcType=VARCHAR},
+      apply_status = #{record.applyStatus,jdbcType=INTEGER},
+      apply_date = #{record.applyDate,jdbcType=TIMESTAMP},
+      apply_ieda = #{record.applyIeda,jdbcType=VARCHAR},
+      is_upload = #{record.isUpload,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask" >
+    update storage_change_storagehouse_task
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workNo != null" >
+        work_no = #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="businessNo != null" >
+        business_no = #{businessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="planPourOutSum != null" >
+        plan_pour_out_sum = #{planPourOutSum,jdbcType=DECIMAL},
+      </if>
+      <if test="planPourInSum != null" >
+        plan_pour_in_sum = #{planPourInSum,jdbcType=DECIMAL},
+      </if>
+      <if test="applyUnitId != null" >
+        apply_unit_id = #{applyUnitId,jdbcType=INTEGER},
+      </if>
+      <if test="applyUnitName != null" >
+        apply_unit_name = #{applyUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="storageUnnitPerson != null" >
+        storage_unnit_person = #{storageUnnitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="applyTime != null" >
+        apply_time = #{applyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planStartDate != null" >
+        plan_start_date = #{planStartDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planEndDate != null" >
+        plan_end_date = #{planEndDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workTeam != null" >
+        work_team = #{workTeam,jdbcType=VARCHAR},
+      </if>
+      <if test="workGroup != null" >
+        work_group = #{workGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="changeReason != null" >
+        change_reason = #{changeReason,jdbcType=VARCHAR},
+      </if>
+      <if test="planType != null" >
+        plan_type = #{planType,jdbcType=VARCHAR},
+      </if>
+      <if test="applyStatus != null" >
+        apply_status = #{applyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="applyDate != null" >
+        apply_date = #{applyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="applyIeda != null" >
+        apply_ieda = #{applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="isUpload != null" >
+        is_upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask" >
+    update storage_change_storagehouse_task
+    set org_id = #{orgId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      work_no = #{workNo,jdbcType=VARCHAR},
+      business_no = #{businessNo,jdbcType=VARCHAR},
+      plan_pour_out_sum = #{planPourOutSum,jdbcType=DECIMAL},
+      plan_pour_in_sum = #{planPourInSum,jdbcType=DECIMAL},
+      apply_unit_id = #{applyUnitId,jdbcType=INTEGER},
+      apply_unit_name = #{applyUnitName,jdbcType=VARCHAR},
+      storage_unnit_person = #{storageUnnitPerson,jdbcType=VARCHAR},
+      apply_time = #{applyTime,jdbcType=TIMESTAMP},
+      plan_start_date = #{planStartDate,jdbcType=TIMESTAMP},
+      plan_end_date = #{planEndDate,jdbcType=TIMESTAMP},
+      work_team = #{workTeam,jdbcType=VARCHAR},
+      work_group = #{workGroup,jdbcType=VARCHAR},
+      change_reason = #{changeReason,jdbcType=VARCHAR},
+      plan_type = #{planType,jdbcType=VARCHAR},
+      apply_status = #{applyStatus,jdbcType=INTEGER},
+      apply_date = #{applyDate,jdbcType=TIMESTAMP},
+      apply_ieda = #{applyIeda,jdbcType=VARCHAR},
+      is_upload = #{isUpload,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageChangeStoragehouseWorkTaskMapper {
+    int countByExample(StorageChangeStoragehouseWorkTaskExample example);
+
+    int deleteByExample(StorageChangeStoragehouseWorkTaskExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageChangeStoragehouseWorkTask record);
+
+    int insertSelective(StorageChangeStoragehouseWorkTask record);
+
+    List<StorageChangeStoragehouseWorkTask> selectByExample(StorageChangeStoragehouseWorkTaskExample example);
+
+    StorageChangeStoragehouseWorkTask selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageChangeStoragehouseWorkTask record, @Param("example") StorageChangeStoragehouseWorkTaskExample example);
+
+    int updateByExample(@Param("record") StorageChangeStoragehouseWorkTask record, @Param("example") StorageChangeStoragehouseWorkTaskExample example);
+
+    int updateByPrimaryKeySelective(StorageChangeStoragehouseWorkTask record);
+
+    int updateByPrimaryKey(StorageChangeStoragehouseWorkTask record);
+}

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

@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseWorkTaskMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="org_id" jdbcType="INTEGER" />
+    <result column="createDate" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="workNo" property="workNo" jdbcType="VARCHAR" />
+    <result column="houseId" property="houseId" jdbcType="INTEGER" />
+    <result column="wareId" property="wareId" jdbcType="INTEGER" />
+    <result column="storehouseId" property="storehouseId" jdbcType="INTEGER" />
+    <result column="warehouseId" property="warehouseId" jdbcType="INTEGER" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="qichuNum" property="qichuNum" jdbcType="DECIMAL" />
+    <result column="pourInNum" property="pourInNum" jdbcType="DECIMAL" />
+    <result column="pourOutNum" property="pourOutNum" jdbcType="DECIMAL" />
+    <result column="surplusNum" property="surplusNum" jdbcType="DECIMAL" />
+    <result column="changIndex" property="changIndex" jdbcType="INTEGER" />
+    <result column="beginNum" property="beginNum" jdbcType="DECIMAL" />
+    <result column="resultNum" property="resultNum" jdbcType="DECIMAL" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, createDate, workNo, houseId, wareId, storehouseId, warehouseId, lspz, 
+    qichuNum, pourInNum, pourOutNum, surplusNum, changIndex, beginNum, resultNum
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_work_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_change_storagehouse_work_task
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_change_storagehouse_work_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample" >
+    delete from storage_change_storagehouse_work_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask" >
+    insert into storage_change_storagehouse_work_task (id, org_id, createDate, 
+      workNo, houseId, wareId, 
+      storehouseId, warehouseId, lspz, 
+      qichuNum, pourInNum, pourOutNum, 
+      surplusNum, changIndex, beginNum, 
+      resultNum)
+    values (#{id,jdbcType=INTEGER}, #{org_id,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{workNo,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{wareId,jdbcType=INTEGER}, 
+      #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, 
+      #{qichuNum,jdbcType=DECIMAL}, #{pourInNum,jdbcType=DECIMAL}, #{pourOutNum,jdbcType=DECIMAL}, 
+      #{surplusNum,jdbcType=DECIMAL}, #{changIndex,jdbcType=INTEGER}, #{beginNum,jdbcType=DECIMAL}, 
+      #{resultNum,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask" >
+    insert into storage_change_storagehouse_work_task
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="org_id != null" >
+        org_id,
+      </if>
+      <if test="createDate != null" >
+        createDate,
+      </if>
+      <if test="workNo != null" >
+        workNo,
+      </if>
+      <if test="houseId != null" >
+        houseId,
+      </if>
+      <if test="wareId != null" >
+        wareId,
+      </if>
+      <if test="storehouseId != null" >
+        storehouseId,
+      </if>
+      <if test="warehouseId != null" >
+        warehouseId,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="qichuNum != null" >
+        qichuNum,
+      </if>
+      <if test="pourInNum != null" >
+        pourInNum,
+      </if>
+      <if test="pourOutNum != null" >
+        pourOutNum,
+      </if>
+      <if test="surplusNum != null" >
+        surplusNum,
+      </if>
+      <if test="changIndex != null" >
+        changIndex,
+      </if>
+      <if test="beginNum != null" >
+        beginNum,
+      </if>
+      <if test="resultNum != null" >
+        resultNum,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="org_id != null" >
+        #{org_id,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workNo != null" >
+        #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="qichuNum != null" >
+        #{qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourInNum != null" >
+        #{pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourOutNum != null" >
+        #{pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="surplusNum != null" >
+        #{surplusNum,jdbcType=DECIMAL},
+      </if>
+      <if test="changIndex != null" >
+        #{changIndex,jdbcType=INTEGER},
+      </if>
+      <if test="beginNum != null" >
+        #{beginNum,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNum != null" >
+        #{resultNum,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample" resultType="java.lang.Integer" >
+    select count(*) from storage_change_storagehouse_work_task
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_change_storagehouse_work_task
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.org_id != null" >
+        org_id = #{record.org_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.createDate != null" >
+        createDate = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.workNo != null" >
+        workNo = #{record.workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        houseId = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null" >
+        wareId = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseId != null" >
+        storehouseId = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouseId = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.qichuNum != null" >
+        qichuNum = #{record.qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pourInNum != null" >
+        pourInNum = #{record.pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pourOutNum != null" >
+        pourOutNum = #{record.pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.surplusNum != null" >
+        surplusNum = #{record.surplusNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.changIndex != null" >
+        changIndex = #{record.changIndex,jdbcType=INTEGER},
+      </if>
+      <if test="record.beginNum != null" >
+        beginNum = #{record.beginNum,jdbcType=DECIMAL},
+      </if>
+      <if test="record.resultNum != null" >
+        resultNum = #{record.resultNum,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_change_storagehouse_work_task
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.org_id,jdbcType=INTEGER},
+      createDate = #{record.createDate,jdbcType=TIMESTAMP},
+      workNo = #{record.workNo,jdbcType=VARCHAR},
+      houseId = #{record.houseId,jdbcType=INTEGER},
+      wareId = #{record.wareId,jdbcType=INTEGER},
+      storehouseId = #{record.storehouseId,jdbcType=INTEGER},
+      warehouseId = #{record.warehouseId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      qichuNum = #{record.qichuNum,jdbcType=DECIMAL},
+      pourInNum = #{record.pourInNum,jdbcType=DECIMAL},
+      pourOutNum = #{record.pourOutNum,jdbcType=DECIMAL},
+      surplusNum = #{record.surplusNum,jdbcType=DECIMAL},
+      changIndex = #{record.changIndex,jdbcType=INTEGER},
+      beginNum = #{record.beginNum,jdbcType=DECIMAL},
+      resultNum = #{record.resultNum,jdbcType=DECIMAL}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask" >
+    update storage_change_storagehouse_work_task
+    <set >
+      <if test="org_id != null" >
+        org_id = #{org_id,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        createDate = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workNo != null" >
+        workNo = #{workNo,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        houseId = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        wareId = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        storehouseId = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        warehouseId = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="qichuNum != null" >
+        qichuNum = #{qichuNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourInNum != null" >
+        pourInNum = #{pourInNum,jdbcType=DECIMAL},
+      </if>
+      <if test="pourOutNum != null" >
+        pourOutNum = #{pourOutNum,jdbcType=DECIMAL},
+      </if>
+      <if test="surplusNum != null" >
+        surplusNum = #{surplusNum,jdbcType=DECIMAL},
+      </if>
+      <if test="changIndex != null" >
+        changIndex = #{changIndex,jdbcType=INTEGER},
+      </if>
+      <if test="beginNum != null" >
+        beginNum = #{beginNum,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNum != null" >
+        resultNum = #{resultNum,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask" >
+    update storage_change_storagehouse_work_task
+    set org_id = #{org_id,jdbcType=INTEGER},
+      createDate = #{createDate,jdbcType=TIMESTAMP},
+      workNo = #{workNo,jdbcType=VARCHAR},
+      houseId = #{houseId,jdbcType=INTEGER},
+      wareId = #{wareId,jdbcType=INTEGER},
+      storehouseId = #{storehouseId,jdbcType=INTEGER},
+      warehouseId = #{warehouseId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      qichuNum = #{qichuNum,jdbcType=DECIMAL},
+      pourInNum = #{pourInNum,jdbcType=DECIMAL},
+      pourOutNum = #{pourOutNum,jdbcType=DECIMAL},
+      surplusNum = #{surplusNum,jdbcType=DECIMAL},
+      changIndex = #{changIndex,jdbcType=INTEGER},
+      beginNum = #{beginNum,jdbcType=DECIMAL},
+      resultNum = #{resultNum,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.storage.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.storage.model.StorageDump;
+import com.chinaitop.depot.storage.model.StorageDumpExample;
+
+public interface StorageDumpMapper {
+    int countByExample(StorageDumpExample example);
+
+    int deleteByExample(StorageDumpExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDump record);
+
+    int insertSelective(StorageDump record);
+
+    List<StorageDump> selectByExample(StorageDumpExample example);
+
+    StorageDump selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(StorageDumpExample example);
+
+    int updateByExample(StorageDumpExample example);
+
+    int updateByPrimaryKeySelective(StorageDump record);
+
+    int updateByPrimaryKey(StorageDump record);
+
+    /**
+     * 查询验收通过的数据
+     * 
+     * @param orgId 单位ID
+     * @return
+     */
+    List<Map<String, Object>> selectYswData(Integer orgId);
+}

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

@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageDumpMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageDump">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="ys_id" jdbcType="INTEGER" property="ysId" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="house_id" jdbcType="INTEGER" property="houseId" />
+    <result column="ware_id" jdbcType="INTEGER" property="wareId" />
+    <result column="lspz" jdbcType="INTEGER" property="lspz" />
+    <result column="y_lsxz" jdbcType="INTEGER" property="yLsxz" />
+    <result column="x_lsxz" jdbcType="INTEGER" property="xLsxz" />
+    <result column="lsdj" jdbcType="INTEGER" property="lsdj" />
+    <result column="clsl" jdbcType="DECIMAL" property="clsl" />
+    <result column="zjjg" jdbcType="VARCHAR" property="zjjg" />
+    <result column="ys_status" jdbcType="VARCHAR" property="ysStatus" />
+    <result column="business_create_time" jdbcType="TIMESTAMP" property="businessCreateTime" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_person" jdbcType="VARCHAR" property="createPerson" />
+    <result column="is_upload" jdbcType="INTEGER" property="isUpload" />
+    <result column="upload_time" jdbcType="TIMESTAMP" property="uploadTime" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, ys_id, org_id, house_id, ware_id, lspz, y_lsxz, x_lsxz, lsdj, clsl, zjjg, ys_status, 
+    business_create_time, create_time, create_person, is_upload, upload_time, updatetime
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageDumpExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_dump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_dump
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_dump
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageDumpExample">
+    delete from storage_dump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageDump">
+    insert into storage_dump (id, ys_id, org_id, 
+      house_id, ware_id, lspz, 
+      y_lsxz, x_lsxz, lsdj, 
+      clsl, zjjg, ys_status, 
+      business_create_time, create_time, create_person, 
+      is_upload, upload_time, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{ysId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, 
+      #{houseId,jdbcType=INTEGER}, #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, 
+      #{yLsxz,jdbcType=INTEGER}, #{xLsxz,jdbcType=INTEGER}, #{lsdj,jdbcType=INTEGER}, 
+      #{clsl,jdbcType=DECIMAL}, #{zjjg,jdbcType=VARCHAR}, #{ysStatus,jdbcType=VARCHAR}, 
+      #{businessCreateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{createPerson,jdbcType=VARCHAR}, 
+      #{isUpload,jdbcType=INTEGER}, #{uploadTime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageDump">
+    insert into storage_dump
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="ysId != null">
+        ys_id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="wareId != null">
+        ware_id,
+      </if>
+      <if test="lspz != null">
+        lspz,
+      </if>
+      <if test="yLsxz != null">
+        y_lsxz,
+      </if>
+      <if test="xLsxz != null">
+        x_lsxz,
+      </if>
+      <if test="lsdj != null">
+        lsdj,
+      </if>
+      <if test="clsl != null">
+        clsl,
+      </if>
+      <if test="zjjg != null">
+        zjjg,
+      </if>
+      <if test="ysStatus != null">
+        ys_status,
+      </if>
+      <if test="businessCreateTime != null">
+        business_create_time,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createPerson != null">
+        create_person,
+      </if>
+      <if test="isUpload != null">
+        is_upload,
+      </if>
+      <if test="uploadTime != null">
+        upload_time,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="ysId != null">
+        #{ysId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null">
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="yLsxz != null">
+        #{yLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="xLsxz != null">
+        #{xLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null">
+        #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="clsl != null">
+        #{clsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zjjg != null">
+        #{zjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="ysStatus != null">
+        #{ysStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="businessCreateTime != null">
+        #{businessCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null">
+        #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="isUpload != null">
+        #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="uploadTime != null">
+        #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageDumpExample" resultType="java.lang.Integer">
+    select count(*) from storage_dump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_dump
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.ysId != null">
+        ys_id = #{record.ysId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null">
+        ware_id = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null">
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.yLsxz != null">
+        y_lsxz = #{record.yLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.xLsxz != null">
+        x_lsxz = #{record.xLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsdj != null">
+        lsdj = #{record.lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="record.clsl != null">
+        clsl = #{record.clsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zjjg != null">
+        zjjg = #{record.zjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ysStatus != null">
+        ys_status = #{record.ysStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessCreateTime != null">
+        business_create_time = #{record.businessCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createPerson != null">
+        create_person = #{record.createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isUpload != null">
+        is_upload = #{record.isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="record.uploadTime != null">
+        upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_dump
+    set id = #{record.id,jdbcType=INTEGER},
+      ys_id = #{record.ysId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      ware_id = #{record.wareId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      y_lsxz = #{record.yLsxz,jdbcType=INTEGER},
+      x_lsxz = #{record.xLsxz,jdbcType=INTEGER},
+      lsdj = #{record.lsdj,jdbcType=INTEGER},
+      clsl = #{record.clsl,jdbcType=DECIMAL},
+      zjjg = #{record.zjjg,jdbcType=VARCHAR},
+      ys_status = #{record.ysStatus,jdbcType=VARCHAR},
+      business_create_time = #{record.businessCreateTime,jdbcType=TIMESTAMP},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_person = #{record.createPerson,jdbcType=VARCHAR},
+      is_upload = #{record.isUpload,jdbcType=INTEGER},
+      upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageDump">
+    update storage_dump
+    <set>
+      <if test="ysId != null">
+        ys_id = #{ysId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null">
+        ware_id = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="yLsxz != null">
+        y_lsxz = #{yLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="xLsxz != null">
+        x_lsxz = #{xLsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null">
+        lsdj = #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="clsl != null">
+        clsl = #{clsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zjjg != null">
+        zjjg = #{zjjg,jdbcType=VARCHAR},
+      </if>
+      <if test="ysStatus != null">
+        ys_status = #{ysStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="businessCreateTime != null">
+        business_create_time = #{businessCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null">
+        create_person = #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="isUpload != null">
+        is_upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="uploadTime != null">
+        upload_time = #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageDump">
+    update storage_dump
+    set ys_id = #{ysId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=INTEGER},
+      ware_id = #{wareId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      y_lsxz = #{yLsxz,jdbcType=INTEGER},
+      x_lsxz = #{xLsxz,jdbcType=INTEGER},
+      lsdj = #{lsdj,jdbcType=INTEGER},
+      clsl = #{clsl,jdbcType=DECIMAL},
+      zjjg = #{zjjg,jdbcType=VARCHAR},
+      ys_status = #{ysStatus,jdbcType=VARCHAR},
+      business_create_time = #{businessCreateTime,jdbcType=TIMESTAMP},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_person = #{createPerson,jdbcType=VARCHAR},
+      is_upload = #{isUpload,jdbcType=INTEGER},
+      upload_time = #{uploadTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!-- 查询验收过通过的数据 -->
+  <select id="selectYswData" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT 
+    e.qualitycheck_id ysId,
+	c.acceptance_number as ysdh,
+	b.house_id houseId,
+	b.house_name houseName,
+	b.warehouse_id wareId,
+	b.warehouse_name wareName,
+	b.grain_kind lspz,
+	b.grain_attribute yLsxz,
+	b.grain_grade lsdj,
+	a.total_quantity clsl,
+	CASE d.check_result WHEN 0 THEN '合格' WHEN 1 THEN '不合格' ELSE '' END zjjg,
+	'已验收' AS ysStatus 
+	FROM business_plan a 
+	LEFT JOIN business_store_ware_detail b ON b.zid=a.id 
+	LEFT JOIN business_plan_acceptance c ON c.plan_id=a.id 
+	LEFT JOIN business_plan_acceptance_detail e ON e.acceptance_id=c.id 
+	LEFT JOIN storage_qualitycheck d ON d.id=e.qualitycheck_id 
+	WHERE 1=1 AND a.customer_plan_state='100' AND a.execute_type='3156' AND a.org_id=#{orgId}
+  </select>
+
+</mapper>

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

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StorageFoodbasicInfoCheckMapper {
+    int countByExample(StorageFoodbasicInfoCheckExample example);
+
+    int deleteByExample(StorageFoodbasicInfoCheckExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageFoodbasicInfoCheck record);
+
+    int insertSelective(StorageFoodbasicInfoCheck record);
+
+    List<StorageFoodbasicInfoCheck> selectByExample(StorageFoodbasicInfoCheckExample example);
+
+    StorageFoodbasicInfoCheck selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageFoodbasicInfoCheck record, @Param("example") StorageFoodbasicInfoCheckExample example);
+
+    int updateByExample(@Param("record") StorageFoodbasicInfoCheck record, @Param("example") StorageFoodbasicInfoCheckExample example);
+
+    int updateByPrimaryKeySelective(StorageFoodbasicInfoCheck record);
+
+    int updateByPrimaryKey(StorageFoodbasicInfoCheck record);
+}

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

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoCheckMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="house_id" jdbcType="INTEGER" property="houseId" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="foodbasicinfo_id" jdbcType="INTEGER" property="foodbasicinfoId" />
+    <result column="qualitycheck_id" jdbcType="INTEGER" property="qualitycheckId" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, house_id, warehouse_id, foodbasicinfo_id, qualitycheck_id, org_id
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_foodbasicinfochecks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_foodbasicinfochecks
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_foodbasicinfochecks
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample">
+    delete from storage_foodbasicinfochecks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck">
+    insert into storage_foodbasicinfochecks (id, house_id, warehouse_id, 
+      foodbasicinfo_id, qualitycheck_id, org_id
+      )
+    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, 
+      #{foodbasicinfoId,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck">
+    insert into storage_foodbasicinfochecks
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="foodbasicinfoId != null">
+        foodbasicinfo_id,
+      </if>
+      <if test="qualitycheckId != null">
+        qualitycheck_id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="foodbasicinfoId != null">
+        #{foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="qualitycheckId != null">
+        #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample" resultType="java.lang.Integer">
+    select count(*) from storage_foodbasicinfochecks
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_foodbasicinfochecks
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.foodbasicinfoId != null">
+        foodbasicinfo_id = #{record.foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="record.qualitycheckId != null">
+        qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_foodbasicinfochecks
+    set id = #{record.id,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      foodbasicinfo_id = #{record.foodbasicinfoId,jdbcType=INTEGER},
+      qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck">
+    update storage_foodbasicinfochecks
+    <set>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="foodbasicinfoId != null">
+        foodbasicinfo_id = #{foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="qualitycheckId != null">
+        qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck">
+    update storage_foodbasicinfochecks
+    set house_id = #{houseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      foodbasicinfo_id = #{foodbasicinfoId,jdbcType=INTEGER},
+      qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StorageFoodbasicInfoLocationMapper {
+    int countByExample(StorageFoodbasicInfoLocationExample example);
+
+    int deleteByExample(StorageFoodbasicInfoLocationExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageFoodbasicInfoLocation record);
+
+    int insertSelective(StorageFoodbasicInfoLocation record);
+
+    List<StorageFoodbasicInfoLocation> selectByExample(StorageFoodbasicInfoLocationExample example);
+
+    StorageFoodbasicInfoLocation selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageFoodbasicInfoLocation record, @Param("example") StorageFoodbasicInfoLocationExample example);
+
+    int updateByExample(@Param("record") StorageFoodbasicInfoLocation record, @Param("example") StorageFoodbasicInfoLocationExample example);
+
+    int updateByPrimaryKeySelective(StorageFoodbasicInfoLocation record);
+
+    int updateByPrimaryKey(StorageFoodbasicInfoLocation record);
+
+    List<StorageFoodbasicInfoLocation> queryByExample(StorageFoodbasicInfoLocation location);
+
+
+}

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

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoLocationMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="foodbasicinfo_id" jdbcType="INTEGER" property="foodbasicinfoId" />
+    <result column="house_id" jdbcType="INTEGER" property="houseId" />
+    <result column="new_house_id" jdbcType="INTEGER" property="newHouseId" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="new_warehouse_id" jdbcType="INTEGER" property="newWarehouseId" />
+    <result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="new_warehouse_code" jdbcType="VARCHAR" property="newWarehouseCode" />
+    <result column="change_time" jdbcType="TIMESTAMP" property="changeTime" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, foodbasicinfo_id, house_id, new_house_id, warehouse_id, new_warehouse_id, warehouse_code, 
+    new_warehouse_code, change_time, remarks, org_id
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_foodbasicinfolocation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_foodbasicinfolocation
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_foodbasicinfolocation
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample">
+    delete from storage_foodbasicinfolocation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation">
+    insert into storage_foodbasicinfolocation (id, foodbasicinfo_id, house_id, 
+      new_house_id, warehouse_id, new_warehouse_id, 
+      warehouse_code, new_warehouse_code, change_time, 
+      remarks, org_id)
+    values (#{id,jdbcType=INTEGER}, #{foodbasicinfoId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
+      #{newHouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{newWarehouseId,jdbcType=INTEGER}, 
+      #{warehouseCode,jdbcType=VARCHAR}, #{newWarehouseCode,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, 
+      #{remarks,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation">
+    insert into storage_foodbasicinfolocation
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="foodbasicinfoId != null">
+        foodbasicinfo_id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="newHouseId != null">
+        new_house_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="newWarehouseId != null">
+        new_warehouse_id,
+      </if>
+      <if test="warehouseCode != null">
+        warehouse_code,
+      </if>
+      <if test="newWarehouseCode != null">
+        new_warehouse_code,
+      </if>
+      <if test="changeTime != null">
+        change_time,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="foodbasicinfoId != null">
+        #{foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="newHouseId != null">
+        #{newHouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="newWarehouseId != null">
+        #{newWarehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseCode != null">
+        #{warehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="newWarehouseCode != null">
+        #{newWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="changeTime != null">
+        #{changeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample" resultType="java.lang.Integer">
+    select count(*) from storage_foodbasicinfolocation
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_foodbasicinfolocation
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.foodbasicinfoId != null">
+        foodbasicinfo_id = #{record.foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.newHouseId != null">
+        new_house_id = #{record.newHouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.newWarehouseId != null">
+        new_warehouse_id = #{record.newWarehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseCode != null">
+        warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.newWarehouseCode != null">
+        new_warehouse_code = #{record.newWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.changeTime != null">
+        change_time = #{record.changeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_foodbasicinfolocation
+    set id = #{record.id,jdbcType=INTEGER},
+      foodbasicinfo_id = #{record.foodbasicinfoId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      new_house_id = #{record.newHouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      new_warehouse_id = #{record.newWarehouseId,jdbcType=INTEGER},
+      warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
+      new_warehouse_code = #{record.newWarehouseCode,jdbcType=VARCHAR},
+      change_time = #{record.changeTime,jdbcType=TIMESTAMP},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation">
+    update storage_foodbasicinfolocation
+    <set>
+      <if test="foodbasicinfoId != null">
+        foodbasicinfo_id = #{foodbasicinfoId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="newHouseId != null">
+        new_house_id = #{newHouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="newWarehouseId != null">
+        new_warehouse_id = #{newWarehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseCode != null">
+        warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="newWarehouseCode != null">
+        new_warehouse_code = #{newWarehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="changeTime != null">
+        change_time = #{changeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation">
+    update storage_foodbasicinfolocation
+    set foodbasicinfo_id = #{foodbasicinfoId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=INTEGER},
+      new_house_id = #{newHouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      new_warehouse_id = #{newWarehouseId,jdbcType=INTEGER},
+      warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
+      new_warehouse_code = #{newWarehouseCode,jdbcType=VARCHAR},
+      change_time = #{changeTime,jdbcType=TIMESTAMP},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <sql id="Ext_Base_Column_List">
+    sfn.id, sfn.foodbasicinfo_id, sfn.house_id, sfn.new_house_id, sfn.warehouse_id, sfn.new_warehouse_id, sfn.warehouse_code,
+    sfn.new_warehouse_code, sfn.change_time, sfn.remarks, sfn.org_id
+  </sql>
+
+  <select id="queryByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation" resultMap="BaseResultMap">
+    select
+    <include refid="Ext_Base_Column_List" />,
+      bw.warehouse_name warehouseName,
+    bww.warehouse_name newWarehouseName
+    FROM
+    storage_foodbasicinfolocation sfn
+    LEFT JOIN basic_warehouse bw ON sfn.warehouse_id = bw.warehouse_id
+    LEFT JOIN  basic_warehouse bww ON sfn.new_warehouse_id = bww.warehouse_id
+    <where>
+      <if test="houseId !=null">
+        and sfn.house_id = #{houseId}
+      </if>
+      <if test="warehouseId !=null">
+        and sfn.warehouse_id = #{warehouseId}
+      </if>
+      <if test="foodbasicinfoId !=null">
+        and sfn.foodbasicinfo_id = #{foodbasicinfoId}
+      </if>
+    </where>
+    group by sfn.id
+    order by sfn.change_time desc
+  </select>
+
+</mapper>

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

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StorageFoodbasicinfoMapper {
+    int countByExample(StorageFoodbasicinfoExample example);
+
+    int deleteByExample(StorageFoodbasicinfoExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageFoodbasicinfo record);
+
+    int insertSelective(StorageFoodbasicinfo record);
+
+    List<StorageFoodbasicinfo> selectByExample(StorageFoodbasicinfoExample example);
+
+    StorageFoodbasicinfo selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageFoodbasicinfo record, @Param("example") StorageFoodbasicinfoExample example);
+
+    int updateByExample(@Param("record") StorageFoodbasicinfo record, @Param("example") StorageFoodbasicinfoExample example);
+
+    int updateByPrimaryKeySelective(StorageFoodbasicinfo record);
+
+    int updateByPrimaryKey(StorageFoodbasicinfo record);
+
+    List<StorageFoodbasicinfo> getFoodbasicInfoByHouseIdAndWarehouseId(StorageFoodbasicinfo example);
+
+    List<StorageFoodbasicinfo> queryByExample(StorageFoodbasicinfo example);
+}

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

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageKcglJkqyqApplyDefaultMapper {
+    int countByExample(StorageKcglJkqyqApplyDefaultExample example);
+
+    int deleteByExample(StorageKcglJkqyqApplyDefaultExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageKcglJkqyqApplyDefault record);
+
+    int insertSelective(StorageKcglJkqyqApplyDefault record);
+
+    List<StorageKcglJkqyqApplyDefault> selectByExample(StorageKcglJkqyqApplyDefaultExample example);
+
+    StorageKcglJkqyqApplyDefault selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageKcglJkqyqApplyDefault record, @Param("example") StorageKcglJkqyqApplyDefaultExample example);
+
+    int updateByExample(@Param("record") StorageKcglJkqyqApplyDefault record, @Param("example") StorageKcglJkqyqApplyDefaultExample example);
+
+    int updateByPrimaryKeySelective(StorageKcglJkqyqApplyDefault record);
+
+    int updateByPrimaryKey(StorageKcglJkqyqApplyDefault record);
+
+	int updateByYqsqNo(StorageKcglJkqyqApplyDefault dataKcglJkq1);
+}

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

@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageKcglJkqyqApplyDefaultMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="modifydate" property="modifydate" jdbcType="TIMESTAMP" />
+    <result column="ch" property="ch" jdbcType="INTEGER" />
+    <result column="hwh" property="hwh" jdbcType="INTEGER" />
+    <result column="pz" property="pz" jdbcType="CHAR" />
+    <result column="is_Upload" property="isUpload" jdbcType="INTEGER" />
+    <result column="jhbh" property="jhbh" jdbcType="VARCHAR" />
+    <result column="jkq_end" property="jkqEnd" jdbcType="TIMESTAMP" />
+    <result column="sqyq_time" property="sqyqTime" jdbcType="TIMESTAMP" />
+    <result column="yqsq_no" property="yqsqNo" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, modifydate, ch, hwh, pz, is_Upload, jhbh, jkq_end, sqyq_time, yqsq_no, 
+    updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_kcgl_jkqyq_apply_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_kcgl_jkqyq_apply_default
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_kcgl_jkqyq_apply_default
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample" >
+    delete from storage_kcgl_jkqyq_apply_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    insert into storage_kcgl_jkqyq_apply_default (id, org_id, modifydate, 
+      ch, hwh, pz, is_Upload, 
+      jhbh, jkq_end, sqyq_time, 
+      yqsq_no, updatetime)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{modifydate,jdbcType=TIMESTAMP}, 
+      #{ch,jdbcType=INTEGER}, #{hwh,jdbcType=INTEGER}, #{pz,jdbcType=CHAR}, #{isUpload,jdbcType=INTEGER}, 
+      #{jhbh,jdbcType=VARCHAR}, #{jkqEnd,jdbcType=TIMESTAMP}, #{sqyqTime,jdbcType=TIMESTAMP}, 
+      #{yqsqNo,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    insert into storage_kcgl_jkqyq_apply_default
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="modifydate != null" >
+        modifydate,
+      </if>
+      <if test="ch != null" >
+        ch,
+      </if>
+      <if test="hwh != null" >
+        hwh,
+      </if>
+      <if test="pz != null" >
+        pz,
+      </if>
+      <if test="isUpload != null" >
+        is_Upload,
+      </if>
+      <if test="jhbh != null" >
+        jhbh,
+      </if>
+      <if test="jkqEnd != null" >
+        jkq_end,
+      </if>
+      <if test="sqyqTime != null" >
+        sqyq_time,
+      </if>
+      <if test="yqsqNo != null" >
+        yqsq_no,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="modifydate != null" >
+        #{modifydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ch != null" >
+        #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null" >
+        #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="pz != null" >
+        #{pz,jdbcType=CHAR},
+      </if>
+      <if test="isUpload != null" >
+        #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="jhbh != null" >
+        #{jhbh,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqEnd != null" >
+        #{jkqEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sqyqTime != null" >
+        #{sqyqTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="yqsqNo != null" >
+        #{yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample" resultType="java.lang.Integer" >
+    select count(*) from storage_kcgl_jkqyq_apply_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_kcgl_jkqyq_apply_default
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.modifydate != null" >
+        modifydate = #{record.modifydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ch != null" >
+        ch = #{record.ch,jdbcType=INTEGER},
+      </if>
+      <if test="record.hwh != null" >
+        hwh = #{record.hwh,jdbcType=INTEGER},
+      </if>
+      <if test="record.pz != null" >
+        pz = #{record.pz,jdbcType=CHAR},
+      </if>
+      <if test="record.isUpload != null" >
+        is_Upload = #{record.isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="record.jhbh != null" >
+        jhbh = #{record.jhbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jkqEnd != null" >
+        jkq_end = #{record.jkqEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sqyqTime != null" >
+        sqyq_time = #{record.sqyqTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.yqsqNo != null" >
+        yqsq_no = #{record.yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_kcgl_jkqyq_apply_default
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      modifydate = #{record.modifydate,jdbcType=TIMESTAMP},
+      ch = #{record.ch,jdbcType=INTEGER},
+      hwh = #{record.hwh,jdbcType=INTEGER},
+      pz = #{record.pz,jdbcType=CHAR},
+      is_Upload = #{record.isUpload,jdbcType=INTEGER},
+      jhbh = #{record.jhbh,jdbcType=VARCHAR},
+      jkq_end = #{record.jkqEnd,jdbcType=TIMESTAMP},
+      sqyq_time = #{record.sqyqTime,jdbcType=TIMESTAMP},
+      yqsq_no = #{record.yqsqNo,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    update storage_kcgl_jkqyq_apply_default
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="modifydate != null" >
+        modifydate = #{modifydate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ch != null" >
+        ch = #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null" >
+        hwh = #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="pz != null" >
+        pz = #{pz,jdbcType=CHAR},
+      </if>
+      <if test="isUpload != null" >
+        is_Upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="jhbh != null" >
+        jhbh = #{jhbh,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqEnd != null" >
+        jkq_end = #{jkqEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sqyqTime != null" >
+        sqyq_time = #{sqyqTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="yqsqNo != null" >
+        yqsq_no = #{yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    update storage_kcgl_jkqyq_apply_default
+    set org_id = #{orgId,jdbcType=INTEGER},
+      modifydate = #{modifydate,jdbcType=TIMESTAMP},
+      ch = #{ch,jdbcType=INTEGER},
+      hwh = #{hwh,jdbcType=INTEGER},
+      pz = #{pz,jdbcType=CHAR},
+      is_Upload = #{isUpload,jdbcType=INTEGER},
+      jhbh = #{jhbh,jdbcType=VARCHAR},
+      jkq_end = #{jkqEnd,jdbcType=TIMESTAMP},
+      sqyq_time = #{sqyqTime,jdbcType=TIMESTAMP},
+      yqsq_no = #{yqsqNo,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!-- 根据架空期延期单号修改子表数据 -->
+   <update id="updateByYqsqNo" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault" >
+    update storage_kcgl_jkqyq_apply_default
+    <set >
+      <if test="isUpload != null" >
+        is_Upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+    </set>
+    where yqsq_no = #{yqsqNo,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,38 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageKcglJkqyqDefaultMapper {
+    int countByExample(StorageKcglJkqyqDefaultExample example);
+
+    int deleteByExample(StorageKcglJkqyqDefaultExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageKcglJkqyqDefault record);
+
+    int insertSelective(StorageKcglJkqyqDefault record);
+
+    List<StorageKcglJkqyqDefault> selectByExample(StorageKcglJkqyqDefaultExample example);
+
+    StorageKcglJkqyqDefault selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageKcglJkqyqDefault record, @Param("example") StorageKcglJkqyqDefaultExample example);
+
+    int updateByExample(@Param("record") StorageKcglJkqyqDefault record, @Param("example") StorageKcglJkqyqDefaultExample example);
+
+    int updateByPrimaryKeySelective(StorageKcglJkqyqDefault record);
+
+    int updateByPrimaryKey(StorageKcglJkqyqDefault record);
+
+	int updateByYqsqNo(StorageKcglJkqyqDefault dataKcglJkqyqDefault);
+
+	List<Map<String, Object>> getjkqPlanList(Map<String, Object> map);
+
+	List<Map<String, Object>> getjkqDataDayList(Map<String, Object> countMap);
+}

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

@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageKcglJkqyqDefaultMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="yqsq_no" property="yqsqNo" jdbcType="VARCHAR" />
+    <result column="yqsqdwname" property="yqsqdwname" jdbcType="VARCHAR" />
+    <result column="cqyfzr" property="cqyfzr" jdbcType="VARCHAR" />
+    <result column="sqrq" property="sqrq" jdbcType="TIMESTAMP" />
+    <result column="is_Upload" property="isUpload" jdbcType="INTEGER" />
+    <result column="apply_ieda" property="applyIeda" jdbcType="VARCHAR" />
+    <result column="sqyq_reason" property="sqyqReason" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, create_date, yqsq_no, yqsqdwname, cqyfzr, sqrq, is_Upload, apply_ieda, 
+    sqyq_reason, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_kcgl_jkqyq_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_kcgl_jkqyq_default
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_kcgl_jkqyq_default
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample" >
+    delete from storage_kcgl_jkqyq_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    insert into storage_kcgl_jkqyq_default (id, org_id, create_date, 
+      yqsq_no, yqsqdwname, cqyfzr, 
+      sqrq, is_Upload, apply_ieda, 
+      sqyq_reason, updatetime)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{yqsqNo,jdbcType=VARCHAR}, #{yqsqdwname,jdbcType=VARCHAR}, #{cqyfzr,jdbcType=VARCHAR}, 
+      #{sqrq,jdbcType=TIMESTAMP}, #{isUpload,jdbcType=INTEGER}, #{applyIeda,jdbcType=VARCHAR}, 
+      #{sqyqReason,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    insert into storage_kcgl_jkqyq_default
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="yqsqNo != null" >
+        yqsq_no,
+      </if>
+      <if test="yqsqdwname != null" >
+        yqsqdwname,
+      </if>
+      <if test="cqyfzr != null" >
+        cqyfzr,
+      </if>
+      <if test="sqrq != null" >
+        sqrq,
+      </if>
+      <if test="isUpload != null" >
+        is_Upload,
+      </if>
+      <if test="applyIeda != null" >
+        apply_ieda,
+      </if>
+      <if test="sqyqReason != null" >
+        sqyq_reason,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="yqsqNo != null" >
+        #{yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="yqsqdwname != null" >
+        #{yqsqdwname,jdbcType=VARCHAR},
+      </if>
+      <if test="cqyfzr != null" >
+        #{cqyfzr,jdbcType=VARCHAR},
+      </if>
+      <if test="sqrq != null" >
+        #{sqrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isUpload != null" >
+        #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="applyIeda != null" >
+        #{applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="sqyqReason != null" >
+        #{sqyqReason,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample" resultType="java.lang.Integer" >
+    select count(*) from storage_kcgl_jkqyq_default
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_kcgl_jkqyq_default
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createDate != null" >
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.yqsqNo != null" >
+        yqsq_no = #{record.yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yqsqdwname != null" >
+        yqsqdwname = #{record.yqsqdwname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cqyfzr != null" >
+        cqyfzr = #{record.cqyfzr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sqrq != null" >
+        sqrq = #{record.sqrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isUpload != null" >
+        is_Upload = #{record.isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="record.applyIeda != null" >
+        apply_ieda = #{record.applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sqyqReason != null" >
+        sqyq_reason = #{record.sqyqReason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_kcgl_jkqyq_default
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      yqsq_no = #{record.yqsqNo,jdbcType=VARCHAR},
+      yqsqdwname = #{record.yqsqdwname,jdbcType=VARCHAR},
+      cqyfzr = #{record.cqyfzr,jdbcType=VARCHAR},
+      sqrq = #{record.sqrq,jdbcType=TIMESTAMP},
+      is_Upload = #{record.isUpload,jdbcType=INTEGER},
+      apply_ieda = #{record.applyIeda,jdbcType=VARCHAR},
+      sqyq_reason = #{record.sqyqReason,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    update storage_kcgl_jkqyq_default
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="yqsqNo != null" >
+        yqsq_no = #{yqsqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="yqsqdwname != null" >
+        yqsqdwname = #{yqsqdwname,jdbcType=VARCHAR},
+      </if>
+      <if test="cqyfzr != null" >
+        cqyfzr = #{cqyfzr,jdbcType=VARCHAR},
+      </if>
+      <if test="sqrq != null" >
+        sqrq = #{sqrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isUpload != null" >
+        is_Upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="applyIeda != null" >
+        apply_ieda = #{applyIeda,jdbcType=VARCHAR},
+      </if>
+      <if test="sqyqReason != null" >
+        sqyq_reason = #{sqyqReason,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    update storage_kcgl_jkqyq_default
+    set org_id = #{orgId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      yqsq_no = #{yqsqNo,jdbcType=VARCHAR},
+      yqsqdwname = #{yqsqdwname,jdbcType=VARCHAR},
+      cqyfzr = #{cqyfzr,jdbcType=VARCHAR},
+      sqrq = #{sqrq,jdbcType=TIMESTAMP},
+      is_Upload = #{isUpload,jdbcType=INTEGER},
+      apply_ieda = #{applyIeda,jdbcType=VARCHAR},
+      sqyq_reason = #{sqyqReason,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+    <update id="updateByYqsqNo" parameterType="com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault" >
+    update storage_kcgl_jkqyq_default
+    <set >
+      <if test="isUpload != null" >
+        is_Upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+    </set>
+    where yqsq_no = #{yqsqNo,jdbcType=VARCHAR}
+  </update>
+  <!-- 架空期查询 -->
+   <select id="getjkqPlanList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+	SELECT
+	a.hwxz,
+	a.wjh,
+	a.ch,
+	a.hwh
+	FROM
+		lsreport_ts.data_kcgl_fcbgz_default a
+	LEFT JOIN lsreport_ts.data_kcgl_xckc_default b ON a.DataID = b.DataID
+	LEFT JOIN depot.business_delivery_storage_notice c ON b.tzdh = c.bill_number
+	LEFT JOIN depot.business_plan d ON  c.plan_number = d.plan_number
+	<where>
+	<if test="orgId != null">
+	AND d.org_id = #{orgId}
+	</if>
+	<if test="executeType != null">
+	AND d.execute_type = #{executeType}
+	</if>
+	<if test="billType != null">
+	AND c.bill_type = #{billType}
+	</if>
+	</where>
+  </select>
+  <select id="getjkqDataDayList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+	SELECT
+		distinct
+		overhead.overhead_period,
+		overhead.warning_day,
+		fcbgz.cjsj AS modifydate,
+		fcbgz.ch,
+		fcbgz.hwh,
+		fcbgz.mxpz AS pz,
+		fcbgz.hwxz,
+		fcbgz.zcsl,
+		sum(fcbgz.srsl) AS srsl,
+		notice.bill_number,
+		notice.plan_number AS jhbh,
+		jkqyq.sqyq_time,
+		jkqyq.is_Upload,
+		DATE_FORMAT(DATE_ADD(fcbgz.cjsj,INTERVAL 1 DAY),'%Y-%m-%d') AS jkqEnd
+		FROM depot.storage_overhead_set overhead 
+		LEFT JOIN lsreport_ts.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
+		LEFT JOIN lsreport_ts.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
+		LEFT JOIN depot.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
+		LEFT JOIN depot.business_plan plan ON notice.plan_number = plan.plan_number
+		LEFT JOIN depot.storage_kcgl_jkqyq_apply_default jkqyq ON fcbgz.ch = jkqyq.ch
+		AND fcbgz.hwh = jkqyq.hwh
+	<where>
+	<if test="orgId != null">
+	AND plan.org_id = #{orgId}
+	</if>
+	<if test="hwxz != null">
+	AND overhead.lsxz = #{hwxz}
+	</if>
+	<if test="ch != null">
+	AND fcbgz.ch = #{ch}
+	</if>
+	<if test="hwh != null">
+	AND fcbgz.hwh = #{hwh}
+	</if>
+	<if test="wjh != null">
+	AND notice.plan_number = #{wjh}
+	</if>
+	<if test="executeType != null">
+	AND plan.execute_type = #{executeType}
+	</if>
+	</where>
+	ORDER BY
+	overhead.create_date desc
+  </select>
+</mapper>

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

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageOverheadSet;
+import com.chinaitop.depot.storage.model.StorageOverheadSetExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageOverheadSetMapper {
+    int countByExample(StorageOverheadSetExample example);
+
+    int deleteByExample(StorageOverheadSetExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageOverheadSet record);
+
+    int insertSelective(StorageOverheadSet record);
+
+    List<StorageOverheadSet> selectByExample(StorageOverheadSetExample example);
+
+    StorageOverheadSet selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageOverheadSet record, @Param("example") StorageOverheadSetExample example);
+
+    int updateByExample(@Param("record") StorageOverheadSet record, @Param("example") StorageOverheadSetExample example);
+
+    int updateByPrimaryKeySelective(StorageOverheadSet record);
+
+    int updateByPrimaryKey(StorageOverheadSet record);
+    //查询架空期延期申请
+    List<Map<String, Object>> getOverYqDaysList(Map<String, Object> map);
+    //查询架空期延期时间
+	List<Map<String, Object>> getOverHeadTimeList(Map<String, Object> map);
+}

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

@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageOverheadSetMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageOverheadSet" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="lsxz" property="lsxz" jdbcType="INTEGER" />
+    <result column="overhead_period" property="overheadPeriod" jdbcType="INTEGER" />
+    <result column="warning_day" property="warningDay" jdbcType="INTEGER" />
+    <result column="createName" property="createname" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="is_upload" property="isUpload" jdbcType="INTEGER" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, lsxz, overhead_period, warning_day, createName, create_date, is_upload, 
+    updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSetExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_overhead_set
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_overhead_set
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_overhead_set
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSetExample" >
+    delete from storage_overhead_set
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSet" >
+    insert into storage_overhead_set (id, org_id, lsxz, 
+      overhead_period, warning_day, createName, 
+      create_date, is_upload, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{lsxz,jdbcType=INTEGER}, 
+      #{overheadPeriod,jdbcType=INTEGER}, #{warningDay,jdbcType=INTEGER}, #{createname,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{isUpload,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSet" >
+    insert into storage_overhead_set
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="lsxz != null" >
+        lsxz,
+      </if>
+      <if test="overheadPeriod != null" >
+        overhead_period,
+      </if>
+      <if test="warningDay != null" >
+        warning_day,
+      </if>
+      <if test="createname != null" >
+        createName,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="isUpload != null" >
+        is_upload,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="overheadPeriod != null" >
+        #{overheadPeriod,jdbcType=INTEGER},
+      </if>
+      <if test="warningDay != null" >
+        #{warningDay,jdbcType=INTEGER},
+      </if>
+      <if test="createname != null" >
+        #{createname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isUpload != null" >
+        #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSetExample" resultType="java.lang.Integer" >
+    select count(*) from storage_overhead_set
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_overhead_set
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null" >
+        lsxz = #{record.lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.overheadPeriod != null" >
+        overhead_period = #{record.overheadPeriod,jdbcType=INTEGER},
+      </if>
+      <if test="record.warningDay != null" >
+        warning_day = #{record.warningDay,jdbcType=INTEGER},
+      </if>
+      <if test="record.createname != null" >
+        createName = #{record.createname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isUpload != null" >
+        is_upload = #{record.isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_overhead_set
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      overhead_period = #{record.overheadPeriod,jdbcType=INTEGER},
+      warning_day = #{record.warningDay,jdbcType=INTEGER},
+      createName = #{record.createname,jdbcType=VARCHAR},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      is_upload = #{record.isUpload,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSet" >
+    update storage_overhead_set
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        lsxz = #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="overheadPeriod != null" >
+        overhead_period = #{overheadPeriod,jdbcType=INTEGER},
+      </if>
+      <if test="warningDay != null" >
+        warning_day = #{warningDay,jdbcType=INTEGER},
+      </if>
+      <if test="createname != null" >
+        createName = #{createname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isUpload != null" >
+        is_upload = #{isUpload,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageOverheadSet" >
+    update storage_overhead_set
+    set org_id = #{orgId,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      overhead_period = #{overheadPeriod,jdbcType=INTEGER},
+      warning_day = #{warningDay,jdbcType=INTEGER},
+      createName = #{createname,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      is_upload = #{isUpload,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!-- 查询延期申请 -->
+  <select id="getOverYqDaysList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+	SELECT
+	distinct
+	overhead.overhead_period,
+	overhead.warning_day,
+	jkqyq.sqyq_time,
+	jkqyq.is_Upload
+	FROM depot.storage_overhead_set overhead 
+	LEFT JOIN lsreport_ts.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
+	LEFT JOIN lsreport_ts.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
+	LEFT JOIN depot.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
+	LEFT JOIN depot.business_plan plan ON notice.plan_number = plan.plan_number
+	LEFT JOIN depot.storage_kcgl_jkqyq_apply_default jkqyq ON fcbgz.ch = jkqyq.ch AND fcbgz.hwh = jkqyq.hwh
+	<where>
+	<if test="orgId != null">
+	AND plan.org_id = #{orgId}
+	</if>
+	<if test="ch != null">
+	AND fcbgz.ch = #{ch}
+	</if>
+	<if test="hwh != null">
+	AND fcbgz.hwh = #{hwh}
+	</if>
+	<if test="executeType != null">
+	AND plan.execute_type = #{executeType}
+	</if>
+	<if test="lsxz != null" >
+	AND overhead.lsxz = #{lsxz}
+	</if>
+	</where>
+	ORDER BY
+	jkqyq.updatetime DESC
+  </select>
+  <select id="getOverHeadTimeList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+  SELECT
+  distinct
+  overhead_period,
+  warning_day
+  FROM storage_overhead_set
+  <where>
+	<if test="orgId != null">
+	AND org_id = #{orgId}
+	</if>
+	<if test="lsxz != null" >
+	AND lsxz = #{lsxz}
+	</if>
+	</where>
+	ORDER BY
+	create_date asc
+  </select>
+</mapper>

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

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageQualityEvent;
+import com.chinaitop.depot.storage.model.StorageQualityEventExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageQualityEventMapper {
+    int countByExample(StorageQualityEventExample example);
+
+    int deleteByExample(StorageQualityEventExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageQualityEvent record);
+
+    int insertSelective(StorageQualityEvent record);
+
+    List<StorageQualityEvent> selectByExample(StorageQualityEventExample example);
+
+    StorageQualityEvent selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageQualityEvent record, @Param("example") StorageQualityEventExample example);
+
+    int updateByExample(@Param("record") StorageQualityEvent record, @Param("example") StorageQualityEventExample example);
+
+    int updateByPrimaryKeySelective(StorageQualityEvent record);
+
+    int updateByPrimaryKey(StorageQualityEvent record);
+}

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

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageQualityEventMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageQualityEvent" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="input_date" property="inputDate" jdbcType="TIMESTAMP" />
+    <result column="input_person_id" property="inputPersonId" jdbcType="INTEGER" />
+    <result column="input_person_name" property="inputPersonName" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="ware_id" property="wareId" jdbcType="INTEGER" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="bgy" property="bgy" jdbcType="VARCHAR" />
+    <result column="czwt" property="czwt" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, input_date, input_person_id, input_person_name, house_id, ware_id, lspz, 
+    bgy, czwt
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualityEventExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_quality_event
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_quality_event
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_quality_event
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualityEventExample" >
+    delete from storage_quality_event
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualityEvent" >
+    insert into storage_quality_event (id, org_id, input_date, 
+      input_person_id, input_person_name, house_id, 
+      ware_id, lspz, bgy, 
+      czwt)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{inputDate,jdbcType=TIMESTAMP}, 
+      #{inputPersonId,jdbcType=INTEGER}, #{inputPersonName,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
+      #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{bgy,jdbcType=VARCHAR}, 
+      #{czwt,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualityEvent" >
+    insert into storage_quality_event
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="inputDate != null" >
+        input_date,
+      </if>
+      <if test="inputPersonId != null" >
+        input_person_id,
+      </if>
+      <if test="inputPersonName != null" >
+        input_person_name,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="wareId != null" >
+        ware_id,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="bgy != null" >
+        bgy,
+      </if>
+      <if test="czwt != null" >
+        czwt,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null" >
+        #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputPersonId != null" >
+        #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputPersonName != null" >
+        #{inputPersonName,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="bgy != null" >
+        #{bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="czwt != null" >
+        #{czwt,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualityEventExample" resultType="java.lang.Integer" >
+    select count(*) from storage_quality_event
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_quality_event
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputDate != null" >
+        input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.inputPersonId != null" >
+        input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputPersonName != null" >
+        input_person_name = #{record.inputPersonName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null" >
+        ware_id = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.bgy != null" >
+        bgy = #{record.bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.czwt != null" >
+        czwt = #{record.czwt,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_quality_event
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      input_person_name = #{record.inputPersonName,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      ware_id = #{record.wareId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      bgy = #{record.bgy,jdbcType=VARCHAR},
+      czwt = #{record.czwt,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageQualityEvent" >
+    update storage_quality_event
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null" >
+        input_date = #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputPersonId != null" >
+        input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputPersonName != null" >
+        input_person_name = #{inputPersonName,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        ware_id = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="bgy != null" >
+        bgy = #{bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="czwt != null" >
+        czwt = #{czwt,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageQualityEvent" >
+    update storage_quality_event
+    set org_id = #{orgId,jdbcType=INTEGER},
+      input_date = #{inputDate,jdbcType=TIMESTAMP},
+      input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      input_person_name = #{inputPersonName,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      ware_id = #{wareId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      bgy = #{bgy,jdbcType=VARCHAR},
+      czwt = #{czwt,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,67 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageQualitycheck;
+import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface StorageQualitycheckMapper {
+    int countByExample(StorageQualitycheckExample example);
+
+    int deleteByExample(StorageQualitycheckExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageQualitycheck record);
+
+    int insertSelective(StorageQualitycheck record);
+
+    List<StorageQualitycheck> selectByExample(StorageQualitycheckExample example);
+
+    StorageQualitycheck selectByPrimaryKey(Integer id);
+
+
+    int updateByExampleSelective(@Param("record") StorageQualitycheck record, @Param("example") StorageQualitycheckExample example);
+
+    int updateByExample(@Param("record") StorageQualitycheck record, @Param("example") StorageQualitycheckExample example);
+
+    int updateByPrimaryKeySelective(StorageQualitycheck record);
+
+    int updateByPrimaryKey(StorageQualitycheck record);
+
+    /**
+     * @param qualitycheck
+     * @return
+     */
+    List<StorageQualitycheck> getHouseIdList(StorageQualitycheck qualitycheck);
+
+    /**
+     * @param qualitycheck
+     * @return
+     */
+    List<StorageQualitycheck> getWareHouseIdList(
+            StorageQualitycheck qualitycheck);
+    List<StorageQualitycheck> getThirdCheckList(StorageQualitycheck qualitycheck);
+    List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(StorageQualitycheck qualitycheck);
+    StorageQualitycheck queryPrimaryKey(Integer id);
+    List<StorageQualitycheck> queryByExample(StorageQualitycheck example);
+    List<Map<String,Object>> getStoreQualityList(Integer orgId);
+
+    
+    List<Map<String,Object>> getTrdStoreQualityList();
+	List<StorageQualitycheck> getDataByZJId(Map<String, Object> paramMap);
+
+    List<StorageQualitycheck> queryByExampleData(StorageQualitycheck example);
+
+    List<StorageQualitycheck> queryByQualitycheckusiness(StorageQualitycheck qualityCheckExample);
+
+    List<Map<String,Object>> getAllQualityMain(Map<String, Object> paramMap);
+
+    List<Map<String, Object>> getAllQualityInfo(Map<String, Object> paramMap);
+
+    List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
+}

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

@@ -0,0 +1,37 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface StorageQualitycheckSonMapper {
+    int countByExample(StorageQualitycheckSonExample example);
+
+    int deleteByExample(StorageQualitycheckSonExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageQualitycheckSon record);
+
+    int insertSelective(StorageQualitycheckSon record);
+
+    List<StorageQualitycheckSon> selectByExample(StorageQualitycheckSonExample example);
+
+    StorageQualitycheckSon selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageQualitycheckSon record, @Param("example") StorageQualitycheckSonExample example);
+
+    int updateByExample(@Param("record") StorageQualitycheckSon record, @Param("example") StorageQualitycheckSonExample example);
+
+    int updateByPrimaryKeySelective(StorageQualitycheckSon record);
+
+    int updateByPrimaryKey(StorageQualitycheckSon record);
+
+    List<StorageQualitycheckSon> getQualitycheckSonByFoodbasicinfoCheck(Integer id);
+
+    List<StorageQualitycheckSon> selectByQualitycheckId(Integer id);
+}

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

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageQualitycheckSonMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageQualitycheckSon" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="qualitycheck_id" property="qualitycheckId" jdbcType="INTEGER" />
+    <result column="numbering" property="numbering" jdbcType="INTEGER" />
+    <result column="set_value" property="setValue" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, qualitycheck_id, numbering, set_value
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSonExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_qualitycheck_son
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_qualitycheck_son
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_qualitycheck_son
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSonExample" >
+    delete from storage_qualitycheck_son
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSon" >
+    insert into storage_qualitycheck_son (id, qualitycheck_id, numbering, 
+      set_value)
+    values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{numbering,jdbcType=INTEGER}, 
+      #{setValue,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSon" >
+    insert into storage_qualitycheck_son
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="qualitycheckId != null" >
+        qualitycheck_id,
+      </if>
+      <if test="numbering != null" >
+        numbering,
+      </if>
+      <if test="setValue != null" >
+        set_value,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="qualitycheckId != null" >
+        #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="numbering != null" >
+        #{numbering,jdbcType=INTEGER},
+      </if>
+      <if test="setValue != null" >
+        #{setValue,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSonExample" resultType="java.lang.Integer" >
+    select count(*) from storage_qualitycheck_son
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_qualitycheck_son
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.qualitycheckId != null" >
+        qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="record.numbering != null" >
+        numbering = #{record.numbering,jdbcType=INTEGER},
+      </if>
+      <if test="record.setValue != null" >
+        set_value = #{record.setValue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_qualitycheck_son
+    set id = #{record.id,jdbcType=INTEGER},
+      qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      numbering = #{record.numbering,jdbcType=INTEGER},
+      set_value = #{record.setValue,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSon" >
+    update storage_qualitycheck_son
+    <set >
+      <if test="qualitycheckId != null" >
+        qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="numbering != null" >
+        numbering = #{numbering,jdbcType=INTEGER},
+      </if>
+      <if test="setValue != null" >
+        set_value = #{setValue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckSon" >
+    update storage_qualitycheck_son
+    set qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      numbering = #{numbering,jdbcType=INTEGER},
+      set_value = #{setValue,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getQualitycheckSonByFoodbasicinfoCheck" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM storage_qualitycheck_son sqk
+    WHERE sqk.qualitycheck_id in (
+      SELECT qualitycheck_id
+      FROM storage_foodbasicinfochecks fcs
+      WHERE fcs.foodbasicinfo_id =#{id}
+    )
+  </select>
+
+  <select id="selectByQualitycheckId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from storage_qualitycheck_son
+    where qualitycheck_id = #{id,jdbcType=INTEGER}
+  </select>
+
+</mapper>

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

@@ -0,0 +1,42 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusinessExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface StorageStorehouseBusinessMapper {
+    int countByExample(StorageStorehouseBusinessExample example);
+
+    int deleteByExample(StorageStorehouseBusinessExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageStorehouseBusiness record);
+
+    int insertSelective(StorageStorehouseBusiness record);
+
+    List<StorageStorehouseBusiness> selectByExample(StorageStorehouseBusinessExample example);
+
+    StorageStorehouseBusiness selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageStorehouseBusiness record, @Param("example") StorageStorehouseBusinessExample example);
+
+    int updateByExample(@Param("record") StorageStorehouseBusiness record, @Param("example") StorageStorehouseBusinessExample example);
+
+    int updateByPrimaryKeySelective(StorageStorehouseBusiness record);
+
+    int updateByPrimaryKey(StorageStorehouseBusiness record);
+
+
+    List<StorageStorehouseBusiness> selectStorehouseData();
+    List<StorageStorehouseBusiness> selectWarehouseData(Integer ch);
+
+    void truncateStorehouseBusiness();
+    void saveStorehouseBusinessFromFcbgz(Map<String, Object> map);
+
+    void updateTaskStatusForCf(Map<String, Object> map);
+
+}

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

@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.storage.mapper.StorageStorehouseBusinessMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="pz" jdbcType="VARCHAR" property="pz" />
+    <result column="full_storehouse_status" jdbcType="VARCHAR" property="fullStorehouseStatus" />
+    <result column="aeration_status" jdbcType="VARCHAR" property="aerationStatus" />
+    <result column="fumigation_status" jdbcType="VARCHAR" property="fumigationStatus" />
+    <result column="rk_status" jdbcType="VARCHAR" property="rkStatus" />
+    <result column="ck_status" jdbcType="VARCHAR" property="ckStatus" />
+    <result column="nhl_status" jdbcType="VARCHAR" property="nhlStatus" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, org_id, storehouse_id, warehouse_id, pz, full_storehouse_status, aeration_status, 
+    fumigation_status, rk_status, ck_status, nhl_status, remark
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusinessExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_storehouse_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_storehouse_business
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_storehouse_business
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusinessExample">
+    delete from storage_storehouse_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    insert into storage_storehouse_business (id, org_id, storehouse_id, 
+      warehouse_id, pz, full_storehouse_status, 
+      aeration_status, fumigation_status, rk_status, 
+      ck_status, nhl_status, remark
+      )
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER}, 
+      #{warehouseId,jdbcType=INTEGER}, #{pz,jdbcType=VARCHAR}, #{fullStorehouseStatus,jdbcType=VARCHAR}, 
+      #{aerationStatus,jdbcType=VARCHAR}, #{fumigationStatus,jdbcType=VARCHAR}, #{rkStatus,jdbcType=VARCHAR}, 
+      #{ckStatus,jdbcType=VARCHAR}, #{nhlStatus,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    insert into storage_storehouse_business
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="pz != null">
+        pz,
+      </if>
+      <if test="fullStorehouseStatus != null">
+        full_storehouse_status,
+      </if>
+      <if test="aerationStatus != null">
+        aeration_status,
+      </if>
+      <if test="fumigationStatus != null">
+        fumigation_status,
+      </if>
+      <if test="rkStatus != null">
+        rk_status,
+      </if>
+      <if test="ckStatus != null">
+        ck_status,
+      </if>
+      <if test="nhlStatus != null">
+        nhl_status,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null">
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="pz != null">
+        #{pz,jdbcType=VARCHAR},
+      </if>
+      <if test="fullStorehouseStatus != null">
+        #{fullStorehouseStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="aerationStatus != null">
+        #{aerationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="fumigationStatus != null">
+        #{fumigationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="rkStatus != null">
+        #{rkStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="ckStatus != null">
+        #{ckStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="nhlStatus != null">
+        #{nhlStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusinessExample" resultType="java.lang.Integer">
+    select count(*) from storage_storehouse_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_storehouse_business
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseId != null">
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.pz != null">
+        pz = #{record.pz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fullStorehouseStatus != null">
+        full_storehouse_status = #{record.fullStorehouseStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aerationStatus != null">
+        aeration_status = #{record.aerationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fumigationStatus != null">
+        fumigation_status = #{record.fumigationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rkStatus != null">
+        rk_status = #{record.rkStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ckStatus != null">
+        ck_status = #{record.ckStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.nhlStatus != null">
+        nhl_status = #{record.nhlStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_storehouse_business
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      pz = #{record.pz,jdbcType=VARCHAR},
+      full_storehouse_status = #{record.fullStorehouseStatus,jdbcType=VARCHAR},
+      aeration_status = #{record.aerationStatus,jdbcType=VARCHAR},
+      fumigation_status = #{record.fumigationStatus,jdbcType=VARCHAR},
+      rk_status = #{record.rkStatus,jdbcType=VARCHAR},
+      ck_status = #{record.ckStatus,jdbcType=VARCHAR},
+      nhl_status = #{record.nhlStatus,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    update storage_storehouse_business
+    <set>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="pz != null">
+        pz = #{pz,jdbcType=VARCHAR},
+      </if>
+      <if test="fullStorehouseStatus != null">
+        full_storehouse_status = #{fullStorehouseStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="aerationStatus != null">
+        aeration_status = #{aerationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="fumigationStatus != null">
+        fumigation_status = #{fumigationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="rkStatus != null">
+        rk_status = #{rkStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="ckStatus != null">
+        ck_status = #{ckStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="nhlStatus != null">
+        nhl_status = #{nhlStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    update storage_storehouse_business
+    set org_id = #{orgId,jdbcType=INTEGER},
+      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      pz = #{pz,jdbcType=VARCHAR},
+      full_storehouse_status = #{fullStorehouseStatus,jdbcType=VARCHAR},
+      aeration_status = #{aerationStatus,jdbcType=VARCHAR},
+      fumigation_status = #{fumigationStatus,jdbcType=VARCHAR},
+      rk_status = #{rkStatus,jdbcType=VARCHAR},
+      ck_status = #{ckStatus,jdbcType=VARCHAR},
+      nhl_status = #{nhlStatus,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <!--用于质量管理中下来出仓房名称-->
+  <resultMap id="storeBusinessMap" type="com.chinaitop.depot.storage.model.StorageStorehouseBusiness" >
+      <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+      <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+      <result column="storehouse_name" property="storehouseName" jdbcType="VARCHAR" />
+      <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="selectStorehouseData" resultMap="storeBusinessMap">
+      SELECT DISTINCT
+      business.storehouse_id,
+      store.storehouse_name
+      FROM
+      storage_storehouse_business business
+      INNER JOIN depot.basic_storehouse store ON business.storehouse_id = store.storehouse_id
+      WHERE
+      business.storehouse_id IS NOT NULL and business.full_storehouse_status='1'
+      ORDER BY store.storehouse_id
+  </select>
+
+  <select id="selectWarehouseData" resultMap="storeBusinessMap" parameterType="java.lang.Integer">
+        SELECT DISTINCT
+        business.warehouse_id,
+        ware.warehouse_name
+        FROM
+        storage_storehouse_business business
+        INNER JOIN depot.basic_warehouse ware ON business.warehouse_id = ware.warehouse_id
+        WHERE
+        business.storehouse_id=#{storehouse_id} and business.warehouse_id IS NOT NULL and business.full_storehouse_status='1'
+        ORDER BY
+        ware.warehouse_id DESC
+  </select>
+
+  <delete id="truncateStorehouseBusiness">
+       truncate table storage_storehouse_business
+  </delete>
+
+  <select id="saveStorehouseBusinessFromFcbgz" parameterType="java.util.Map">
+      INSERT INTO storage_storehouse_business(
+		  org_id,
+          storehouse_id,
+          warehouse_id,
+          pz,
+          full_storehouse_status,
+          aeration_status,
+          fumigation_status,
+          rk_status,
+          ck_status,
+          nhl_status,
+          remark
+          )
+          SELECT DISTINCT
+			  bs.org_id,
+              fcbgz.ch,
+              fcbgz.hwh,
+              fcbgz.pz,
+              1,
+              'OFF',
+              'OFF',
+              'OFF',
+              'OFF',
+              'OFF',
+              null
+          FROM lsreport_ts.data_kcgl_fcbgz_default fcbgz
+          INNER JOIN   basic_storehouse bs ON fcbgz.ch = bs.storehouse_id
+    <if test="byId == 1">
+      WHERE 1=1 AND NOT EXISTS(
+        SELECT 1 FROM storage_storehouse_business ssb WHERE ssb.storehouse_id = fcbgz.ch AND ssb.warehouse_id = fcbgz.hwh
+      )
+      AND bs.storehouse_id = #{cfId}
+    </if>
+  </select>
+
+  <select id="updateTaskStatusForCf" parameterType="java.util.Map">
+      ${SQL}
+  </select>
+</mapper>

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

@@ -0,0 +1,239 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class BusinessFile {
+    private Integer id;
+
+    private Integer bid;
+
+    private String type;
+
+    private String fileName;
+
+    private String originalFileName;
+
+    private String fileType;
+
+    private String source;
+
+    private String remarks;
+
+    private String filePath;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer creater;
+
+    private Integer orgId;
+
+    /**
+     * 主键id
+     * @return id 主键id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键id
+     * @param id 主键id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 数据id
+     * @return bid 数据id
+     */
+    public Integer getBid() {
+        return bid;
+    }
+
+    /**
+     * 数据id
+     * @param bid 数据id
+     */
+    public void setBid(Integer bid) {
+        this.bid = bid;
+    }
+
+    /**
+     * 业务类型
+     * @return type 业务类型
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 业务类型
+     * @param type 业务类型
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 文件名称
+     * @return file_name 文件名称
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * 文件名称
+     * @param fileName 文件名称
+     */
+    public void setFileName(String fileName) {
+        this.fileName = fileName == null ? null : fileName.trim();
+    }
+
+    /**
+     * 文件原始名称
+     * @return original_file_name 文件原始名称
+     */
+    public String getOriginalFileName() {
+        return originalFileName;
+    }
+
+    /**
+     * 文件原始名称
+     * @param originalFileName 文件原始名称
+     */
+    public void setOriginalFileName(String originalFileName) {
+        this.originalFileName = originalFileName == null ? null : originalFileName.trim();
+    }
+
+    /**
+     * 文件类型
+     * @return file_type 文件类型
+     */
+    public String getFileType() {
+        return fileType;
+    }
+
+    /**
+     * 文件类型
+     * @param fileType 文件类型
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType == null ? null : fileType.trim();
+    }
+
+    /**
+     * 来源
+     * @return source 来源
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * 来源
+     * @param source 来源
+     */
+    public void setSource(String source) {
+        this.source = source == null ? null : source.trim();
+    }
+
+    /**
+     * 备注
+     * @return remarks 备注
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * 备注
+     * @param remarks 备注
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    /**
+     * 文件上传路径
+     * @return file_path 文件上传路径
+     */
+    public String getFilePath() {
+        return filePath;
+    }
+
+    /**
+     * 文件上传路径
+     * @param filePath 文件上传路径
+     */
+    public void setFilePath(String filePath) {
+        this.filePath = filePath == null ? null : filePath.trim();
+    }
+
+    /**
+     * 
+     * @return create_time 
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 
+     * @param createTime 
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 
+     * @return update_time 
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 
+     * @param updateTime 
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 
+     * @return creater 
+     */
+    public Integer getCreater() {
+        return creater;
+    }
+
+    /**
+     * 
+     * @param creater 
+     */
+    public void setCreater(Integer creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * 
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}

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

@@ -0,0 +1,404 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageChangeStoragehouseTask {
+    private Integer id;
+
+    private Integer orgId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+
+    private String workNo;
+
+    private String businessNo;
+
+    private BigDecimal planPourOutSum;
+
+    private BigDecimal planPourInSum;
+
+    private Integer applyUnitId;
+
+    private String applyUnitName;
+
+    private String storageUnnitPerson;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planStartDate;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planEndDate;
+
+    private String workTeam;
+
+    private String workGroup;
+
+    private String changeReason;
+
+    private String planType;
+
+    private Integer applyStatus;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyDate;
+
+    private String applyIeda;
+
+    private Integer isUpload;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 创建时间
+     * @return create_date 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 作业单号
+     * @return work_no 作业单号
+     */
+    public String getWorkNo() {
+        return workNo;
+    }
+
+    /**
+     * 作业单号
+     * @param workNo 作业单号
+     */
+    public void setWorkNo(String workNo) {
+        this.workNo = workNo == null ? null : workNo.trim();
+    }
+
+    /**
+     * 倒仓业务单号
+     * @return business_no 倒仓业务单号
+     */
+    public String getBusinessNo() {
+        return businessNo;
+    }
+
+    /**
+     * 倒仓业务单号
+     * @param businessNo 倒仓业务单号
+     */
+    public void setBusinessNo(String businessNo) {
+        this.businessNo = businessNo == null ? null : businessNo.trim();
+    }
+
+    /**
+     * 计划倒出总数量
+     * @return plan_pour_out_sum 计划倒出总数量
+     */
+    public BigDecimal getPlanPourOutSum() {
+        return planPourOutSum;
+    }
+
+    /**
+     * 计划倒出总数量
+     * @param planPourOutSum 计划倒出总数量
+     */
+    public void setPlanPourOutSum(BigDecimal planPourOutSum) {
+        this.planPourOutSum = planPourOutSum;
+    }
+
+    /**
+     * 计划倒入总数量
+     * @return plan_pour_in_sum 计划倒入总数量
+     */
+    public BigDecimal getPlanPourInSum() {
+        return planPourInSum;
+    }
+
+    /**
+     * 计划倒入总数量
+     * @param planPourInSum 计划倒入总数量
+     */
+    public void setPlanPourInSum(BigDecimal planPourInSum) {
+        this.planPourInSum = planPourInSum;
+    }
+
+    /**
+     * 申请单位ID
+     * @return apply_unit_id 申请单位ID
+     */
+    public Integer getApplyUnitId() {
+        return applyUnitId;
+    }
+
+    /**
+     * 申请单位ID
+     * @param applyUnitId 申请单位ID
+     */
+    public void setApplyUnitId(Integer applyUnitId) {
+        this.applyUnitId = applyUnitId;
+    }
+
+    /**
+     * 申请单位名称
+     * @return apply_unit_name 申请单位名称
+     */
+    public String getApplyUnitName() {
+        return applyUnitName;
+    }
+
+    /**
+     * 申请单位名称
+     * @param applyUnitName 申请单位名称
+     */
+    public void setApplyUnitName(String applyUnitName) {
+        this.applyUnitName = applyUnitName == null ? null : applyUnitName.trim();
+    }
+
+    /**
+     * 承储企业负责人
+     * @return storage_unnit_person 承储企业负责人
+     */
+    public String getStorageUnnitPerson() {
+        return storageUnnitPerson;
+    }
+
+    /**
+     * 承储企业负责人
+     * @param storageUnnitPerson 承储企业负责人
+     */
+    public void setStorageUnnitPerson(String storageUnnitPerson) {
+        this.storageUnnitPerson = storageUnnitPerson == null ? null : storageUnnitPerson.trim();
+    }
+
+    /**
+     * 申请日期
+     * @return apply_time 申请日期
+     */
+    public Date getApplyTime() {
+        return applyTime;
+    }
+
+    /**
+     * 申请日期
+     * @param applyTime 申请日期
+     */
+    public void setApplyTime(Date applyTime) {
+        this.applyTime = applyTime;
+    }
+
+    /**
+     * 计划开始日期
+     * @return plan_start_date 计划开始日期
+     */
+    public Date getPlanStartDate() {
+        return planStartDate;
+    }
+
+    /**
+     * 计划开始日期
+     * @param planStartDate 计划开始日期
+     */
+    public void setPlanStartDate(Date planStartDate) {
+        this.planStartDate = planStartDate;
+    }
+
+    /**
+     * 计划结束日期
+     * @return plan_end_date 计划结束日期
+     */
+    public Date getPlanEndDate() {
+        return planEndDate;
+    }
+
+    /**
+     * 计划结束日期
+     * @param planEndDate 计划结束日期
+     */
+    public void setPlanEndDate(Date planEndDate) {
+        this.planEndDate = planEndDate;
+    }
+
+    /**
+     * 作业队
+     * @return work_team 作业队
+     */
+    public String getWorkTeam() {
+        return workTeam;
+    }
+
+    /**
+     * 作业队
+     * @param workTeam 作业队
+     */
+    public void setWorkTeam(String workTeam) {
+        this.workTeam = workTeam == null ? null : workTeam.trim();
+    }
+
+    /**
+     * 作业组
+     * @return work_group 作业组
+     */
+    public String getWorkGroup() {
+        return workGroup;
+    }
+
+    /**
+     * 作业组
+     * @param workGroup 作业组
+     */
+    public void setWorkGroup(String workGroup) {
+        this.workGroup = workGroup == null ? null : workGroup.trim();
+    }
+
+    /**
+     * 倒仓原因
+     * @return change_reason 倒仓原因
+     */
+    public String getChangeReason() {
+        return changeReason;
+    }
+
+    /**
+     * 倒仓原因
+     * @param changeReason 倒仓原因
+     */
+    public void setChangeReason(String changeReason) {
+        this.changeReason = changeReason == null ? null : changeReason.trim();
+    }
+
+    /**
+     * 计划类型
+     * @return plan_type 计划类型
+     */
+    public String getPlanType() {
+        return planType;
+    }
+
+    /**
+     * 计划类型
+     * @param planType 计划类型
+     */
+    public void setPlanType(String planType) {
+        this.planType = planType == null ? null : planType.trim();
+    }
+
+    /**
+     * 审核状态
+     * @return apply_status 审核状态
+     */
+    public Integer getApplyStatus() {
+        return applyStatus;
+    }
+
+    /**
+     * 审核状态
+     * @param applyStatus 审核状态
+     */
+    public void setApplyStatus(Integer applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    /**
+     * 审核时间
+     * @return apply_date 审核时间
+     */
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    /**
+     * 审核时间
+     * @param applyDate 审核时间
+     */
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+
+    /**
+     * 审批意见
+     * @return apply_ieda 审批意见
+     */
+    public String getApplyIeda() {
+        return applyIeda;
+    }
+
+    /**
+     * 审批意见
+     * @param applyIeda 审批意见
+     */
+    public void setApplyIeda(String applyIeda) {
+        this.applyIeda = applyIeda == null ? null : applyIeda.trim();
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批结束,3审批驳回)
+     * @return is_upload 是否上传(0待上传,1审批中,2审批结束,3审批驳回)
+     */
+    public Integer getIsUpload() {
+        return isUpload;
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批结束,3审批驳回)
+     * @param isUpload 是否上传(0待上传,1审批中,2审批结束,3审批驳回)
+     */
+    public void setIsUpload(Integer isUpload) {
+        this.isUpload = isUpload;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,314 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageChangeStoragehouseTaskDetail {
+    private Integer id;
+
+    private Integer org_id;
+
+    private String businessNo;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date rksj;
+
+    private Integer lspz;
+
+    private String lsxz;
+
+    private Integer keepingWay;
+
+    private Integer ccfs;
+
+    private Integer applyStatus;
+
+    private BigDecimal pourInNum;
+
+    private BigDecimal pourOutNum;
+
+    private BigDecimal qichuNum;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * ID
+     * @return id ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * ID
+     * @param id ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrg_id() {
+        return org_id;
+    }
+
+    /**
+     * 单位ID
+     * @param org_id 单位ID
+     */
+    public void setOrg_id(Integer org_id) {
+        this.org_id = org_id;
+    }
+
+    /**
+     * 倒仓业务单号
+     * @return businessNo 倒仓业务单号
+     */
+    public String getBusinessNo() {
+        return businessNo;
+    }
+
+    /**
+     * 倒仓业务单号
+     * @param businessNo 倒仓业务单号
+     */
+    public void setBusinessNo(String businessNo) {
+        this.businessNo = businessNo == null ? null : businessNo.trim();
+    }
+
+    /**
+     * 导出货位ID
+     * @return houseId 导出货位ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 导出货位ID
+     * @param houseId 导出货位ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 导出仓房ID
+     * @return wareId 导出仓房ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 导出仓房ID
+     * @param wareId 导出仓房ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 导入货位ID
+     * @return storehouseId 导入货位ID
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 导入货位ID
+     * @param storehouseId 导入货位ID
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 导入仓房ID
+     * @return warehouseId 导入仓房ID
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 导入仓房ID
+     * @param warehouseId 导入仓房ID
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 入仓时间
+     * @return rksj 入仓时间
+     */
+    public Date getRksj() {
+        return rksj;
+    }
+
+    /**
+     * 入仓时间
+     * @param rksj 入仓时间
+     */
+    public void setRksj(Date rksj) {
+        this.rksj = rksj;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 粮食性质
+     */
+    public String getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 粮食性质
+     */
+    public void setLsxz(String lsxz) {
+        this.lsxz = lsxz == null ? null : lsxz.trim();
+    }
+
+    /**
+     * 存储方式
+     * @return keepingWay 存储方式
+     */
+    public Integer getKeepingWay() {
+        return keepingWay;
+    }
+
+    /**
+     * 存储方式
+     * @param keepingWay 存储方式
+     */
+    public void setKeepingWay(Integer keepingWay) {
+        this.keepingWay = keepingWay;
+    }
+
+    /**
+     * 存储方式
+     * @return ccfs 存储方式
+     */
+    public Integer getCcfs() {
+        return ccfs;
+    }
+
+    /**
+     * 存储方式
+     * @param ccfs 存储方式
+     */
+    public void setCcfs(Integer ccfs) {
+        this.ccfs = ccfs;
+    }
+
+    /**
+     * 审核状态
+     * @return applyStatus 审核状态
+     */
+    public Integer getApplyStatus() {
+        return applyStatus;
+    }
+
+    /**
+     * 审核状态
+     * @param applyStatus 审核状态
+     */
+    public void setApplyStatus(Integer applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    /**
+     * 计划倒入数量
+     * @return pourInNum 计划倒入数量
+     */
+    public BigDecimal getPourInNum() {
+        return pourInNum;
+    }
+
+    /**
+     * 计划倒入数量
+     * @param pourInNum 计划倒入数量
+     */
+    public void setPourInNum(BigDecimal pourInNum) {
+        this.pourInNum = pourInNum;
+    }
+
+    /**
+     * 计划倒出数量
+     * @return pourOutNum 计划倒出数量
+     */
+    public BigDecimal getPourOutNum() {
+        return pourOutNum;
+    }
+
+    /**
+     * 计划倒出数量
+     * @param pourOutNum 计划倒出数量
+     */
+    public void setPourOutNum(BigDecimal pourOutNum) {
+        this.pourOutNum = pourOutNum;
+    }
+
+    /**
+     * 期初数量
+     * @return qichuNum 期初数量
+     */
+    public BigDecimal getQichuNum() {
+        return qichuNum;
+    }
+
+    /**
+     * 期初数量
+     * @param qichuNum 期初数量
+     */
+    public void setQichuNum(BigDecimal qichuNum) {
+        this.qichuNum = qichuNum;
+    }
+
+    /**
+     * 
+     * @return updateTime 
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 
+     * @param updateTime 
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

@@ -0,0 +1,296 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageChangeStoragehouseWorkTask {
+    private Integer id;
+
+    private Integer org_id;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+
+    private String workNo;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+
+    private Integer lspz;
+
+    private BigDecimal qichuNum;
+
+    private BigDecimal pourInNum;
+
+    private BigDecimal pourOutNum;
+
+    private BigDecimal surplusNum;
+
+    private Integer changIndex;
+
+    private BigDecimal beginNum;
+
+    private BigDecimal resultNum;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrg_id() {
+        return org_id;
+    }
+
+    /**
+     * 单位ID
+     * @param org_id 单位ID
+     */
+    public void setOrg_id(Integer org_id) {
+        this.org_id = org_id;
+    }
+
+    /**
+     * 创建时间
+     * @return createDate 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 作业单号
+     * @return workNo 作业单号
+     */
+    public String getWorkNo() {
+        return workNo;
+    }
+
+    /**
+     * 作业单号
+     * @param workNo 作业单号
+     */
+    public void setWorkNo(String workNo) {
+        this.workNo = workNo == null ? null : workNo.trim();
+    }
+
+    /**
+     * 倒出仓房ID
+     * @return houseId 倒出仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 倒出仓房ID
+     * @param houseId 倒出仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 倒出货位ID
+     * @return wareId 倒出货位ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 倒出货位ID
+     * @param wareId 倒出货位ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 导入仓房ID
+     * @return storehouseId 导入仓房ID
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 导入仓房ID
+     * @param storehouseId 导入仓房ID
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 倒入货位ID
+     * @return warehouseId 倒入货位ID
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 倒入货位ID
+     * @param warehouseId 倒入货位ID
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 粮油品种
+     * @return lspz 粮油品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮油品种
+     * @param lspz 粮油品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 倒出期初数量
+     * @return qichuNum 倒出期初数量
+     */
+    public BigDecimal getQichuNum() {
+        return qichuNum;
+    }
+
+    /**
+     * 倒出期初数量
+     * @param qichuNum 倒出期初数量
+     */
+    public void setQichuNum(BigDecimal qichuNum) {
+        this.qichuNum = qichuNum;
+    }
+
+    /**
+     * 倒出数量
+     * @return pourInNum 倒出数量
+     */
+    public BigDecimal getPourInNum() {
+        return pourInNum;
+    }
+
+    /**
+     * 倒出数量
+     * @param pourInNum 倒出数量
+     */
+    public void setPourInNum(BigDecimal pourInNum) {
+        this.pourInNum = pourInNum;
+    }
+
+    /**
+     * 倒入数量
+     * @return pourOutNum 倒入数量
+     */
+    public BigDecimal getPourOutNum() {
+        return pourOutNum;
+    }
+
+    /**
+     * 倒入数量
+     * @param pourOutNum 倒入数量
+     */
+    public void setPourOutNum(BigDecimal pourOutNum) {
+        this.pourOutNum = pourOutNum;
+    }
+
+    /**
+     * 倒出结余数量
+     * @return surplusNum 倒出结余数量
+     */
+    public BigDecimal getSurplusNum() {
+        return surplusNum;
+    }
+
+    /**
+     * 倒出结余数量
+     * @param surplusNum 倒出结余数量
+     */
+    public void setSurplusNum(BigDecimal surplusNum) {
+        this.surplusNum = surplusNum;
+    }
+
+    /**
+     * 数据值下标
+     * @return changIndex 数据值下标
+     */
+    public Integer getChangIndex() {
+        return changIndex;
+    }
+
+    /**
+     * 数据值下标
+     * @param changIndex 数据值下标
+     */
+    public void setChangIndex(Integer changIndex) {
+        this.changIndex = changIndex;
+    }
+
+    /**
+     * 倒入期初数量
+     * @return beginNum 倒入期初数量
+     */
+    public BigDecimal getBeginNum() {
+        return beginNum;
+    }
+
+    /**
+     * 倒入期初数量
+     * @param beginNum 倒入期初数量
+     */
+    public void setBeginNum(BigDecimal beginNum) {
+        this.beginNum = beginNum;
+    }
+
+    /**
+     * 倒入结余数量
+     * @return resultNum 倒入结余数量
+     */
+    public BigDecimal getResultNum() {
+        return resultNum;
+    }
+
+    /**
+     * 倒入结余数量
+     * @param resultNum 倒入结余数量
+     */
+    public void setResultNum(BigDecimal resultNum) {
+        this.resultNum = resultNum;
+    }
+}

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

@@ -0,0 +1,330 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StorageDump {
+    private Integer id;
+
+    private Integer ysId;
+
+    private Integer orgId;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer lspz;
+
+    private Integer yLsxz;
+
+    private Integer xLsxz;
+
+    private Integer lsdj;
+
+    private BigDecimal clsl;
+
+    private String zjjg;
+
+    private String ysStatus;
+
+    private Date businessCreateTime;
+
+    private Date createTime;
+
+    private String createPerson;
+
+    private Integer isUpload;
+
+    private Date uploadTime;
+
+    private Date updatetime;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 验收数据ID
+     * @return ys_id 验收数据ID
+     */
+    public Integer getYsId() {
+        return ysId;
+    }
+
+    /**
+     * 验收数据ID
+     * @param ysId 验收数据ID
+     */
+    public void setYsId(Integer ysId) {
+        this.ysId = ysId;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 仓房ID
+     * @return house_id 仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param houseId 仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位ID
+     * @return ware_id 货位ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 货位ID
+     * @param wareId 货位ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 原粮食性质
+     * @return y_lsxz 原粮食性质
+     */
+    public Integer getyLsxz() {
+        return yLsxz;
+    }
+
+    /**
+     * 原粮食性质
+     * @param yLsxz 原粮食性质
+     */
+    public void setyLsxz(Integer yLsxz) {
+        this.yLsxz = yLsxz;
+    }
+
+    /**
+     * 新粮食性质
+     * @return x_lsxz 新粮食性质
+     */
+    public Integer getxLsxz() {
+        return xLsxz;
+    }
+
+    /**
+     * 新粮食性质
+     * @param xLsxz 新粮食性质
+     */
+    public void setxLsxz(Integer xLsxz) {
+        this.xLsxz = xLsxz;
+    }
+
+    /**
+     * 粮食等级
+     * @return lsdj 粮食等级
+     */
+    public Integer getLsdj() {
+        return lsdj;
+    }
+
+    /**
+     * 粮食等级
+     * @param lsdj 粮食等级
+     */
+    public void setLsdj(Integer lsdj) {
+        this.lsdj = lsdj;
+    }
+
+    /**
+     * 储粮数量(单位：公斤)
+     * @return clsl 储粮数量(单位：公斤)
+     */
+    public BigDecimal getClsl() {
+        return clsl;
+    }
+
+    /**
+     * 储粮数量(单位：公斤)
+     * @param clsl 储粮数量(单位：公斤)
+     */
+    public void setClsl(BigDecimal clsl) {
+        this.clsl = clsl;
+    }
+
+    /**
+     * 质检结果
+     * @return zjjg 质检结果
+     */
+    public String getZjjg() {
+        return zjjg;
+    }
+
+    /**
+     * 质检结果
+     * @param zjjg 质检结果
+     */
+    public void setZjjg(String zjjg) {
+        this.zjjg = zjjg == null ? null : zjjg.trim();
+    }
+
+    /**
+     * 验收状态
+     * @return ys_status 验收状态
+     */
+    public String getYsStatus() {
+        return ysStatus;
+    }
+
+    /**
+     * 验收状态
+     * @param ysStatus 验收状态
+     */
+    public void setYsStatus(String ysStatus) {
+        this.ysStatus = ysStatus == null ? null : ysStatus.trim();
+    }
+
+    /**
+     * 业务产生时间
+     * @return business_create_time 业务产生时间
+     */
+    public Date getBusinessCreateTime() {
+        return businessCreateTime;
+    }
+
+    /**
+     * 业务产生时间
+     * @param businessCreateTime 业务产生时间
+     */
+    public void setBusinessCreateTime(Date businessCreateTime) {
+        this.businessCreateTime = businessCreateTime;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 创建人
+     * @return create_person 创建人
+     */
+    public String getCreatePerson() {
+        return createPerson;
+    }
+
+    /**
+     * 创建人
+     * @param createPerson 创建人
+     */
+    public void setCreatePerson(String createPerson) {
+        this.createPerson = createPerson == null ? null : createPerson.trim();
+    }
+
+    /**
+     * 上传状态(1上传成功,0需上传修改,null未上传)
+     * @return is_upload 上传状态(1上传成功,0需上传修改,null未上传)
+     */
+    public Integer getIsUpload() {
+        return isUpload;
+    }
+
+    /**
+     * 上传状态(1上传成功,0需上传修改,null未上传)
+     * @param isUpload 上传状态(1上传成功,0需上传修改,null未上传)
+     */
+    public void setIsUpload(Integer isUpload) {
+        this.isUpload = isUpload;
+    }
+
+    /**
+     * 上传时间
+     * @return upload_time 上传时间
+     */
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    /**
+     * 上传时间
+     * @param uploadTime 上传时间
+     */
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.chinaitop.depot.storage.model;
+
+public class StorageFoodbasicInfoCheck {
+    private Integer id;
+
+    private Integer houseId;
+
+    private Integer warehouseId;
+
+    private Integer foodbasicinfoId;
+
+    private Integer qualitycheckId;
+
+    private Integer orgId;
+
+    /**
+     * 粮食质量检测记录
+     * @return id 粮食质量检测记录
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 粮食质量检测记录
+     * @param id 粮食质量检测记录
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 仓房ID
+     * @return house_id 仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param houseId 仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位Id
+     * @return warehouse_id 货位Id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位Id
+     * @param warehouseId 货位Id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 粮食基本信息(粮情专卡)id
+     * @return foodbasicinfo_id 粮食基本信息(粮情专卡)id
+     */
+    public Integer getFoodbasicinfoId() {
+        return foodbasicinfoId;
+    }
+
+    /**
+     * 粮食基本信息(粮情专卡)id
+     * @param foodbasicinfoId 粮食基本信息(粮情专卡)id
+     */
+    public void setFoodbasicinfoId(Integer foodbasicinfoId) {
+        this.foodbasicinfoId = foodbasicinfoId;
+    }
+
+    /**
+     * 质量管理id
+     * @return qualitycheck_id 质量管理id
+     */
+    public Integer getQualitycheckId() {
+        return qualitycheckId;
+    }
+
+    /**
+     * 质量管理id
+     * @param qualitycheckId 质量管理id
+     */
+    public void setQualitycheckId(Integer qualitycheckId) {
+        this.qualitycheckId = qualitycheckId;
+    }
+
+    /**
+     * 组织机构id
+     * @return org_id 组织机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织机构id
+     * @param orgId 组织机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}

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

@@ -0,0 +1,578 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StorageFoodbasicInfoCheckExample {
+    /**
+     * storage_foodbasicinfochecks
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_foodbasicinfochecks
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_foodbasicinfochecks
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageFoodbasicInfoCheckExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_foodbasicinfochecks 2018-04-20
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(Integer value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(Integer value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(Integer value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(Integer value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<Integer> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<Integer> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdEqualTo(Integer value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThan(Integer value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThan(Integer value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIn(List<Integer> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIsNull() {
+            addCriterion("foodbasicinfo_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIsNotNull() {
+            addCriterion("foodbasicinfo_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id =", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id <>", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdGreaterThan(Integer value) {
+            addCriterion("foodbasicinfo_id >", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id >=", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdLessThan(Integer value) {
+            addCriterion("foodbasicinfo_id <", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdLessThanOrEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id <=", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIn(List<Integer> values) {
+            addCriterion("foodbasicinfo_id in", values, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotIn(List<Integer> values) {
+            addCriterion("foodbasicinfo_id not in", values, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdBetween(Integer value1, Integer value2) {
+            addCriterion("foodbasicinfo_id between", value1, value2, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("foodbasicinfo_id not between", value1, value2, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIsNull() {
+            addCriterion("qualitycheck_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIsNotNull() {
+            addCriterion("qualitycheck_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdEqualTo(Integer value) {
+            addCriterion("qualitycheck_id =", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <>", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThan(Integer value) {
+            addCriterion("qualitycheck_id >", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id >=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThan(Integer value) {
+            addCriterion("qualitycheck_id <", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIn(List<Integer> values) {
+            addCriterion("qualitycheck_id in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotIn(List<Integer> values) {
+            addCriterion("qualitycheck_id not in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id not between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_foodbasicinfochecks
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_foodbasicinfochecks 2018-04-20
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,225 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class StorageFoodbasicInfoLocation {
+    private Integer id;
+
+    private Integer foodbasicinfoId;
+
+    private Integer houseId;
+
+    private Integer newHouseId;
+
+    private Integer warehouseId;
+
+    private Integer newWarehouseId;
+
+    private String warehouseCode;
+
+    private String newWarehouseCode;
+
+    private Date changeTime;
+
+    private String remarks;
+
+    private Integer orgId;
+    
+    //业务字段
+    private String newWarehouseName;
+    
+    private String warehouseName;
+
+
+	/**
+     * 粮食基本信息货位变更记录
+     * @return id 粮食基本信息货位变更记录
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 粮食基本信息货位变更记录
+     * @param id 粮食基本信息货位变更记录
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 粮食基本信息(粮情专卡)id
+     * @return foodbasicinfo_id 粮食基本信息(粮情专卡)id
+     */
+    public Integer getFoodbasicinfoId() {
+        return foodbasicinfoId;
+    }
+
+    /**
+     * 粮食基本信息(粮情专卡)id
+     * @param foodbasicinfoId 粮食基本信息(粮情专卡)id
+     */
+    public void setFoodbasicinfoId(Integer foodbasicinfoId) {
+        this.foodbasicinfoId = foodbasicinfoId;
+    }
+
+    /**
+     * 仓房id
+     * @return house_id 仓房id
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房id
+     * @param houseId 仓房id
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 新仓号Id
+     * @return new_house_id 新仓号Id
+     */
+    public Integer getNewHouseId() {
+        return newHouseId;
+    }
+
+    /**
+     * 新仓号Id
+     * @param newHouseId 新仓号Id
+     */
+    public void setNewHouseId(Integer newHouseId) {
+        this.newHouseId = newHouseId;
+    }
+
+    /**
+     * 原货位号
+     * @return warehouse_id 原货位号
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 原货位号
+     * @param warehouseId 原货位号
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 新货位号
+     * @return new_warehouse_id 新货位号
+     */
+    public Integer getNewWarehouseId() {
+        return newWarehouseId;
+    }
+
+    /**
+     * 新货位号
+     * @param newWarehouseId 新货位号
+     */
+    public void setNewWarehouseId(Integer newWarehouseId) {
+        this.newWarehouseId = newWarehouseId;
+    }
+
+    /**
+     * 老货位编号
+     * @return warehouse_code 老货位编号
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 老货位编号
+     * @param warehouseCode 老货位编号
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode == null ? null : warehouseCode.trim();
+    }
+
+    /**
+     * 新货位编号
+     * @return new_warehouse_code 新货位编号
+     */
+    public String getNewWarehouseCode() {
+        return newWarehouseCode;
+    }
+
+    /**
+     * 新货位编号
+     * @param newWarehouseCode 新货位编号
+     */
+    public void setNewWarehouseCode(String newWarehouseCode) {
+        this.newWarehouseCode = newWarehouseCode == null ? null : newWarehouseCode.trim();
+    }
+
+    /**
+     * 变更时间
+     * @return change_time 变更时间
+     */
+    public Date getChangeTime() {
+        return changeTime;
+    }
+
+    /**
+     * 变更时间
+     * @param changeTime 变更时间
+     */
+    public void setChangeTime(Date changeTime) {
+        this.changeTime = changeTime;
+    }
+
+    /**
+     * 备注
+     * @return remarks 备注
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * 备注
+     * @param remarks 备注
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    /**
+     * 组织结构id
+     * @return org_id 组织结构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织结构id
+     * @param orgId 组织结构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getNewWarehouseName() {
+        return newWarehouseName;
+    }
+
+    public void setNewWarehouseName(String newWarehouseName) {
+        this.newWarehouseName = newWarehouseName;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+}

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

@@ -0,0 +1,909 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageFoodbasicInfoLocationExample {
+    /**
+     * storage_foodbasicinfolocation
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_foodbasicinfolocation
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_foodbasicinfolocation
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageFoodbasicInfoLocationExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_foodbasicinfolocation 2018-04-17
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIsNull() {
+            addCriterion("foodbasicinfo_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIsNotNull() {
+            addCriterion("foodbasicinfo_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id =", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id <>", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdGreaterThan(Integer value) {
+            addCriterion("foodbasicinfo_id >", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id >=", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdLessThan(Integer value) {
+            addCriterion("foodbasicinfo_id <", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdLessThanOrEqualTo(Integer value) {
+            addCriterion("foodbasicinfo_id <=", value, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdIn(List<Integer> values) {
+            addCriterion("foodbasicinfo_id in", values, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotIn(List<Integer> values) {
+            addCriterion("foodbasicinfo_id not in", values, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdBetween(Integer value1, Integer value2) {
+            addCriterion("foodbasicinfo_id between", value1, value2, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFoodbasicinfoIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("foodbasicinfo_id not between", value1, value2, "foodbasicinfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(Integer value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(Integer value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(Integer value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(Integer value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<Integer> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<Integer> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdIsNull() {
+            addCriterion("new_house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdIsNotNull() {
+            addCriterion("new_house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdEqualTo(Integer value) {
+            addCriterion("new_house_id =", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdNotEqualTo(Integer value) {
+            addCriterion("new_house_id <>", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdGreaterThan(Integer value) {
+            addCriterion("new_house_id >", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("new_house_id >=", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdLessThan(Integer value) {
+            addCriterion("new_house_id <", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("new_house_id <=", value, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdIn(List<Integer> values) {
+            addCriterion("new_house_id in", values, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdNotIn(List<Integer> values) {
+            addCriterion("new_house_id not in", values, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("new_house_id between", value1, value2, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewHouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("new_house_id not between", value1, value2, "newHouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdEqualTo(Integer value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThan(Integer value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThan(Integer value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIn(List<Integer> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdIsNull() {
+            addCriterion("new_warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdIsNotNull() {
+            addCriterion("new_warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdEqualTo(Integer value) {
+            addCriterion("new_warehouse_id =", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("new_warehouse_id <>", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdGreaterThan(Integer value) {
+            addCriterion("new_warehouse_id >", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("new_warehouse_id >=", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdLessThan(Integer value) {
+            addCriterion("new_warehouse_id <", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("new_warehouse_id <=", value, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdIn(List<Integer> values) {
+            addCriterion("new_warehouse_id in", values, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("new_warehouse_id not in", values, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("new_warehouse_id between", value1, value2, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("new_warehouse_id not between", value1, value2, "newWarehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeIsNull() {
+            addCriterion("warehouse_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeIsNotNull() {
+            addCriterion("warehouse_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeEqualTo(String value) {
+            addCriterion("warehouse_code =", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeNotEqualTo(String value) {
+            addCriterion("warehouse_code <>", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeGreaterThan(String value) {
+            addCriterion("warehouse_code >", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("warehouse_code >=", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeLessThan(String value) {
+            addCriterion("warehouse_code <", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeLessThanOrEqualTo(String value) {
+            addCriterion("warehouse_code <=", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeLike(String value) {
+            addCriterion("warehouse_code like", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeNotLike(String value) {
+            addCriterion("warehouse_code not like", value, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeIn(List<String> values) {
+            addCriterion("warehouse_code in", values, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeNotIn(List<String> values) {
+            addCriterion("warehouse_code not in", values, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeBetween(String value1, String value2) {
+            addCriterion("warehouse_code between", value1, value2, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseCodeNotBetween(String value1, String value2) {
+            addCriterion("warehouse_code not between", value1, value2, "warehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeIsNull() {
+            addCriterion("new_warehouse_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeIsNotNull() {
+            addCriterion("new_warehouse_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeEqualTo(String value) {
+            addCriterion("new_warehouse_code =", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeNotEqualTo(String value) {
+            addCriterion("new_warehouse_code <>", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeGreaterThan(String value) {
+            addCriterion("new_warehouse_code >", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("new_warehouse_code >=", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeLessThan(String value) {
+            addCriterion("new_warehouse_code <", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeLessThanOrEqualTo(String value) {
+            addCriterion("new_warehouse_code <=", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeLike(String value) {
+            addCriterion("new_warehouse_code like", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeNotLike(String value) {
+            addCriterion("new_warehouse_code not like", value, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeIn(List<String> values) {
+            addCriterion("new_warehouse_code in", values, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeNotIn(List<String> values) {
+            addCriterion("new_warehouse_code not in", values, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeBetween(String value1, String value2) {
+            addCriterion("new_warehouse_code between", value1, value2, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewWarehouseCodeNotBetween(String value1, String value2) {
+            addCriterion("new_warehouse_code not between", value1, value2, "newWarehouseCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeIsNull() {
+            addCriterion("change_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeIsNotNull() {
+            addCriterion("change_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeEqualTo(Date value) {
+            addCriterion("change_time =", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeNotEqualTo(Date value) {
+            addCriterion("change_time <>", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeGreaterThan(Date value) {
+            addCriterion("change_time >", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("change_time >=", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeLessThan(Date value) {
+            addCriterion("change_time <", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeLessThanOrEqualTo(Date value) {
+            addCriterion("change_time <=", value, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeIn(List<Date> values) {
+            addCriterion("change_time in", values, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeNotIn(List<Date> values) {
+            addCriterion("change_time not in", values, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeBetween(Date value1, Date value2) {
+            addCriterion("change_time between", value1, value2, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andChangeTimeNotBetween(Date value1, Date value2) {
+            addCriterion("change_time not between", value1, value2, "changeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNull() {
+            addCriterion("remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNotNull() {
+            addCriterion("remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksEqualTo(String value) {
+            addCriterion("remarks =", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotEqualTo(String value) {
+            addCriterion("remarks <>", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThan(String value) {
+            addCriterion("remarks >", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("remarks >=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThan(String value) {
+            addCriterion("remarks <", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThanOrEqualTo(String value) {
+            addCriterion("remarks <=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLike(String value) {
+            addCriterion("remarks like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotLike(String value) {
+            addCriterion("remarks not like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIn(List<String> values) {
+            addCriterion("remarks in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotIn(List<String> values) {
+            addCriterion("remarks not in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksBetween(String value1, String value2) {
+            addCriterion("remarks between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotBetween(String value1, String value2) {
+            addCriterion("remarks not between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_foodbasicinfolocation
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_foodbasicinfolocation 2018-04-17
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,902 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StorageFoodbasicinfo {
+    private Integer id;
+
+    private Integer houseId;
+
+    private Integer warehouseId;
+
+    private String recordUnite;
+
+    private String keepUnite;
+
+    private String locationNum;
+
+    private String quality;
+
+    private Integer subType;
+
+    private Integer subTypeDetailed;
+
+    private String htype;
+
+    private Double number;
+
+    private Double standNumber;
+
+    private Date inputYear;
+
+    private Integer growYear;
+
+    private String keepMethod;
+
+    private String level;
+
+    private String weight;
+
+    private String impurity;
+
+    private String water;
+
+    private String unsound;
+
+    private String recorder;
+
+    private String houseType;
+
+    private BigDecimal designHouseCapacity;
+
+    private String validHouseCapacity;
+
+    private String price;
+
+    private String placeOfOrigin;
+
+    private String storageLocation;
+
+    private String disperseCapacity;
+
+    private BigDecimal length;
+
+    private BigDecimal width;
+
+    private BigDecimal height;
+
+    private String packNum;
+
+    private String packAverageWeight;
+
+    private String keeperIds;
+
+    private String glutenWaterCount;
+
+    private String eatScore;
+
+    private String unitHead;
+
+    private String fatIndex;
+
+    private String peroxideValue;
+
+    private String refractionIndex;
+
+    private String residualSolvent;
+
+    private String fillingTime;
+
+    private BigDecimal lineHeight;
+
+    private String sealStatus;
+
+    private String authCode;
+
+    private Integer orgId;
+
+    private Integer historyStatus;
+
+    //业务字段
+    private String storehouseName;
+
+    private String wareHouseName;
+
+    private String keeperNames;
+
+    private String storehouseCode;
+    private String warehouseCode;
+
+    /**
+     * 粮食基本信息(粮情专卡)
+     * @return id 粮食基本信息(粮情专卡)
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 粮食基本信息(粮情专卡)
+     * @param id 粮食基本信息(粮情专卡)
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 仓房id
+     * @return house_id 仓房id
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房id
+     * @param houseId 仓房id
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位号id
+     * @return warehouse_id 货位号id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位号id
+     * @param warehouseId 货位号id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 填卡单位
+     * @return record_unite 填卡单位
+     */
+    public String getRecordUnite() {
+        return recordUnite;
+    }
+
+    /**
+     * 填卡单位
+     * @param recordUnite 填卡单位
+     */
+    public void setRecordUnite(String recordUnite) {
+        this.recordUnite = recordUnite == null ? null : recordUnite.trim();
+    }
+
+    /**
+     * 保管单位
+     * @return keep_unite 保管单位
+     */
+    public String getKeepUnite() {
+        return keepUnite;
+    }
+
+    /**
+     * 保管单位
+     * @param keepUnite 保管单位
+     */
+    public void setKeepUnite(String keepUnite) {
+        this.keepUnite = keepUnite == null ? null : keepUnite.trim();
+    }
+
+    /**
+     * 货位编号
+     * @return location_num 货位编号
+     */
+    public String getLocationNum() {
+        return locationNum;
+    }
+
+    /**
+     * 货位编号
+     * @param locationNum 货位编号
+     */
+    public void setLocationNum(String locationNum) {
+        this.locationNum = locationNum == null ? null : locationNum.trim();
+    }
+
+    /**
+     * 储粮性质
+     * @return quality 储粮性质
+     */
+    public String getQuality() {
+        return quality;
+    }
+
+    /**
+     * 储粮性质
+     * @param quality 储粮性质
+     */
+    public void setQuality(String quality) {
+        this.quality = quality == null ? null : quality.trim();
+    }
+
+    /**
+     * 品种
+     * @return sub_type 品种
+     */
+    public Integer getSubType() {
+        return subType;
+    }
+
+    /**
+     * 品种
+     * @param subType 品种
+     */
+    public void setSubType(Integer subType) {
+        this.subType = subType;
+    }
+
+    /**
+     * 明细品种
+     * @return sub_type_detailed 明细品种
+     */
+    public Integer getSubTypeDetailed() {
+        return subTypeDetailed;
+    }
+
+    /**
+     * 明细品种
+     * @param subTypeDetailed 明细品种
+     */
+    public void setSubTypeDetailed(Integer subTypeDetailed) {
+        this.subTypeDetailed = subTypeDetailed;
+    }
+
+    /**
+     * 储存状态 0：在储 1：历史
+     * @return htype 储存状态 0：在储 1：历史
+     */
+    public String getHtype() {
+        return htype;
+    }
+
+    /**
+     * 储存状态 0：在储 1：历史
+     * @param htype 储存状态 0：在储 1：历史
+     */
+    public void setHtype(String htype) {
+        this.htype = htype == null ? null : htype.trim();
+    }
+
+    /**
+     * 实际数量（kg）
+     * @return number 实际数量（kg）
+     */
+    public Double getNumber() {
+        return number;
+    }
+
+    /**
+     * 实际数量（kg）
+     * @param number 实际数量（kg）
+     */
+    public void setNumber(Double number) {
+        this.number = number;
+    }
+
+    /**
+     * 折合标准数量(吨)
+     * @return stand_number 折合标准数量(吨)
+     */
+    public Double getStandNumber() {
+        return standNumber;
+    }
+
+    /**
+     * 折合标准数量(吨)
+     * @param standNumber 折合标准数量(吨)
+     */
+    public void setStandNumber(Double standNumber) {
+        this.standNumber = standNumber;
+    }
+
+    /**
+     * 入仓时间
+     * @return input_year 入仓时间
+     */
+    public Date getInputYear() {
+        return inputYear;
+    }
+
+    /**
+     * 入仓时间
+     * @param inputYear 入仓时间
+     */
+    public void setInputYear(Date inputYear) {
+        this.inputYear = inputYear;
+    }
+
+    /**
+     * 收货年度
+     * @return grow_year 收货年度
+     */
+    public Integer getGrowYear() {
+        return growYear;
+    }
+
+    /**
+     * 收货年度
+     * @param growYear 收货年度
+     */
+    public void setGrowYear(Integer growYear) {
+        this.growYear = growYear;
+    }
+
+    /**
+     * 保管方式
+     * @return keep_method 保管方式
+     */
+    public String getKeepMethod() {
+        return keepMethod;
+    }
+
+    /**
+     * 保管方式
+     * @param keepMethod 保管方式
+     */
+    public void setKeepMethod(String keepMethod) {
+        this.keepMethod = keepMethod == null ? null : keepMethod.trim();
+    }
+
+    /**
+     * 等级
+     * @return level 等级
+     */
+    public String getLevel() {
+        return level;
+    }
+
+    /**
+     * 等级
+     * @param level 等级
+     */
+    public void setLevel(String level) {
+        this.level = level == null ? null : level.trim();
+    }
+
+    /**
+     * 容重（出糙率%或纯粮率%）
+     * @return weight 容重（出糙率%或纯粮率%）
+     */
+    public String getWeight() {
+        return weight;
+    }
+
+    /**
+     * 容重（出糙率%或纯粮率%）
+     * @param weight 容重（出糙率%或纯粮率%）
+     */
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
+    }
+
+    /**
+     * 杂质（%）
+     * @return impurity 杂质（%）
+     */
+    public String getImpurity() {
+        return impurity;
+    }
+
+    /**
+     * 杂质（%）
+     * @param impurity 杂质（%）
+     */
+    public void setImpurity(String impurity) {
+        this.impurity = impurity == null ? null : impurity.trim();
+    }
+
+    /**
+     * 入仓水分（%）
+     * @return water 入仓水分（%）
+     */
+    public String getWater() {
+        return water;
+    }
+
+    /**
+     * 入仓水分（%）
+     * @param water 入仓水分（%）
+     */
+    public void setWater(String water) {
+        this.water = water == null ? null : water.trim();
+    }
+
+    /**
+     * 不完善粒（整精米粒%）
+     * @return unsound 不完善粒（整精米粒%）
+     */
+    public String getUnsound() {
+        return unsound;
+    }
+
+    /**
+     * 不完善粒（整精米粒%）
+     * @param unsound 不完善粒（整精米粒%）
+     */
+    public void setUnsound(String unsound) {
+        this.unsound = unsound == null ? null : unsound.trim();
+    }
+
+    /**
+     * 建卡人
+     * @return recorder 建卡人
+     */
+    public String getRecorder() {
+        return recorder;
+    }
+
+    /**
+     * 建卡人
+     * @param recorder 建卡人
+     */
+    public void setRecorder(String recorder) {
+        this.recorder = recorder == null ? null : recorder.trim();
+    }
+
+    /**
+     * 仓型
+     * @return house_type 仓型
+     */
+    public String getHouseType() {
+        return houseType;
+    }
+
+    /**
+     * 仓型
+     * @param houseType 仓型
+     */
+    public void setHouseType(String houseType) {
+        this.houseType = houseType == null ? null : houseType.trim();
+    }
+
+    /**
+     * 设计仓容
+     * @return design_house_capacity 设计仓容
+     */
+    public BigDecimal getDesignHouseCapacity() {
+        return designHouseCapacity;
+    }
+
+    /**
+     * 设计仓容
+     * @param designHouseCapacity 设计仓容
+     */
+    public void setDesignHouseCapacity(BigDecimal designHouseCapacity) {
+        this.designHouseCapacity = designHouseCapacity;
+    }
+
+    /**
+     * 有效仓容
+     * @return valid_house_capacity 有效仓容
+     */
+    public String getValidHouseCapacity() {
+        return validHouseCapacity;
+    }
+
+    /**
+     * 有效仓容
+     * @param validHouseCapacity 有效仓容
+     */
+    public void setValidHouseCapacity(String validHouseCapacity) {
+        this.validHouseCapacity = validHouseCapacity == null ? null : validHouseCapacity.trim();
+    }
+
+    /**
+     * 价位(元/Kg)
+     * @return price 价位(元/Kg)
+     */
+    public String getPrice() {
+        return price;
+    }
+
+    /**
+     * 价位(元/Kg)
+     * @param price 价位(元/Kg)
+     */
+    public void setPrice(String price) {
+        this.price = price == null ? null : price.trim();
+    }
+
+    /**
+     * 产地
+     * @return place_of_origin 产地
+     */
+    public String getPlaceOfOrigin() {
+        return placeOfOrigin;
+    }
+
+    /**
+     * 产地
+     * @param placeOfOrigin 产地
+     */
+    public void setPlaceOfOrigin(String placeOfOrigin) {
+        this.placeOfOrigin = placeOfOrigin == null ? null : placeOfOrigin.trim();
+    }
+
+    /**
+     * 存储地点
+     * @return storage_location 存储地点
+     */
+    public String getStorageLocation() {
+        return storageLocation;
+    }
+
+    /**
+     * 存储地点
+     * @param storageLocation 存储地点
+     */
+    public void setStorageLocation(String storageLocation) {
+        this.storageLocation = storageLocation == null ? null : storageLocation.trim();
+    }
+
+    /**
+     * 散存粮体积
+     * @return disperse_capacity 散存粮体积
+     */
+    public String getDisperseCapacity() {
+        return disperseCapacity;
+    }
+
+    /**
+     * 散存粮体积
+     * @param disperseCapacity 散存粮体积
+     */
+    public void setDisperseCapacity(String disperseCapacity) {
+        this.disperseCapacity = disperseCapacity == null ? null : disperseCapacity.trim();
+    }
+
+    /**
+     * 长（米）
+     * @return length 长（米）
+     */
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    /**
+     * 长（米）
+     * @param length 长（米）
+     */
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    /**
+     * 宽（直径米）
+     * @return width 宽（直径米）
+     */
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    /**
+     * 宽（直径米）
+     * @param width 宽（直径米）
+     */
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    /**
+     * 高（米）
+     * @return height 高（米）
+     */
+    public BigDecimal getHeight() {
+        return height;
+    }
+
+    /**
+     * 高（米）
+     * @param height 高（米）
+     */
+    public void setHeight(BigDecimal height) {
+        this.height = height;
+    }
+
+    /**
+     * 包存粮包数
+     * @return pack_num 包存粮包数
+     */
+    public String getPackNum() {
+        return packNum;
+    }
+
+    /**
+     * 包存粮包数
+     * @param packNum 包存粮包数
+     */
+    public void setPackNum(String packNum) {
+        this.packNum = packNum == null ? null : packNum.trim();
+    }
+
+    /**
+     * 平均包重（公斤）
+     * @return pack_average_weight 平均包重（公斤）
+     */
+    public String getPackAverageWeight() {
+        return packAverageWeight;
+    }
+
+    /**
+     * 平均包重（公斤）
+     * @param packAverageWeight 平均包重（公斤）
+     */
+    public void setPackAverageWeight(String packAverageWeight) {
+        this.packAverageWeight = packAverageWeight == null ? null : packAverageWeight.trim();
+    }
+
+    /**
+     * 保管员ids(可能存在多个保管员)
+     * @return keeper_ids 保管员ids(可能存在多个保管员)
+     */
+    public String getKeeperIds() {
+        return keeperIds;
+    }
+
+    /**
+     * 保管员ids(可能存在多个保管员)
+     * @param keeperIds 保管员ids(可能存在多个保管员)
+     */
+    public void setKeeperIds(String keeperIds) {
+        this.keeperIds = keeperIds == null ? null : keeperIds.trim();
+    }
+
+    /**
+     * 面筋吸水量
+     * @return gluten_water_count 面筋吸水量
+     */
+    public String getGlutenWaterCount() {
+        return glutenWaterCount;
+    }
+
+    /**
+     * 面筋吸水量
+     * @param glutenWaterCount 面筋吸水量
+     */
+    public void setGlutenWaterCount(String glutenWaterCount) {
+        this.glutenWaterCount = glutenWaterCount == null ? null : glutenWaterCount.trim();
+    }
+
+    /**
+     * 品尝评分值
+     * @return eat_score 品尝评分值
+     */
+    public String getEatScore() {
+        return eatScore;
+    }
+
+    /**
+     * 品尝评分值
+     * @param eatScore 品尝评分值
+     */
+    public void setEatScore(String eatScore) {
+        this.eatScore = eatScore == null ? null : eatScore.trim();
+    }
+
+    /**
+     * 单位负责人
+     * @return unit_head 单位负责人
+     */
+    public String getUnitHead() {
+        return unitHead;
+    }
+
+    /**
+     * 单位负责人
+     * @param unitHead 单位负责人
+     */
+    public void setUnitHead(String unitHead) {
+        this.unitHead = unitHead == null ? null : unitHead.trim();
+    }
+
+    /**
+     * 酸值
+     * @return fat_index 酸值
+     */
+    public String getFatIndex() {
+        return fatIndex;
+    }
+
+    /**
+     * 酸值
+     * @param fatIndex 酸值
+     */
+    public void setFatIndex(String fatIndex) {
+        this.fatIndex = fatIndex == null ? null : fatIndex.trim();
+    }
+
+    /**
+     * 过氧化值
+     * @return peroxide_value 过氧化值
+     */
+    public String getPeroxideValue() {
+        return peroxideValue;
+    }
+
+    /**
+     * 过氧化值
+     * @param peroxideValue 过氧化值
+     */
+    public void setPeroxideValue(String peroxideValue) {
+        this.peroxideValue = peroxideValue == null ? null : peroxideValue.trim();
+    }
+
+    /**
+     * 折光指数
+     * @return refraction_index 折光指数
+     */
+    public String getRefractionIndex() {
+        return refractionIndex;
+    }
+
+    /**
+     * 折光指数
+     * @param refractionIndex 折光指数
+     */
+    public void setRefractionIndex(String refractionIndex) {
+        this.refractionIndex = refractionIndex == null ? null : refractionIndex.trim();
+    }
+
+    /**
+     * 溶剂残留量
+     * @return residual_solvent 溶剂残留量
+     */
+    public String getResidualSolvent() {
+        return residualSolvent;
+    }
+
+    /**
+     * 溶剂残留量
+     * @param residualSolvent 溶剂残留量
+     */
+    public void setResidualSolvent(String residualSolvent) {
+        this.residualSolvent = residualSolvent == null ? null : residualSolvent.trim();
+    }
+
+    /**
+     * 填卡日期
+     * @return filling_time 填卡日期
+     */
+    public String getFillingTime() {
+        return fillingTime;
+    }
+
+    /**
+     * 填卡日期
+     * @param fillingTime 填卡日期
+     */
+    public void setFillingTime(String fillingTime) {
+        this.fillingTime = fillingTime == null ? null : fillingTime.trim();
+    }
+
+    /**
+     * 装粮线高度
+     * @return line_height 装粮线高度
+     */
+    public BigDecimal getLineHeight() {
+        return lineHeight;
+    }
+
+    /**
+     * 装粮线高度
+     * @param lineHeight 装粮线高度
+     */
+    public void setLineHeight(BigDecimal lineHeight) {
+        this.lineHeight = lineHeight;
+    }
+
+    /**
+     * 封仓状态：0:未封仓,1:已封仓
+     * @return seal_status 封仓状态：0:未封仓,1:已封仓
+     */
+    public String getSealStatus() {
+        return sealStatus;
+    }
+
+    /**
+     * 封仓状态：0:未封仓,1:已封仓
+     * @param sealStatus 封仓状态：0:未封仓,1:已封仓
+     */
+    public void setSealStatus(String sealStatus) {
+        this.sealStatus = sealStatus == null ? null : sealStatus.trim();
+    }
+
+    /**
+     * 库存识别码
+     * @return auth_code 库存识别码
+     */
+    public String getAuthCode() {
+        return authCode;
+    }
+
+    /**
+     * 库存识别码
+     * @param authCode 库存识别码
+     */
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode == null ? null : authCode.trim();
+    }
+
+    /**
+     * 组织机构id
+     * @return org_id 组织机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织机构id
+     * @param orgId 组织机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 0:最新数据  1:历史数据
+     * @return history_status 0:最新数据  1:历史数据
+     */
+    public Integer getHistoryStatus() {
+        return historyStatus;
+    }
+
+    /**
+     * 0:最新数据  1:历史数据
+     * @param historyStatus 0:最新数据  1:历史数据
+     */
+    public void setHistoryStatus(Integer historyStatus) {
+        this.historyStatus = historyStatus;
+    }
+
+    public String getStorehouseName() {
+        return storehouseName;
+    }
+
+    public void setStorehouseName(String storehouseName) {
+        this.storehouseName = storehouseName;
+    }
+
+    public String getWareHouseName() {
+        return wareHouseName;
+    }
+
+    public void setWareHouseName(String wareHouseName) {
+        this.wareHouseName = wareHouseName;
+    }
+
+    public String getKeeperNames() {
+        return keeperNames;
+    }
+
+    public void setKeeperNames(String keeperNames) {
+        this.keeperNames = keeperNames;
+    }
+
+    public String getStorehouseCode() {
+        return storehouseCode;
+    }
+
+    public void setStorehouseCode(String storehouseCode) {
+        this.storehouseCode = storehouseCode;
+    }
+
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+}

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

@@ -0,0 +1,223 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageKcglJkqyqApplyDefault {
+    private Integer id;
+
+    private Integer orgId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date modifydate;
+
+    private Integer ch;
+
+    private Integer hwh;
+
+    private String pz;
+
+    private Integer isUpload;
+
+    private String jhbh;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jkqEnd;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date sqyqTime;
+
+    private String yqsqNo;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 出库时间
+     * @return modifydate 出库时间
+     */
+    public Date getModifydate() {
+        return modifydate;
+    }
+
+    /**
+     * 出库时间
+     * @param modifydate 出库时间
+     */
+    public void setModifydate(Date modifydate) {
+        this.modifydate = modifydate;
+    }
+
+    /**
+     * 仓房ID
+     * @return ch 仓房ID
+     */
+    public Integer getCh() {
+        return ch;
+    }
+
+    /**
+     * 仓房ID
+     * @param ch 仓房ID
+     */
+    public void setCh(Integer ch) {
+        this.ch = ch;
+    }
+
+    /**
+     * 货位ID
+     * @return hwh 货位ID
+     */
+    public Integer getHwh() {
+        return hwh;
+    }
+
+    /**
+     * 货位ID
+     * @param hwh 货位ID
+     */
+    public void setHwh(Integer hwh) {
+        this.hwh = hwh;
+    }
+
+    /**
+     * 粮食品种
+     * @return pz 粮食品种
+     */
+    public String getPz() {
+        return pz;
+    }
+
+    /**
+     * 粮食品种
+     * @param pz 粮食品种
+     */
+    public void setPz(String pz) {
+        this.pz = pz == null ? null : pz.trim();
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     * @return is_Upload 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     */
+    public Integer getIsUpload() {
+        return isUpload;
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     * @param isUpload 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     */
+    public void setIsUpload(Integer isUpload) {
+        this.isUpload = isUpload;
+    }
+
+    /**
+     * 计划编号
+     * @return jhbh 计划编号
+     */
+    public String getJhbh() {
+        return jhbh;
+    }
+
+    /**
+     * 计划编号
+     * @param jhbh 计划编号
+     */
+    public void setJhbh(String jhbh) {
+        this.jhbh = jhbh == null ? null : jhbh.trim();
+    }
+
+    /**
+     * 架空期截止时间
+     * @return jkq_end 架空期截止时间
+     */
+    public Date getJkqEnd() {
+        return jkqEnd;
+    }
+
+    /**
+     * 架空期截止时间
+     * @param jkqEnd 架空期截止时间
+     */
+    public void setJkqEnd(Date jkqEnd) {
+        this.jkqEnd = jkqEnd;
+    }
+
+    /**
+     * 申请延期日期
+     * @return sqyq_time 申请延期日期
+     */
+    public Date getSqyqTime() {
+        return sqyqTime;
+    }
+
+    /**
+     * 申请延期日期
+     * @param sqyqTime 申请延期日期
+     */
+    public void setSqyqTime(Date sqyqTime) {
+        this.sqyqTime = sqyqTime;
+    }
+
+    /**
+     * 延期申请单号
+     * @return yqsq_no 延期申请单号
+     */
+    public String getYqsqNo() {
+        return yqsqNo;
+    }
+
+    /**
+     * 延期申请单号
+     * @param yqsqNo 延期申请单号
+     */
+    public void setYqsqNo(String yqsqNo) {
+        this.yqsqNo = yqsqNo == null ? null : yqsqNo.trim();
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,969 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageKcglJkqyqApplyDefaultExample {
+    /**
+     * storage_kcgl_jkqyq_apply_default
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_kcgl_jkqyq_apply_default
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_kcgl_jkqyq_apply_default
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageKcglJkqyqApplyDefaultExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_kcgl_jkqyq_apply_default 2019-10-28
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateIsNull() {
+            addCriterion("modifydate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateIsNotNull() {
+            addCriterion("modifydate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateEqualTo(Date value) {
+            addCriterion("modifydate =", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateNotEqualTo(Date value) {
+            addCriterion("modifydate <>", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateGreaterThan(Date value) {
+            addCriterion("modifydate >", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateGreaterThanOrEqualTo(Date value) {
+            addCriterion("modifydate >=", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateLessThan(Date value) {
+            addCriterion("modifydate <", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateLessThanOrEqualTo(Date value) {
+            addCriterion("modifydate <=", value, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateIn(List<Date> values) {
+            addCriterion("modifydate in", values, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateNotIn(List<Date> values) {
+            addCriterion("modifydate not in", values, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateBetween(Date value1, Date value2) {
+            addCriterion("modifydate between", value1, value2, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifydateNotBetween(Date value1, Date value2) {
+            addCriterion("modifydate not between", value1, value2, "modifydate");
+            return (Criteria) this;
+        }
+
+        public Criteria andChIsNull() {
+            addCriterion("ch is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChIsNotNull() {
+            addCriterion("ch is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChEqualTo(Integer value) {
+            addCriterion("ch =", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChNotEqualTo(Integer value) {
+            addCriterion("ch <>", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChGreaterThan(Integer value) {
+            addCriterion("ch >", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ch >=", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChLessThan(Integer value) {
+            addCriterion("ch <", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChLessThanOrEqualTo(Integer value) {
+            addCriterion("ch <=", value, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChIn(List<Integer> values) {
+            addCriterion("ch in", values, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChNotIn(List<Integer> values) {
+            addCriterion("ch not in", values, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChBetween(Integer value1, Integer value2) {
+            addCriterion("ch between", value1, value2, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andChNotBetween(Integer value1, Integer value2) {
+            addCriterion("ch not between", value1, value2, "ch");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhIsNull() {
+            addCriterion("hwh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhIsNotNull() {
+            addCriterion("hwh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhEqualTo(Integer value) {
+            addCriterion("hwh =", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhNotEqualTo(Integer value) {
+            addCriterion("hwh <>", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhGreaterThan(Integer value) {
+            addCriterion("hwh >", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhGreaterThanOrEqualTo(Integer value) {
+            addCriterion("hwh >=", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhLessThan(Integer value) {
+            addCriterion("hwh <", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhLessThanOrEqualTo(Integer value) {
+            addCriterion("hwh <=", value, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhIn(List<Integer> values) {
+            addCriterion("hwh in", values, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhNotIn(List<Integer> values) {
+            addCriterion("hwh not in", values, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhBetween(Integer value1, Integer value2) {
+            addCriterion("hwh between", value1, value2, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andHwhNotBetween(Integer value1, Integer value2) {
+            addCriterion("hwh not between", value1, value2, "hwh");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzIsNull() {
+            addCriterion("pz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzIsNotNull() {
+            addCriterion("pz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzEqualTo(String value) {
+            addCriterion("pz =", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzNotEqualTo(String value) {
+            addCriterion("pz <>", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzGreaterThan(String value) {
+            addCriterion("pz >", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzGreaterThanOrEqualTo(String value) {
+            addCriterion("pz >=", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzLessThan(String value) {
+            addCriterion("pz <", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzLessThanOrEqualTo(String value) {
+            addCriterion("pz <=", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzLike(String value) {
+            addCriterion("pz like", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzNotLike(String value) {
+            addCriterion("pz not like", value, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzIn(List<String> values) {
+            addCriterion("pz in", values, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzNotIn(List<String> values) {
+            addCriterion("pz not in", values, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzBetween(String value1, String value2) {
+            addCriterion("pz between", value1, value2, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andPzNotBetween(String value1, String value2) {
+            addCriterion("pz not between", value1, value2, "pz");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNull() {
+            addCriterion("is_Upload is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNotNull() {
+            addCriterion("is_Upload is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadEqualTo(Integer value) {
+            addCriterion("is_Upload =", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotEqualTo(Integer value) {
+            addCriterion("is_Upload <>", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThan(Integer value) {
+            addCriterion("is_Upload >", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_Upload >=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThan(Integer value) {
+            addCriterion("is_Upload <", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThanOrEqualTo(Integer value) {
+            addCriterion("is_Upload <=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIn(List<Integer> values) {
+            addCriterion("is_Upload in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotIn(List<Integer> values) {
+            addCriterion("is_Upload not in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadBetween(Integer value1, Integer value2) {
+            addCriterion("is_Upload between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_Upload not between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhIsNull() {
+            addCriterion("jhbh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhIsNotNull() {
+            addCriterion("jhbh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhEqualTo(String value) {
+            addCriterion("jhbh =", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhNotEqualTo(String value) {
+            addCriterion("jhbh <>", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhGreaterThan(String value) {
+            addCriterion("jhbh >", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhGreaterThanOrEqualTo(String value) {
+            addCriterion("jhbh >=", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhLessThan(String value) {
+            addCriterion("jhbh <", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhLessThanOrEqualTo(String value) {
+            addCriterion("jhbh <=", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhLike(String value) {
+            addCriterion("jhbh like", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhNotLike(String value) {
+            addCriterion("jhbh not like", value, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhIn(List<String> values) {
+            addCriterion("jhbh in", values, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhNotIn(List<String> values) {
+            addCriterion("jhbh not in", values, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhBetween(String value1, String value2) {
+            addCriterion("jhbh between", value1, value2, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJhbhNotBetween(String value1, String value2) {
+            addCriterion("jhbh not between", value1, value2, "jhbh");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndIsNull() {
+            addCriterion("jkq_end is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndIsNotNull() {
+            addCriterion("jkq_end is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndEqualTo(Date value) {
+            addCriterion("jkq_end =", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndNotEqualTo(Date value) {
+            addCriterion("jkq_end <>", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndGreaterThan(Date value) {
+            addCriterion("jkq_end >", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndGreaterThanOrEqualTo(Date value) {
+            addCriterion("jkq_end >=", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndLessThan(Date value) {
+            addCriterion("jkq_end <", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndLessThanOrEqualTo(Date value) {
+            addCriterion("jkq_end <=", value, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndIn(List<Date> values) {
+            addCriterion("jkq_end in", values, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndNotIn(List<Date> values) {
+            addCriterion("jkq_end not in", values, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndBetween(Date value1, Date value2) {
+            addCriterion("jkq_end between", value1, value2, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andJkqEndNotBetween(Date value1, Date value2) {
+            addCriterion("jkq_end not between", value1, value2, "jkqEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeIsNull() {
+            addCriterion("sqyq_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeIsNotNull() {
+            addCriterion("sqyq_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeEqualTo(Date value) {
+            addCriterion("sqyq_time =", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeNotEqualTo(Date value) {
+            addCriterion("sqyq_time <>", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeGreaterThan(Date value) {
+            addCriterion("sqyq_time >", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("sqyq_time >=", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeLessThan(Date value) {
+            addCriterion("sqyq_time <", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeLessThanOrEqualTo(Date value) {
+            addCriterion("sqyq_time <=", value, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeIn(List<Date> values) {
+            addCriterion("sqyq_time in", values, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeNotIn(List<Date> values) {
+            addCriterion("sqyq_time not in", values, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeBetween(Date value1, Date value2) {
+            addCriterion("sqyq_time between", value1, value2, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqTimeNotBetween(Date value1, Date value2) {
+            addCriterion("sqyq_time not between", value1, value2, "sqyqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIsNull() {
+            addCriterion("yqsq_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIsNotNull() {
+            addCriterion("yqsq_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoEqualTo(String value) {
+            addCriterion("yqsq_no =", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotEqualTo(String value) {
+            addCriterion("yqsq_no <>", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoGreaterThan(String value) {
+            addCriterion("yqsq_no >", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoGreaterThanOrEqualTo(String value) {
+            addCriterion("yqsq_no >=", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLessThan(String value) {
+            addCriterion("yqsq_no <", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLessThanOrEqualTo(String value) {
+            addCriterion("yqsq_no <=", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLike(String value) {
+            addCriterion("yqsq_no like", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotLike(String value) {
+            addCriterion("yqsq_no not like", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIn(List<String> values) {
+            addCriterion("yqsq_no in", values, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotIn(List<String> values) {
+            addCriterion("yqsq_no not in", values, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoBetween(String value1, String value2) {
+            addCriterion("yqsq_no between", value1, value2, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotBetween(String value1, String value2) {
+            addCriterion("yqsq_no not between", value1, value2, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_kcgl_jkqyq_apply_default
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_kcgl_jkqyq_apply_default 2019-10-28
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,205 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageKcglJkqyqDefault {
+    private Integer id;
+
+    private Integer orgId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+
+    private String yqsqNo;
+
+    private String yqsqdwname;
+
+    private String cqyfzr;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date sqrq;
+
+    private Integer isUpload;
+
+    private String applyIeda;
+
+    private String sqyqReason;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 创建时间
+     * @return create_date 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 延期申请单号
+     * @return yqsq_no 延期申请单号
+     */
+    public String getYqsqNo() {
+        return yqsqNo;
+    }
+
+    /**
+     * 延期申请单号
+     * @param yqsqNo 延期申请单号
+     */
+    public void setYqsqNo(String yqsqNo) {
+        this.yqsqNo = yqsqNo == null ? null : yqsqNo.trim();
+    }
+
+    /**
+     * 延期申请企业
+     * @return yqsqdwname 延期申请企业
+     */
+    public String getYqsqdwname() {
+        return yqsqdwname;
+    }
+
+    /**
+     * 延期申请企业
+     * @param yqsqdwname 延期申请企业
+     */
+    public void setYqsqdwname(String yqsqdwname) {
+        this.yqsqdwname = yqsqdwname == null ? null : yqsqdwname.trim();
+    }
+
+    /**
+     * 承储企业负责人
+     * @return cqyfzr 承储企业负责人
+     */
+    public String getCqyfzr() {
+        return cqyfzr;
+    }
+
+    /**
+     * 承储企业负责人
+     * @param cqyfzr 承储企业负责人
+     */
+    public void setCqyfzr(String cqyfzr) {
+        this.cqyfzr = cqyfzr == null ? null : cqyfzr.trim();
+    }
+
+    /**
+     * 申请日期
+     * @return sqrq 申请日期
+     */
+    public Date getSqrq() {
+        return sqrq;
+    }
+
+    /**
+     * 申请日期
+     * @param sqrq 申请日期
+     */
+    public void setSqrq(Date sqrq) {
+        this.sqrq = sqrq;
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     * @return is_Upload 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     */
+    public Integer getIsUpload() {
+        return isUpload;
+    }
+
+    /**
+     * 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     * @param isUpload 是否上传(0待上传,1审批中,2审批通过,3审批驳回)
+     */
+    public void setIsUpload(Integer isUpload) {
+        this.isUpload = isUpload;
+    }
+
+    /**
+     * 审批意见
+     * @return apply_ieda 审批意见
+     */
+    public String getApplyIeda() {
+        return applyIeda;
+    }
+
+    /**
+     * 审批意见
+     * @param applyIeda 审批意见
+     */
+    public void setApplyIeda(String applyIeda) {
+        this.applyIeda = applyIeda == null ? null : applyIeda.trim();
+    }
+
+    /**
+     * 申请延期原因
+     * @return sqyq_reason 申请延期原因
+     */
+    public String getSqyqReason() {
+        return sqyqReason;
+    }
+
+    /**
+     * 申请延期原因
+     * @param sqyqReason 申请延期原因
+     */
+    public void setSqyqReason(String sqyqReason) {
+        this.sqyqReason = sqyqReason == null ? null : sqyqReason.trim();
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,929 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageKcglJkqyqDefaultExample {
+    /**
+     * storage_kcgl_jkqyq_default
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_kcgl_jkqyq_default
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_kcgl_jkqyq_default
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageKcglJkqyqDefaultExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_kcgl_jkqyq_default 2019-10-28
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("create_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("create_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(Date value) {
+            addCriterion("create_date =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(Date value) {
+            addCriterion("create_date <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(Date value) {
+            addCriterion("create_date >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_date >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(Date value) {
+            addCriterion("create_date <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(Date value) {
+            addCriterion("create_date <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<Date> values) {
+            addCriterion("create_date in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<Date> values) {
+            addCriterion("create_date not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(Date value1, Date value2) {
+            addCriterion("create_date between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(Date value1, Date value2) {
+            addCriterion("create_date not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIsNull() {
+            addCriterion("yqsq_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIsNotNull() {
+            addCriterion("yqsq_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoEqualTo(String value) {
+            addCriterion("yqsq_no =", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotEqualTo(String value) {
+            addCriterion("yqsq_no <>", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoGreaterThan(String value) {
+            addCriterion("yqsq_no >", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoGreaterThanOrEqualTo(String value) {
+            addCriterion("yqsq_no >=", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLessThan(String value) {
+            addCriterion("yqsq_no <", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLessThanOrEqualTo(String value) {
+            addCriterion("yqsq_no <=", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoLike(String value) {
+            addCriterion("yqsq_no like", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotLike(String value) {
+            addCriterion("yqsq_no not like", value, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoIn(List<String> values) {
+            addCriterion("yqsq_no in", values, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotIn(List<String> values) {
+            addCriterion("yqsq_no not in", values, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoBetween(String value1, String value2) {
+            addCriterion("yqsq_no between", value1, value2, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqNoNotBetween(String value1, String value2) {
+            addCriterion("yqsq_no not between", value1, value2, "yqsqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameIsNull() {
+            addCriterion("yqsqdwname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameIsNotNull() {
+            addCriterion("yqsqdwname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameEqualTo(String value) {
+            addCriterion("yqsqdwname =", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameNotEqualTo(String value) {
+            addCriterion("yqsqdwname <>", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameGreaterThan(String value) {
+            addCriterion("yqsqdwname >", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameGreaterThanOrEqualTo(String value) {
+            addCriterion("yqsqdwname >=", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameLessThan(String value) {
+            addCriterion("yqsqdwname <", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameLessThanOrEqualTo(String value) {
+            addCriterion("yqsqdwname <=", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameLike(String value) {
+            addCriterion("yqsqdwname like", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameNotLike(String value) {
+            addCriterion("yqsqdwname not like", value, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameIn(List<String> values) {
+            addCriterion("yqsqdwname in", values, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameNotIn(List<String> values) {
+            addCriterion("yqsqdwname not in", values, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameBetween(String value1, String value2) {
+            addCriterion("yqsqdwname between", value1, value2, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andYqsqdwnameNotBetween(String value1, String value2) {
+            addCriterion("yqsqdwname not between", value1, value2, "yqsqdwname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrIsNull() {
+            addCriterion("cqyfzr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrIsNotNull() {
+            addCriterion("cqyfzr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrEqualTo(String value) {
+            addCriterion("cqyfzr =", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrNotEqualTo(String value) {
+            addCriterion("cqyfzr <>", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrGreaterThan(String value) {
+            addCriterion("cqyfzr >", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrGreaterThanOrEqualTo(String value) {
+            addCriterion("cqyfzr >=", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrLessThan(String value) {
+            addCriterion("cqyfzr <", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrLessThanOrEqualTo(String value) {
+            addCriterion("cqyfzr <=", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrLike(String value) {
+            addCriterion("cqyfzr like", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrNotLike(String value) {
+            addCriterion("cqyfzr not like", value, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrIn(List<String> values) {
+            addCriterion("cqyfzr in", values, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrNotIn(List<String> values) {
+            addCriterion("cqyfzr not in", values, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrBetween(String value1, String value2) {
+            addCriterion("cqyfzr between", value1, value2, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andCqyfzrNotBetween(String value1, String value2) {
+            addCriterion("cqyfzr not between", value1, value2, "cqyfzr");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqIsNull() {
+            addCriterion("sqrq is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqIsNotNull() {
+            addCriterion("sqrq is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqEqualTo(Date value) {
+            addCriterion("sqrq =", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqNotEqualTo(Date value) {
+            addCriterion("sqrq <>", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqGreaterThan(Date value) {
+            addCriterion("sqrq >", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqGreaterThanOrEqualTo(Date value) {
+            addCriterion("sqrq >=", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqLessThan(Date value) {
+            addCriterion("sqrq <", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqLessThanOrEqualTo(Date value) {
+            addCriterion("sqrq <=", value, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqIn(List<Date> values) {
+            addCriterion("sqrq in", values, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqNotIn(List<Date> values) {
+            addCriterion("sqrq not in", values, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqBetween(Date value1, Date value2) {
+            addCriterion("sqrq between", value1, value2, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqrqNotBetween(Date value1, Date value2) {
+            addCriterion("sqrq not between", value1, value2, "sqrq");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNull() {
+            addCriterion("is_Upload is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNotNull() {
+            addCriterion("is_Upload is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadEqualTo(Integer value) {
+            addCriterion("is_Upload =", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotEqualTo(Integer value) {
+            addCriterion("is_Upload <>", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThan(Integer value) {
+            addCriterion("is_Upload >", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_Upload >=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThan(Integer value) {
+            addCriterion("is_Upload <", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThanOrEqualTo(Integer value) {
+            addCriterion("is_Upload <=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIn(List<Integer> values) {
+            addCriterion("is_Upload in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotIn(List<Integer> values) {
+            addCriterion("is_Upload not in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadBetween(Integer value1, Integer value2) {
+            addCriterion("is_Upload between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_Upload not between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaIsNull() {
+            addCriterion("apply_ieda is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaIsNotNull() {
+            addCriterion("apply_ieda is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaEqualTo(String value) {
+            addCriterion("apply_ieda =", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaNotEqualTo(String value) {
+            addCriterion("apply_ieda <>", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaGreaterThan(String value) {
+            addCriterion("apply_ieda >", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaGreaterThanOrEqualTo(String value) {
+            addCriterion("apply_ieda >=", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaLessThan(String value) {
+            addCriterion("apply_ieda <", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaLessThanOrEqualTo(String value) {
+            addCriterion("apply_ieda <=", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaLike(String value) {
+            addCriterion("apply_ieda like", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaNotLike(String value) {
+            addCriterion("apply_ieda not like", value, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaIn(List<String> values) {
+            addCriterion("apply_ieda in", values, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaNotIn(List<String> values) {
+            addCriterion("apply_ieda not in", values, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaBetween(String value1, String value2) {
+            addCriterion("apply_ieda between", value1, value2, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andApplyIedaNotBetween(String value1, String value2) {
+            addCriterion("apply_ieda not between", value1, value2, "applyIeda");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonIsNull() {
+            addCriterion("sqyq_reason is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonIsNotNull() {
+            addCriterion("sqyq_reason is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonEqualTo(String value) {
+            addCriterion("sqyq_reason =", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonNotEqualTo(String value) {
+            addCriterion("sqyq_reason <>", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonGreaterThan(String value) {
+            addCriterion("sqyq_reason >", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonGreaterThanOrEqualTo(String value) {
+            addCriterion("sqyq_reason >=", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonLessThan(String value) {
+            addCriterion("sqyq_reason <", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonLessThanOrEqualTo(String value) {
+            addCriterion("sqyq_reason <=", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonLike(String value) {
+            addCriterion("sqyq_reason like", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonNotLike(String value) {
+            addCriterion("sqyq_reason not like", value, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonIn(List<String> values) {
+            addCriterion("sqyq_reason in", values, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonNotIn(List<String> values) {
+            addCriterion("sqyq_reason not in", values, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonBetween(String value1, String value2) {
+            addCriterion("sqyq_reason between", value1, value2, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andSqyqReasonNotBetween(String value1, String value2) {
+            addCriterion("sqyq_reason not between", value1, value2, "sqyqReason");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_kcgl_jkqyq_default
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_kcgl_jkqyq_default 2019-10-28
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,167 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class StorageOverheadSet {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Integer lsxz;
+
+    private Integer overheadPeriod;
+
+    private Integer warningDay;
+
+    private String createname;
+
+    private Date createDate;
+
+    private Integer isUpload;
+
+    private Date updatetime;
+
+    /**
+     * ID
+     * @return id ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * ID
+     * @param id ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 
+     */
+    public Integer getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 
+     */
+    public void setLsxz(Integer lsxz) {
+        this.lsxz = lsxz;
+    }
+
+    /**
+     * 架空期
+     * @return overhead_period 架空期
+     */
+    public Integer getOverheadPeriod() {
+        return overheadPeriod;
+    }
+
+    /**
+     * 架空期
+     * @param overheadPeriod 架空期
+     */
+    public void setOverheadPeriod(Integer overheadPeriod) {
+        this.overheadPeriod = overheadPeriod;
+    }
+
+    /**
+     * 架空期预警天数
+     * @return warning_day 架空期预警天数
+     */
+    public Integer getWarningDay() {
+        return warningDay;
+    }
+
+    /**
+     * 架空期预警天数
+     * @param warningDay 架空期预警天数
+     */
+    public void setWarningDay(Integer warningDay) {
+        this.warningDay = warningDay;
+    }
+
+    /**
+     * 创建人
+     * @return createName 创建人
+     */
+    public String getCreatename() {
+        return createname;
+    }
+
+    /**
+     * 创建人
+     * @param createname 创建人
+     */
+    public void setCreatename(String createname) {
+        this.createname = createname == null ? null : createname.trim();
+    }
+
+    /**
+     * 创建日期
+     * @return create_date 创建日期
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建日期
+     * @param createDate 创建日期
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 是否上传(NULL未上传,1已上传,2上传失败,0需要再次上传)
+     * @return is_upload 是否上传(NULL未上传,1已上传,2上传失败,0需要再次上传)
+     */
+    public Integer getIsUpload() {
+        return isUpload;
+    }
+
+    /**
+     * 是否上传(NULL未上传,1已上传,2上传失败,0需要再次上传)
+     * @param isUpload 是否上传(NULL未上传,1已上传,2上传失败,0需要再次上传)
+     */
+    public void setIsUpload(Integer isUpload) {
+        this.isUpload = isUpload;
+    }
+
+    /**
+     * 更新时间
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 更新时间
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

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

@@ -0,0 +1,769 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageOverheadSetExample {
+    /**
+     * storage_overhead_set
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_overhead_set
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_overhead_set
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageOverheadSetExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_overhead_set 2019-05-23
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzIsNull() {
+            addCriterion("lsxz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzIsNotNull() {
+            addCriterion("lsxz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzEqualTo(Integer value) {
+            addCriterion("lsxz =", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzNotEqualTo(Integer value) {
+            addCriterion("lsxz <>", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzGreaterThan(Integer value) {
+            addCriterion("lsxz >", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzGreaterThanOrEqualTo(Integer value) {
+            addCriterion("lsxz >=", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzLessThan(Integer value) {
+            addCriterion("lsxz <", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzLessThanOrEqualTo(Integer value) {
+            addCriterion("lsxz <=", value, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzIn(List<Integer> values) {
+            addCriterion("lsxz in", values, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzNotIn(List<Integer> values) {
+            addCriterion("lsxz not in", values, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzBetween(Integer value1, Integer value2) {
+            addCriterion("lsxz between", value1, value2, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLsxzNotBetween(Integer value1, Integer value2) {
+            addCriterion("lsxz not between", value1, value2, "lsxz");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodIsNull() {
+            addCriterion("overhead_period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodIsNotNull() {
+            addCriterion("overhead_period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodEqualTo(Integer value) {
+            addCriterion("overhead_period =", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodNotEqualTo(Integer value) {
+            addCriterion("overhead_period <>", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodGreaterThan(Integer value) {
+            addCriterion("overhead_period >", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("overhead_period >=", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodLessThan(Integer value) {
+            addCriterion("overhead_period <", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("overhead_period <=", value, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodIn(List<Integer> values) {
+            addCriterion("overhead_period in", values, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodNotIn(List<Integer> values) {
+            addCriterion("overhead_period not in", values, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("overhead_period between", value1, value2, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverheadPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("overhead_period not between", value1, value2, "overheadPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayIsNull() {
+            addCriterion("warning_day is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayIsNotNull() {
+            addCriterion("warning_day is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayEqualTo(Integer value) {
+            addCriterion("warning_day =", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayNotEqualTo(Integer value) {
+            addCriterion("warning_day <>", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayGreaterThan(Integer value) {
+            addCriterion("warning_day >", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warning_day >=", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayLessThan(Integer value) {
+            addCriterion("warning_day <", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayLessThanOrEqualTo(Integer value) {
+            addCriterion("warning_day <=", value, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayIn(List<Integer> values) {
+            addCriterion("warning_day in", values, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayNotIn(List<Integer> values) {
+            addCriterion("warning_day not in", values, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayBetween(Integer value1, Integer value2) {
+            addCriterion("warning_day between", value1, value2, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningDayNotBetween(Integer value1, Integer value2) {
+            addCriterion("warning_day not between", value1, value2, "warningDay");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameIsNull() {
+            addCriterion("createName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameIsNotNull() {
+            addCriterion("createName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameEqualTo(String value) {
+            addCriterion("createName =", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameNotEqualTo(String value) {
+            addCriterion("createName <>", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameGreaterThan(String value) {
+            addCriterion("createName >", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameGreaterThanOrEqualTo(String value) {
+            addCriterion("createName >=", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameLessThan(String value) {
+            addCriterion("createName <", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameLessThanOrEqualTo(String value) {
+            addCriterion("createName <=", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameLike(String value) {
+            addCriterion("createName like", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameNotLike(String value) {
+            addCriterion("createName not like", value, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameIn(List<String> values) {
+            addCriterion("createName in", values, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameNotIn(List<String> values) {
+            addCriterion("createName not in", values, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameBetween(String value1, String value2) {
+            addCriterion("createName between", value1, value2, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatenameNotBetween(String value1, String value2) {
+            addCriterion("createName not between", value1, value2, "createname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("create_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("create_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(Date value) {
+            addCriterion("create_date =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(Date value) {
+            addCriterion("create_date <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(Date value) {
+            addCriterion("create_date >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_date >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(Date value) {
+            addCriterion("create_date <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(Date value) {
+            addCriterion("create_date <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<Date> values) {
+            addCriterion("create_date in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<Date> values) {
+            addCriterion("create_date not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(Date value1, Date value2) {
+            addCriterion("create_date between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(Date value1, Date value2) {
+            addCriterion("create_date not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNull() {
+            addCriterion("is_upload is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIsNotNull() {
+            addCriterion("is_upload is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadEqualTo(Integer value) {
+            addCriterion("is_upload =", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotEqualTo(Integer value) {
+            addCriterion("is_upload <>", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThan(Integer value) {
+            addCriterion("is_upload >", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_upload >=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThan(Integer value) {
+            addCriterion("is_upload <", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadLessThanOrEqualTo(Integer value) {
+            addCriterion("is_upload <=", value, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadIn(List<Integer> values) {
+            addCriterion("is_upload in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotIn(List<Integer> values) {
+            addCriterion("is_upload not in", values, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadBetween(Integer value1, Integer value2) {
+            addCriterion("is_upload between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsUploadNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_upload not between", value1, value2, "isUpload");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_overhead_set
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_overhead_set 2019-05-23
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class StorageQualityEvent {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Date inputDate;
+
+    private Integer inputPersonId;
+
+    private String inputPersonName;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer lspz;
+
+    private String bgy;
+
+    private String czwt;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 登记日期
+     * @return input_date 登记日期
+     */
+    public Date getInputDate() {
+        return inputDate;
+    }
+
+    /**
+     * 登记日期
+     * @param inputDate 登记日期
+     */
+    public void setInputDate(Date inputDate) {
+        this.inputDate = inputDate;
+    }
+
+    /**
+     * 登记人ID
+     * @return input_person_id 登记人ID
+     */
+    public Integer getInputPersonId() {
+        return inputPersonId;
+    }
+
+    /**
+     * 登记人ID
+     * @param inputPersonId 登记人ID
+     */
+    public void setInputPersonId(Integer inputPersonId) {
+        this.inputPersonId = inputPersonId;
+    }
+
+    /**
+     * 登记人名称
+     * @return input_person_name 登记人名称
+     */
+    public String getInputPersonName() {
+        return inputPersonName;
+    }
+
+    /**
+     * 登记人名称
+     * @param inputPersonName 登记人名称
+     */
+    public void setInputPersonName(String inputPersonName) {
+        this.inputPersonName = inputPersonName == null ? null : inputPersonName.trim();
+    }
+
+    /**
+     * 仓房ID
+     * @return house_id 仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param houseId 仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位ID
+     * @return ware_id 货位ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 货位ID
+     * @param wareId 货位ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 保管员
+     * @return bgy 保管员
+     */
+    public String getBgy() {
+        return bgy;
+    }
+
+    /**
+     * 保管员
+     * @param bgy 保管员
+     */
+    public void setBgy(String bgy) {
+        this.bgy = bgy == null ? null : bgy.trim();
+    }
+
+    /**
+     * 存在问题
+     * @return czwt 存在问题
+     */
+    public String getCzwt() {
+        return czwt;
+    }
+
+    /**
+     * 存在问题
+     * @param czwt 存在问题
+     */
+    public void setCzwt(String czwt) {
+        this.czwt = czwt == null ? null : czwt.trim();
+    }
+}

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

@@ -0,0 +1,849 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageQualityEventExample {
+    /**
+     * storage_quality_event
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_quality_event
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_quality_event
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageQualityEventExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_quality_event 2018-10-25
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIsNull() {
+            addCriterion("input_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIsNotNull() {
+            addCriterion("input_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateEqualTo(Date value) {
+            addCriterion("input_date =", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotEqualTo(Date value) {
+            addCriterion("input_date <>", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateGreaterThan(Date value) {
+            addCriterion("input_date >", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("input_date >=", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateLessThan(Date value) {
+            addCriterion("input_date <", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateLessThanOrEqualTo(Date value) {
+            addCriterion("input_date <=", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIn(List<Date> values) {
+            addCriterion("input_date in", values, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotIn(List<Date> values) {
+            addCriterion("input_date not in", values, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateBetween(Date value1, Date value2) {
+            addCriterion("input_date between", value1, value2, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotBetween(Date value1, Date value2) {
+            addCriterion("input_date not between", value1, value2, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIsNull() {
+            addCriterion("input_person_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIsNotNull() {
+            addCriterion("input_person_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdEqualTo(Integer value) {
+            addCriterion("input_person_id =", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotEqualTo(Integer value) {
+            addCriterion("input_person_id <>", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdGreaterThan(Integer value) {
+            addCriterion("input_person_id >", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("input_person_id >=", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdLessThan(Integer value) {
+            addCriterion("input_person_id <", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdLessThanOrEqualTo(Integer value) {
+            addCriterion("input_person_id <=", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIn(List<Integer> values) {
+            addCriterion("input_person_id in", values, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotIn(List<Integer> values) {
+            addCriterion("input_person_id not in", values, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdBetween(Integer value1, Integer value2) {
+            addCriterion("input_person_id between", value1, value2, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("input_person_id not between", value1, value2, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameIsNull() {
+            addCriterion("input_person_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameIsNotNull() {
+            addCriterion("input_person_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameEqualTo(String value) {
+            addCriterion("input_person_name =", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameNotEqualTo(String value) {
+            addCriterion("input_person_name <>", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameGreaterThan(String value) {
+            addCriterion("input_person_name >", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameGreaterThanOrEqualTo(String value) {
+            addCriterion("input_person_name >=", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameLessThan(String value) {
+            addCriterion("input_person_name <", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameLessThanOrEqualTo(String value) {
+            addCriterion("input_person_name <=", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameLike(String value) {
+            addCriterion("input_person_name like", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameNotLike(String value) {
+            addCriterion("input_person_name not like", value, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameIn(List<String> values) {
+            addCriterion("input_person_name in", values, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameNotIn(List<String> values) {
+            addCriterion("input_person_name not in", values, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameBetween(String value1, String value2) {
+            addCriterion("input_person_name between", value1, value2, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonNameNotBetween(String value1, String value2) {
+            addCriterion("input_person_name not between", value1, value2, "inputPersonName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(Integer value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(Integer value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(Integer value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(Integer value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<Integer> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<Integer> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdIsNull() {
+            addCriterion("ware_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdIsNotNull() {
+            addCriterion("ware_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdEqualTo(Integer value) {
+            addCriterion("ware_id =", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdNotEqualTo(Integer value) {
+            addCriterion("ware_id <>", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdGreaterThan(Integer value) {
+            addCriterion("ware_id >", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ware_id >=", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdLessThan(Integer value) {
+            addCriterion("ware_id <", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ware_id <=", value, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdIn(List<Integer> values) {
+            addCriterion("ware_id in", values, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdNotIn(List<Integer> values) {
+            addCriterion("ware_id not in", values, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdBetween(Integer value1, Integer value2) {
+            addCriterion("ware_id between", value1, value2, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWareIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ware_id not between", value1, value2, "wareId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzIsNull() {
+            addCriterion("lspz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzIsNotNull() {
+            addCriterion("lspz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzEqualTo(Integer value) {
+            addCriterion("lspz =", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzNotEqualTo(Integer value) {
+            addCriterion("lspz <>", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzGreaterThan(Integer value) {
+            addCriterion("lspz >", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzGreaterThanOrEqualTo(Integer value) {
+            addCriterion("lspz >=", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzLessThan(Integer value) {
+            addCriterion("lspz <", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzLessThanOrEqualTo(Integer value) {
+            addCriterion("lspz <=", value, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzIn(List<Integer> values) {
+            addCriterion("lspz in", values, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzNotIn(List<Integer> values) {
+            addCriterion("lspz not in", values, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzBetween(Integer value1, Integer value2) {
+            addCriterion("lspz between", value1, value2, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andLspzNotBetween(Integer value1, Integer value2) {
+            addCriterion("lspz not between", value1, value2, "lspz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyIsNull() {
+            addCriterion("bgy is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyIsNotNull() {
+            addCriterion("bgy is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyEqualTo(String value) {
+            addCriterion("bgy =", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyNotEqualTo(String value) {
+            addCriterion("bgy <>", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyGreaterThan(String value) {
+            addCriterion("bgy >", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyGreaterThanOrEqualTo(String value) {
+            addCriterion("bgy >=", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyLessThan(String value) {
+            addCriterion("bgy <", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyLessThanOrEqualTo(String value) {
+            addCriterion("bgy <=", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyLike(String value) {
+            addCriterion("bgy like", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyNotLike(String value) {
+            addCriterion("bgy not like", value, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyIn(List<String> values) {
+            addCriterion("bgy in", values, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyNotIn(List<String> values) {
+            addCriterion("bgy not in", values, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyBetween(String value1, String value2) {
+            addCriterion("bgy between", value1, value2, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgyNotBetween(String value1, String value2) {
+            addCriterion("bgy not between", value1, value2, "bgy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtIsNull() {
+            addCriterion("czwt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtIsNotNull() {
+            addCriterion("czwt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtEqualTo(String value) {
+            addCriterion("czwt =", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtNotEqualTo(String value) {
+            addCriterion("czwt <>", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtGreaterThan(String value) {
+            addCriterion("czwt >", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtGreaterThanOrEqualTo(String value) {
+            addCriterion("czwt >=", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtLessThan(String value) {
+            addCriterion("czwt <", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtLessThanOrEqualTo(String value) {
+            addCriterion("czwt <=", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtLike(String value) {
+            addCriterion("czwt like", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtNotLike(String value) {
+            addCriterion("czwt not like", value, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtIn(List<String> values) {
+            addCriterion("czwt in", values, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtNotIn(List<String> values) {
+            addCriterion("czwt not in", values, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtBetween(String value1, String value2) {
+            addCriterion("czwt between", value1, value2, "czwt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCzwtNotBetween(String value1, String value2) {
+            addCriterion("czwt not between", value1, value2, "czwt");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_quality_event
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_quality_event 2018-10-25
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.chinaitop.depot.storage.model;
+
+public class StorageQualitycheckSon {
+    private Integer id;
+
+    private Integer qualitycheckId;
+
+    private Integer numbering;
+
+    private String setValue;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 质量检查信息表主键
+     * @return qualitycheck_id 质量检查信息表主键
+     */
+    public Integer getQualitycheckId() {
+        return qualitycheckId;
+    }
+
+    /**
+     * 质量检查信息表主键
+     * @param qualitycheckId 质量检查信息表主键
+     */
+    public void setQualitycheckId(Integer qualitycheckId) {
+        this.qualitycheckId = qualitycheckId;
+    }
+
+    /**
+     * 设置保存编号
+     * @return numbering 设置保存编号
+     */
+    public Integer getNumbering() {
+        return numbering;
+    }
+
+    /**
+     * 设置保存编号
+     * @param numbering 设置保存编号
+     */
+    public void setNumbering(Integer numbering) {
+        this.numbering = numbering;
+    }
+
+    /**
+     * 输入的内容
+     * @return set_value 输入的内容
+     */
+    public String getSetValue() {
+        return setValue;
+    }
+
+    /**
+     * 输入的内容
+     * @param setValue 输入的内容
+     */
+    public void setSetValue(String setValue) {
+        this.setValue = setValue == null ? null : setValue.trim();
+    }
+}

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

@@ -0,0 +1,468 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StorageQualitycheckSonExample {
+    /**
+     * storage_qualitycheck_son
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_qualitycheck_son
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_qualitycheck_son
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageQualitycheckSonExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_qualitycheck_son 2017-12-23
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIsNull() {
+            addCriterion("qualitycheck_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIsNotNull() {
+            addCriterion("qualitycheck_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdEqualTo(Integer value) {
+            addCriterion("qualitycheck_id =", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <>", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThan(Integer value) {
+            addCriterion("qualitycheck_id >", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id >=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThan(Integer value) {
+            addCriterion("qualitycheck_id <", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIn(List<Integer> values) {
+            addCriterion("qualitycheck_id in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotIn(List<Integer> values) {
+            addCriterion("qualitycheck_id not in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id not between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIsNull() {
+            addCriterion("numbering is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIsNotNull() {
+            addCriterion("numbering is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingEqualTo(Integer value) {
+            addCriterion("numbering =", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotEqualTo(Integer value) {
+            addCriterion("numbering <>", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingGreaterThan(Integer value) {
+            addCriterion("numbering >", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingGreaterThanOrEqualTo(Integer value) {
+            addCriterion("numbering >=", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingLessThan(Integer value) {
+            addCriterion("numbering <", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingLessThanOrEqualTo(Integer value) {
+            addCriterion("numbering <=", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIn(List<Integer> values) {
+            addCriterion("numbering in", values, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotIn(List<Integer> values) {
+            addCriterion("numbering not in", values, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingBetween(Integer value1, Integer value2) {
+            addCriterion("numbering between", value1, value2, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotBetween(Integer value1, Integer value2) {
+            addCriterion("numbering not between", value1, value2, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIsNull() {
+            addCriterion("set_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIsNotNull() {
+            addCriterion("set_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueEqualTo(String value) {
+            addCriterion("set_value =", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotEqualTo(String value) {
+            addCriterion("set_value <>", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueGreaterThan(String value) {
+            addCriterion("set_value >", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueGreaterThanOrEqualTo(String value) {
+            addCriterion("set_value >=", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLessThan(String value) {
+            addCriterion("set_value <", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLessThanOrEqualTo(String value) {
+            addCriterion("set_value <=", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLike(String value) {
+            addCriterion("set_value like", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotLike(String value) {
+            addCriterion("set_value not like", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIn(List<String> values) {
+            addCriterion("set_value in", values, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotIn(List<String> values) {
+            addCriterion("set_value not in", values, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueBetween(String value1, String value2) {
+            addCriterion("set_value between", value1, value2, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotBetween(String value1, String value2) {
+            addCriterion("set_value not between", value1, value2, "setValue");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_qualitycheck_son
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_qualitycheck_son 2017-12-23
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,239 @@
+package com.chinaitop.depot.storage.model;
+
+public class StorageStorehouseBusiness {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+
+    private String pz;
+
+    private String fullStorehouseStatus;
+
+    private String aerationStatus;
+
+    private String fumigationStatus;
+
+    private String rkStatus;
+
+    private String ckStatus;
+
+    private String nhlStatus;
+
+    private String remark;
+
+    //业务字段
+    private String storehouseName;//仓房名称
+    private String warehouseName;//货位名称
+
+    /**
+     * 编号
+     * @return id 编号
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 编号
+     * @param id 编号
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 仓房ID
+     * @return storehouse_id 仓房ID
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param storehouseId 仓房ID
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 货位ID
+     * @return warehouse_id 货位ID
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位ID
+     * @param warehouseId 货位ID
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 品种
+     * @return pz 品种
+     */
+    public String getPz() {
+        return pz;
+    }
+
+    /**
+     * 品种
+     * @param pz 品种
+     */
+    public void setPz(String pz) {
+        this.pz = pz == null ? null : pz.trim();
+    }
+
+    /**
+     * 满仓状态:1满仓，0非满仓
+     * @return full_storehouse_status 满仓状态:1满仓，0非满仓
+     */
+    public String getFullStorehouseStatus() {
+        return fullStorehouseStatus;
+    }
+
+    /**
+     * 满仓状态:1满仓，0非满仓
+     * @param fullStorehouseStatus 满仓状态:1满仓，0非满仓
+     */
+    public void setFullStorehouseStatus(String fullStorehouseStatus) {
+        this.fullStorehouseStatus = fullStorehouseStatus == null ? null : fullStorehouseStatus.trim();
+    }
+
+    /**
+     * 通风状态
+     * @return aeration_status 通风状态
+     */
+    public String getAerationStatus() {
+        return aerationStatus;
+    }
+
+    /**
+     * 通风状态
+     * @param aerationStatus 通风状态
+     */
+    public void setAerationStatus(String aerationStatus) {
+        this.aerationStatus = aerationStatus == null ? null : aerationStatus.trim();
+    }
+
+    /**
+     * 熏蒸状态
+     * @return fumigation_status 熏蒸状态
+     */
+    public String getFumigationStatus() {
+        return fumigationStatus;
+    }
+
+    /**
+     * 熏蒸状态
+     * @param fumigationStatus 熏蒸状态
+     */
+    public void setFumigationStatus(String fumigationStatus) {
+        this.fumigationStatus = fumigationStatus == null ? null : fumigationStatus.trim();
+    }
+
+    /**
+     * 入库状态
+     * @return rk_status 入库状态
+     */
+    public String getRkStatus() {
+        return rkStatus;
+    }
+
+    /**
+     * 入库状态
+     * @param rkStatus 入库状态
+     */
+    public void setRkStatus(String rkStatus) {
+        this.rkStatus = rkStatus == null ? null : rkStatus.trim();
+    }
+
+    /**
+     * 出库状态
+     * @return ck_status 出库状态
+     */
+    public String getCkStatus() {
+        return ckStatus;
+    }
+
+    /**
+     * 出库状态
+     * @param ckStatus 出库状态
+     */
+    public void setCkStatus(String ckStatus) {
+        this.ckStatus = ckStatus == null ? null : ckStatus.trim();
+    }
+
+    /**
+     * 内环刘状态
+     * @return nhl_status 内环刘状态
+     */
+    public String getNhlStatus() {
+        return nhlStatus;
+    }
+
+    /**
+     * 内环刘状态
+     * @param nhlStatus 内环刘状态
+     */
+    public void setNhlStatus(String nhlStatus) {
+        this.nhlStatus = nhlStatus == null ? null : nhlStatus.trim();
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getStorehouseName() {
+        return storehouseName;
+    }
+
+    public void setStorehouseName(String storehouseName) {
+        this.storehouseName = storehouseName;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+}

src/main/java/com/chinaitop/depot/storage/model/vo/StorageQualitycheckVo.java

@@ -0,0 +1,209 @@
+package com.chinaitop.depot.storage.model.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @Author: sunhongbing
+ * @Date: 2018/8/27
+ */
+public class StorageQualitycheckVo {
+    private String storehouseType;
+    private BigDecimal designCapacity;
+    private BigDecimal length;
+    private String depotName;
+    private BigDecimal width;
+    private String storehouseCode;
+    private String warehouseCode;
+    private String keeperNames;
+    private String hwxz;
+    private Integer pz;
+    private Integer mxpz;
+    private Double kcsl;
+    private String hwcd;
+    private String scnf;
+    private String wjh;
+    private String scnfName;
+    private String pzCode;
+    private String placeCode;
+    private String companyNature;//组织机构的社会信用代码
+    private String orgCode;
+    private Integer depotId;
+    private Integer qualitycheckId;
+
+    public String getStorehouseType() {
+        return storehouseType;
+    }
+
+    public void setStorehouseType(String storehouseType) {
+        this.storehouseType = storehouseType;
+    }
+
+    public BigDecimal getDesignCapacity() {
+        return designCapacity;
+    }
+
+    public void setDesignCapacity(BigDecimal designCapacity) {
+        this.designCapacity = designCapacity;
+    }
+
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    public String getDepotName() {
+        return depotName;
+    }
+
+    public void setDepotName(String depotName) {
+        this.depotName = depotName;
+    }
+
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    public String getStorehouseCode() {
+        return storehouseCode;
+    }
+
+    public void setStorehouseCode(String storehouseCode) {
+        this.storehouseCode = storehouseCode;
+    }
+
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getKeeperNames() {
+        return keeperNames;
+    }
+
+    public void setKeeperNames(String keeperNames) {
+        this.keeperNames = keeperNames;
+    }
+
+    public String getHwxz() {
+        return hwxz;
+    }
+
+    public void setHwxz(String hwxz) {
+        this.hwxz = hwxz;
+    }
+
+    public Integer getPz() {
+        return pz;
+    }
+
+    public void setPz(Integer pz) {
+        this.pz = pz;
+    }
+
+    public Integer getMxpz() {
+        return mxpz;
+    }
+
+    public void setMxpz(Integer mxpz) {
+        this.mxpz = mxpz;
+    }
+
+    public Double getKcsl() {
+        return kcsl;
+    }
+
+    public void setKcsl(Double kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    public String getHwcd() {
+        return hwcd;
+    }
+
+    public void setHwcd(String hwcd) {
+        this.hwcd = hwcd;
+    }
+
+    public String getScnf() {
+        return scnf;
+    }
+
+    public void setScnf(String scnf) {
+        this.scnf = scnf;
+    }
+
+    public String getWjh() {
+        return wjh;
+    }
+
+    public void setWjh(String wjh) {
+        this.wjh = wjh;
+    }
+
+    public String getScnfName() {
+        return scnfName;
+    }
+
+    public void setScnfName(String scnfName) {
+        this.scnfName = scnfName;
+    }
+
+    public String getPzCode() {
+        return pzCode;
+    }
+
+    public void setPzCode(String pzCode) {
+        this.pzCode = pzCode;
+    }
+
+    public String getPlaceCode() {
+        return placeCode;
+    }
+
+    public void setPlaceCode(String placeCode) {
+        this.placeCode = placeCode;
+    }
+
+    public String getCompanyNature() {
+        return companyNature;
+    }
+
+    public void setCompanyNature(String companyNature) {
+        this.companyNature = companyNature;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    public Integer getQualitycheckId() {
+        return qualitycheckId;
+    }
+
+    public void setQualitycheckId(Integer qualitycheckId) {
+        this.qualitycheckId = qualitycheckId;
+    }
+}

src/main/java/com/chinaitop/depot/storage/quartz/StorageHouseBusinessQuartz.java

@@ -0,0 +1,29 @@
+/**
+ * 
+ */
+package com.chinaitop.depot.storage.quartz;
+
+import com.chinaitop.depot.storage.service.StorageStorehouseBusinessService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>Title: StorageHouseBusiness</p>
+ * <p>Description: </p>
+ * @author yaoyabin
+ * @date 2018年5月7日 下午4:16:10
+ */
+@Component("storageHouseBusinessQuartz")
+public class StorageHouseBusinessQuartz {
+    @Resource
+    private StorageStorehouseBusinessService businessService;
+    
+    public void insertStorehouseBusinessFromFcbgz() {
+        //从分仓保管账取出仓房和货位以及品种加入到仓房业务信息表中
+
+       /* System.out.println(ParameterUtil.getSysDateTime() + "开始插入仓房业务信息表...");
+        businessService.saveStorehouseBusinessFromFcbgz();*/
+
+    }
+}

src/main/java/com/chinaitop/depot/storage/service/StorageChangeStoragehouseTaskDetailService.java

@@ -0,0 +1,37 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample;
+
+public interface StorageChangeStoragehouseTaskDetailService {
+	/**
+	 * 新增倒仓数据
+	 * @param storageChangeStoragehouseTask
+	 */
+	public void addStorageChangeStoragehouseTaskDetail(StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail);
+
+	public  Map<String, Object> findByStoreData(Integer id);
+	/**
+	 * 查询列表显示数据
+	 * @param detailExamle
+	 * @return
+	 */
+	public List<StorageChangeStoragehouseTaskDetail> selectByExample(StorageChangeStoragehouseTaskDetailExample detailExamle);
+	/**
+	 * 修改子表数据
+	 * @param storageChangeStoragehouseTaskDetail
+	 */
+	public void updateStorageChangeStoragehouseTaskDetail(StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail);
+	/**
+	 * 根据倒仓单号删除子表一条倒仓数据
+	 * @param detailExamle
+	 */
+	public void removeChangeData(StorageChangeStoragehouseTaskDetailExample detailExamle);
+
+	public void updateDcStatus1(StorageChangeStoragehouseTaskDetail detail);
+
+
+}

src/main/java/com/chinaitop/depot/storage/service/StorageChangeStoragehouseTaskService.java

@@ -0,0 +1,42 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample;
+
+public interface StorageChangeStoragehouseTaskService {
+	
+	/**
+	 * 查询倒仓列表
+	 * @param example
+	 * @return
+	 */
+	List<StorageChangeStoragehouseTask> selectByExample(StorageChangeStoragehouseTaskExample example);
+	
+	/**
+	 * 新增倒仓数据
+	 * @param example
+	 * @return
+	 */
+	public void addStorageChangeStoragehouseTask(StorageChangeStoragehouseTask storageChangeStoragehouseTask);
+	/**
+	 * 修改倒仓数据
+	 * @param storageChangeStoragehouseTask
+	 */
+	public void updateStorageChangeStoragehouseTask(StorageChangeStoragehouseTask storageChangeStoragehouseTask);
+	/**
+	 * 删除一条倒仓数据
+	 * @param example
+	 */
+	public void removeChangeData(StorageChangeStoragehouseTaskExample example);
+
+	void updateDcStatus(StorageChangeStoragehouseTask storageChangeIsUpload);
+
+	void updateFileByFileIdsAndBid(String fileIds, Integer storageId, String fileType);
+
+	List<BusinessFile> getByBid(Integer id, String fileType, Integer orgId, String order);
+
+
+}

src/main/java/com/chinaitop/depot/storage/service/StorageChangeStoragehouseWorkTaskService.java

@@ -0,0 +1,26 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample;
+
+public interface StorageChangeStoragehouseWorkTaskService {
+	/**
+	 * 修改倒仓数据
+	 * @param storageChangeStoragehouseTask
+	 */
+	public void updateStorageChangeStoragehouseTask(StorageChangeStoragehouseWorkTask storageChangeStoragehouseTask);
+	/**
+	 * 增加数据到倒仓工作表
+	 * @param storageChangeStoragehouseWorkTask
+	 */
+	public void addStorageChangeStoragehouseTaskDetail(StorageChangeStoragehouseWorkTask storageChangeStoragehouseWorkTask);
+	/**
+	 * 查询工作表子表数据进行展示
+	 * @param detailExamle
+	 * @return
+	 */
+	public List<StorageChangeStoragehouseWorkTask> selectByExample(StorageChangeStoragehouseWorkTaskExample detailExamle);
+
+}

src/main/java/com/chinaitop/depot/storage/service/StorageDumpService.java

@@ -0,0 +1,41 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.storage.model.StorageDump;
+import com.chinaitop.depot.storage.model.StorageDumpExample;
+
+public interface StorageDumpService {
+
+	/**
+	 * 保存
+	 * @param storageDump
+	 */
+	void save(StorageDump storageDump);
+
+	/**
+	 * 按ID查询数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	StorageDump findByParmaryKey(Integer id);
+
+	/**
+	 * 按照条件查询数据
+	 * 
+	 * @param example
+	 * @return
+	 */
+	List<StorageDump> findCondition(StorageDumpExample example);
+
+	/**
+     * 查询验收通过的数据
+     * 
+     * @param orgId 单位ID
+     * @return
+     */
+	List<Map<String, Object>> selectYswData(Integer orgId);
+
+}

src/main/java/com/chinaitop/depot/storage/service/StorageFoodbasicInfoCheckService.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.storage.service;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample;
+
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/19
+ */
+public interface StorageFoodbasicInfoCheckService {
+    /**
+     * 条件查询foodbasicInfoCheck列表
+     * @param foodbasicInfoCheck
+     * @return
+     */
+    List<StorageFoodbasicInfoCheck> queryByFoodbasicInfoCheck(StorageFoodbasicInfoCheckExample foodbasicInfoCheck);
+    /**
+     * 新增foodbasicInfoCheck信息
+     * @param foodbasicInfoCheck
+     */
+    void save(StorageFoodbasicInfoCheck foodbasicInfoCheck);
+    /**
+     * 根据id查询数据
+     * @param id
+     * @return
+     */
+    StorageFoodbasicInfoCheck loadDataById(int id);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageFoodbasicInfoLocationService.java

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.storage.service;
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample;
+
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/20
+ */
+public interface StorageFoodbasicInfoLocationService {
+    /**
+     * 条件查询houseRepair列表
+     * @param
+     * @return
+     */
+    List<StorageFoodbasicInfoLocation> queryByFoodbasicInfoLocation(StorageFoodbasicInfoLocation location);
+    /**
+     * 新增foodbasicInfoCheck信息
+     * @param foodbasicInfoLocation
+     */
+    void save(StorageFoodbasicInfoLocation foodbasicInfoLocation);
+    /**
+     * 根据id查询数据
+     * @param id
+     * @return
+     */
+    StorageFoodbasicInfoLocation loadDataById(int id);
+
+    /**
+     * 根据原货位号查找该记录
+     * @return
+     */
+     List<StorageFoodbasicInfoLocation> getFoodbasicInfoLocationByWarehouseCode(Integer houseId, Integer wareHouseId);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageFoodbasicInfoService.java

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.storage.service;
+
+
+
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample;
+import com.chinaitop.depot.storage.model.vo.StorageQualitycheckVo;
+
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/26
+ */
+public interface StorageFoodbasicInfoService {
+
+	/**
+	 * 查询粮情专卡列表
+	 * @param example
+	 * @return
+	 */
+	List<StorageFoodbasicinfo> selectByExample(StorageFoodbasicinfo example);
+
+	/**
+	 * 按仓房和货位一组粮情专卡数据
+	 * 
+	 * @param foodbasicinfo 条件集合
+	 * @return
+	 */
+	List<StorageFoodbasicinfo> getByHouseIdAndWarehouseId(StorageFoodbasicinfo foodbasicinfo);
+    
+    /**
+     * 新增
+     * 
+     * @param foodbasicInfo 数据对象
+     */
+    void save(StorageFoodbasicinfo foodbasicInfo, StorageQualitycheckVo qualitycheckVo,Integer orgId);
+	/**
+	 * 根据id查询数据
+	 *
+	 * @param id
+	 * @return
+	 */
+	StorageFoodbasicinfo loadDataById(int id);
+
+	void setFoodBasicInfoHistoryStatus(Integer houseId, Integer warehouseId);
+
+	/**
+	 * 根据条件查询粮情专卡数据
+	 * 
+	 * @param example
+	 * @return
+	 */
+	List<StorageFoodbasicinfo> findByCondition(StorageFoodbasicinfoExample example);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageKcglJkqyqApplyDefaultService.java

@@ -0,0 +1,47 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqApplyDefaultExample;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefault;
+import com.chinaitop.depot.storage.model.StorageKcglJkqyqDefaultExample;
+
+public interface StorageKcglJkqyqApplyDefaultService {
+
+	List<StorageKcglJkqyqDefault> findByList(StorageKcglJkqyqDefaultExample example);
+
+	void addDataKcglJkqyqDefault(StorageKcglJkqyqDefault dataKcglJkqyqDefault);
+
+	void addDataKcglJkqyqDefault1(StorageKcglJkqyqApplyDefault dataKcglJkqyqDefault1);
+
+	void updateDataKcglJkqyqDefault(StorageKcglJkqyqDefault dataKcglJkqyqDefault);
+
+	void updateDataKcglJkqyqDefault1(StorageKcglJkqyqApplyDefault dataKcglJkqyqDefault1);
+
+	List<StorageKcglJkqyqDefault> selectByExample(StorageKcglJkqyqDefaultExample example);
+
+	List<StorageKcglJkqyqApplyDefault> selectBy1Example(StorageKcglJkqyqApplyDefaultExample detailExamle);
+
+	void removeOverData(StorageKcglJkqyqDefaultExample example);
+
+	void removeOver1Data(StorageKcglJkqyqApplyDefaultExample detailExamle);
+
+	void updateJkqIsUpload(StorageKcglJkqyqDefault dataKcglJkq);
+
+	void updateJkq1Status(StorageKcglJkqyqApplyDefault dataKcglJkq1);
+
+	void updateJkqStatus(StorageKcglJkqyqDefault dataKcglJkqyqDefault);
+
+	void updateFileByFileIdsAndBid(String fileIds, Integer yqsqId, String fileType);
+
+	List<BusinessFile> getByBid(Integer bid, String fileType, Integer orgId, String order);
+
+	List<Map<String, Object>> getjkqPlanList(Map<String, Object> map);
+
+	List<Map<String, Object>> getjkqDataDayList(Map<String, Object> countMap);
+
+	
+}

src/main/java/com/chinaitop/depot/storage/service/StorageOverheadSetService.java

@@ -0,0 +1,44 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.storage.model.StorageOverheadSet;
+import com.chinaitop.depot.storage.model.StorageOverheadSetExample;
+
+public interface StorageOverheadSetService {
+
+	/**
+	 * 添加
+	 * 
+	 * @param storageOverheadSet
+	 */
+	void insert(StorageOverheadSet storageOverheadSet);
+
+	/**
+	 * 修改
+	 * 
+	 * @param example
+	 */
+	void update(StorageOverheadSet storageOverheadSet);
+
+	/**
+	 * 按条件查询数据
+	 * 
+	 * @param example
+	 * @return
+	 */
+	List<StorageOverheadSet> findConditions(StorageOverheadSetExample example);
+
+	/**
+	 * 按ID查询数据
+	 * 
+	 * @param id
+	 * @return
+	 */
+	StorageOverheadSet findByKeyCondition(Integer id);
+
+	List<Map<String, Object>> getOverYqDaysList(Map<String, Object> map);
+
+	List<Map<String, Object>> findOverHeadList(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageQualityEventService.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.storage.model.StorageQualityEvent;
+import com.chinaitop.depot.storage.model.StorageQualityEventExample;
+
+public interface StorageQualityEventService {
+
+	/**
+	 * 质量事件新增
+	 * 
+	 * @param qualityEvent
+	 */
+	void save(StorageQualityEvent qualityEvent);
+
+	/**
+	 * 质量事件查询详情
+	 * 
+	 * @param id
+	 * @return
+	 */
+	StorageQualityEvent findByPrimaryKey(Integer id);
+
+	/**
+	 * 查询质量事件列表
+	 * 
+	 * @param example
+	 * @return
+	 */
+	List<StorageQualityEvent> findByCondition(StorageQualityEventExample example);
+
+	/**
+	 * 修改一条质量事件
+	 * 
+	 * @param qualityEvent
+	 */
+	void update(StorageQualityEvent qualityEvent);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -0,0 +1,121 @@
+package com.chinaitop.depot.storage.service;
+
+import com.chinaitop.depot.storage.model.StorageQualitycheck;
+import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+
+import java.util.List;
+import java.util.Map;
+
+public interface StorageQualitycheckService {
+
+	/**
+	 * 按条件查询qualitycheck列表
+	 *
+	 * @param example
+	 * @return
+	 */
+	List<StorageQualitycheck> findByCondition(StorageQualitycheckExample example);
+
+	/**
+	 * 条件查询qualitycheck列表
+	 *
+	 * @param example
+	 * @return
+	 */
+	List<StorageQualitycheck> queryByQualitycheck(StorageQualitycheck example);
+
+	/**
+	 * 新增qualitycheck信息
+	 *
+	 * @param qualitycheck
+	 */
+	Integer save(StorageQualitycheck qualitycheck);
+
+	/**
+	 * 新增qualitycheck字表信息
+	 *
+	 * @param qualitycheckone
+	 */
+	void saveOne(StorageQualitycheckSon qualitycheckone);
+
+	/**
+	 * 根据id查询数据
+	 *
+	 * @param id
+	 * @return
+	 */
+	StorageQualitycheck loadDataById(Integer id);
+
+	/**
+	 * 根据主键id删除数据
+	 *
+	 * @param id
+	 */
+	void remove(int id);
+
+    /**
+     * @param qualitycheck
+     * @return
+     */
+    List<StorageQualitycheck> getHouseOrWareList(
+            StorageQualitycheck qualitycheck);
+
+    /**
+     * @param id
+     * @return
+     */
+    String getQualityStandardStr(Integer id);
+
+	/**
+	 * 查询第三方检查列表
+	 * @param qualitycheck
+	 * @return
+	 */
+	List<StorageQualitycheck> getThirdCheckList(StorageQualitycheck qualitycheck);
+	/**
+	 * 查询粮情专卡中粮食质量检测记录
+	 * @param qualitycheck
+	 * @return
+	 */
+	List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(StorageQualitycheck qualitycheck,Integer foodbasicinfoId);
+
+	void setQualityCheckByHistoryStatus (Integer houseId, Integer warehouseId);
+	List<Map<String,Object>> getStoreQualityList(Integer orgId);
+	List<Map<String,Object>> getTrdStoreQualityList();
+
+	List<StorageQualitycheck> getDataByZJId(Map<String, Object> paramMap);
+
+
+	/**
+	 * 取出封仓需要的数据
+	 * @param qualityCheckExample
+	 * @return
+	 */
+	List<StorageQualitycheck> queryByQualitycheckData(StorageQualitycheck qualityCheckExample);
+
+	/**
+	 * 查看business_store_ware_detail中是否有数据
+	 * @param qualityCheckExample
+	 * @return
+	 */
+	List<StorageQualitycheck> queryByQualitycheckusiness(StorageQualitycheck qualityCheckExample);
+
+	/**
+	 * 库点同步 - 质检信息主表
+	 * @return
+	 */
+    List<Map<String,Object>> getAllQualityMain(Map<String, Object> paramMap);
+
+	/**
+	 * 库点同步 - 质检信息明细
+	 * @return
+	 */
+	List<Map<String, Object>> getAllQualityInfo(Map<String, Object> paramMap);
+
+	/**
+	 * 库点同步 - 粮食库存
+	 * @return
+	 */
+    List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckSonService.java

@@ -0,0 +1,33 @@
+package com.chinaitop.depot.storage.service;
+
+import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
+
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/12/23
+ */
+public interface StorageQualitycheckSonService {
+    List<StorageQualitycheckSon> findQualitycheckSonExample(StorageQualitycheckSonExample storageQualitycheckSonExample);
+    /**
+     * 根据qualitycheckId删除数据
+     * @param
+     */
+    public void removeSon(StorageQualitycheckSonExample storageQualitycheckSonExample);
+
+    /**
+     * 获取qualitycheck 对应的数据
+     * @param foodbasicinfoId
+     * @return
+     */
+    List<StorageQualitycheckSon> getQualitycheckSonByFoodbasicinfoCheck(Integer foodbasicinfoId);
+
+    /**
+     * 根据qualitycheckId查询数据
+     * @param id
+     * @return
+     */
+    List<StorageQualitycheckSon> selectByQualitycheckId(Integer id);
+}

src/main/java/com/chinaitop/depot/storage/service/StorageStorehouseBusinessService.java

@@ -0,0 +1,94 @@
+package com.chinaitop.depot.storage.service;
+
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusinessExample;
+import com.chinaitop.depot.storage.utils.OnOffEnum;
+import com.chinaitop.depot.storage.utils.TaskEnum;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface StorageStorehouseBusinessService {
+
+	/**
+	 * 新增数据
+	 * 
+	 * @param storageStorehouseBusiness 数据对象
+	 * @throws Exception
+	 */
+	void add(StorageStorehouseBusiness storageStorehouseBusiness) throws Exception;
+
+	/**
+	 * 删除数据
+	 * 
+	 * @param id 数据ID
+	 * @throws Exception
+	 */
+	void remove(Integer id) throws Exception;
+
+	/**
+	 * 修改数据
+	 * 
+	 * @param storageStorehouseBusiness 数据对象
+	 * @throws Exception
+	 */
+	void update(StorageStorehouseBusiness storageStorehouseBusiness) throws Exception;
+
+	/**
+	 * 按ID查询一条数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 * @throws Exception
+	 */
+	StorageStorehouseBusiness findById(Integer id) throws Exception;
+
+	/**
+	 * 按条件查询多条数据
+	 * 
+	 * @param example
+	 * @return
+	 * @throws Exception
+	 */
+	List<StorageStorehouseBusiness> findCondition(StorageStorehouseBusinessExample example) throws Exception;
+
+	/**
+	 * 根据分仓保管账中的仓房名称
+	 *
+	 * @return
+	 */
+	public Map<String, Object> getStorehouseData();
+
+	/**
+	 * 根据分仓保管账中的仓房ID得到货位
+	 *
+	 * @return
+	 */
+	public Map<String, Object> getWarehouseData(Integer ch);
+
+	/**
+	 * 从分仓保管账中查数据插入到仓房业务表
+	 */
+	void saveStorehouseBusinessFromFcbgz();
+
+	/**
+	 * 更新仓房业务表的通风状态
+	 *
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param orgId 单位ID
+	 * @param aerationStatus 通风状态
+	 */
+	void updateAerationStatus(Integer houseId, Integer wareId, Integer orgId, String aerationStatus);
+
+    /**
+     * 作业状态修改接口
+     * 主要作业：入库、出库、通风、熏蒸、内环流
+     * @param task 枚举类型，对对应枚举进行作业状态修改，可参考TaskEnum
+     * @param type 类型，ON 状态开启，OFF 状态关闭,可参考OnOffEnum
+     * @param cfid 仓房id
+     */
+    public void setStatusForTask(TaskEnum task, OnOffEnum type, int cfid);
+
+}

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

@@ -0,0 +1,59 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseTaskDetailMapper;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetail;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskDetailExample;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseTaskDetailService;
+@Service
+public class StorageChangeStoragehouseTaskDetailServiceImpl implements StorageChangeStoragehouseTaskDetailService {
+
+	@Resource
+	private	StorageChangeStoragehouseTaskDetailMapper storageChangeStoragehouseTaskDetailMapper;
+	/**
+	 * 新增倒仓子表数据
+	 */
+
+	@Override
+	public void addStorageChangeStoragehouseTaskDetail(StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail) {
+		storageChangeStoragehouseTaskDetailMapper.insertSelective(storageChangeStoragehouseTaskDetail);
+	}
+	@Override
+	public Map<String, Object> findByStoreData(Integer id)  {
+		Map<String, Object> map = new HashMap<String, Object>();
+		List<StorageChangeStoragehouseTaskDetail> xlxwList = new ArrayList<StorageChangeStoragehouseTaskDetail>(); //学历学位信息1
+		StorageChangeStoragehouseTaskDetail ekeObje = new StorageChangeStoragehouseTaskDetail();
+		xlxwList.add(ekeObje);
+		map.put("xlxwList", xlxwList);
+		return map;
+	}
+	@Override
+	public List<StorageChangeStoragehouseTaskDetail> selectByExample(
+			StorageChangeStoragehouseTaskDetailExample detailExamle) {
+		return storageChangeStoragehouseTaskDetailMapper.selectByExample(detailExamle);
+	}
+	@Override
+	public void updateStorageChangeStoragehouseTaskDetail(StorageChangeStoragehouseTaskDetail storageChangeStoragehouseTaskDetail) {
+		storageChangeStoragehouseTaskDetailMapper.updateByPrimaryKey(storageChangeStoragehouseTaskDetail);
+		
+	}
+	@Override
+	public void removeChangeData(StorageChangeStoragehouseTaskDetailExample detailExamle) {
+		storageChangeStoragehouseTaskDetailMapper.deleteByExample(detailExamle);
+		
+	}
+	@Override
+	public void updateDcStatus1(StorageChangeStoragehouseTaskDetail detail) {
+		storageChangeStoragehouseTaskDetailMapper.updateBybusinessNo(detail);
+	}
+	
+
+}

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

@@ -0,0 +1,108 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.storage.mapper.BusinessFileMapper;
+import com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseTaskMapper;
+import com.chinaitop.depot.storage.model.BusinessFile;
+import com.chinaitop.depot.storage.model.BusinessFileExample;
+import com.chinaitop.depot.storage.model.BusinessFileExample.Criteria;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTaskExample;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseTaskService;
+@Service
+public class StorageChangeStoragehouseTaskServiceImpl implements StorageChangeStoragehouseTaskService {
+
+	@Resource 
+	private StorageChangeStoragehouseTaskMapper storageChangeStoragehouseTaskMapper;
+	
+	@Autowired
+    private BusinessFileMapper fileMapper;
+	/**
+	 * 查询倒仓主表数据
+	 */
+	@Override
+	public List<StorageChangeStoragehouseTask> selectByExample(StorageChangeStoragehouseTaskExample example) {
+		return storageChangeStoragehouseTaskMapper.selectByExample(example);
+	}
+	/**
+	 * 新增倒仓数据
+	 */
+	@Override
+	public void addStorageChangeStoragehouseTask(StorageChangeStoragehouseTask storageChangeStoragehouseTask) {
+		storageChangeStoragehouseTaskMapper.insertSelective(storageChangeStoragehouseTask);
+	}
+	/**
+	 * 修改倒仓数据
+	 */
+	@Override
+	public void updateStorageChangeStoragehouseTask(StorageChangeStoragehouseTask storageChangeStoragehouseTask) {
+		storageChangeStoragehouseTaskMapper.updateByPrimaryKey(storageChangeStoragehouseTask);
+		
+	}
+	/**
+	 * 删除一条倒仓数据
+	 */
+	@Override
+	public void removeChangeData(StorageChangeStoragehouseTaskExample example) {
+		storageChangeStoragehouseTaskMapper.deleteByExample(example);
+		
+	}
+	@Override
+	public void updateDcStatus(StorageChangeStoragehouseTask storageChangeIsUpload) {
+		storageChangeStoragehouseTaskMapper.updateByPrimaryKeySelective(storageChangeIsUpload);
+	}
+	/**
+	 * 添加文件到business_file
+	 */
+	@Override
+	public void updateFileByFileIdsAndBid(String fileIds, Integer storageId, String fileType) {
+		 if (StringUtils.isNotBlank(fileIds) && !"[]".equals(fileIds)) {
+	            BusinessFile businessFile = new BusinessFile();
+	            businessFile.setBid(storageId);
+	            
+	            BusinessFileExample example = new BusinessFileExample();
+	            Criteria createCriteria = example.createCriteria();
+	            // 去除开头结尾.
+	            fileIds = fileIds.substring(1, fileIds.length());
+	            fileIds = fileIds.substring(0, fileIds.length() - 1);
+	            String[] idArray = fileIds.split(",");
+	            List<Integer> idList = new ArrayList<Integer>();
+	            for (String id : idArray) {
+	                idList.add(Integer.parseInt(id));
+	            }
+	            
+	            createCriteria.andIdIn(idList);
+	            createCriteria.andTypeEqualTo(fileType);
+	            fileMapper.updateByExampleSelective(businessFile, example);
+        }
+	}
+	@Override
+	public List<BusinessFile> getByBid(Integer bid, String fileType, Integer orgId, String order) {
+		BusinessFileExample example = new BusinessFileExample();
+        Criteria criteria = example.createCriteria();
+        
+    		if (null != fileType) {
+        		criteria.andTypeEqualTo(fileType);
+        	}
+        	if (null != bid) {
+        		criteria.andBidEqualTo(bid);
+        	}
+        	if (null != orgId) {
+        		criteria.andOrgIdEqualTo(orgId);
+        	}
+        	if (null != order && !"".equals(order)) {
+        		example.setOrderByClause(order);
+        	}
+        
+        	return fileMapper.selectByExample(example);
+	}
+
+}

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

@@ -0,0 +1,40 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseWorkTaskMapper;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTask;
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseWorkTaskExample;
+import com.chinaitop.depot.storage.service.StorageChangeStoragehouseWorkTaskService;
+@Service
+public class StorageChangeStoragehouseWorkTaskServiceImpl implements StorageChangeStoragehouseWorkTaskService {
+
+	@Resource 
+	private StorageChangeStoragehouseWorkTaskMapper storageChangeStoragehouseWorkTaskMapper;
+	
+	/**
+	 * 修改倒仓数据
+	 */
+	@Override
+	public void updateStorageChangeStoragehouseTask(StorageChangeStoragehouseWorkTask storageChangeStoragehouseTask) {
+		storageChangeStoragehouseWorkTaskMapper.updateByPrimaryKey(storageChangeStoragehouseTask);
+	}
+	/**
+	 * 增加一条数据到数据库
+	 */
+	@Override
+	public void addStorageChangeStoragehouseTaskDetail(
+			StorageChangeStoragehouseWorkTask storageChangeStoragehouseWorkTask) {
+		storageChangeStoragehouseWorkTaskMapper.insertSelective(storageChangeStoragehouseWorkTask);
+		
+	}
+	@Override
+	public List<StorageChangeStoragehouseWorkTask> selectByExample(
+			StorageChangeStoragehouseWorkTaskExample detailExamle) {
+		return storageChangeStoragehouseWorkTaskMapper.selectByExample(detailExamle);
+	}
+}

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

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.Resource;
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.storage.mapper.StorageDumpMapper;
+import com.chinaitop.depot.storage.model.StorageDump;
+import com.chinaitop.depot.storage.model.StorageDumpExample;
+import com.chinaitop.depot.storage.service.StorageDumpService;
+
+import net.sf.json.JSONObject;
+
+@Service
+public class StorageDumpServiceImpl implements StorageDumpService {
+
+	@Resource
+	private StorageDumpMapper storageDumpMapper;
+
+	@Override
+	public void save(StorageDump storageDump) {
+		storageDumpMapper.insertSelective(storageDump);
+	}
+
+	@Override
+	public StorageDump findByParmaryKey(Integer id) {
+		return storageDumpMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public List<StorageDump> findCondition(StorageDumpExample example) {
+		return storageDumpMapper.selectByExample(example);
+	}
+
+	@Override
+	public List<Map<String, Object>> selectYswData(Integer orgId) {
+		Map<String, Object> parameter = new HashMap<String, Object>();
+		parameter.put("orgId", orgId);
+		List<Map<String, Object>> list = storageDumpMapper.selectYswData(orgId);
+		return list;
+	}
+
+}

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

@@ -0,0 +1,38 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoCheckMapper;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheck;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoCheckExample;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoCheckService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/19
+ */
+@Service
+public class StorageFoodbasicInfoCheckServiceImpl implements StorageFoodbasicInfoCheckService {
+    @Resource
+    private StorageFoodbasicInfoCheckMapper foodbasicInfoCheckMapper;
+    @Override
+    public List<StorageFoodbasicInfoCheck> queryByFoodbasicInfoCheck(StorageFoodbasicInfoCheckExample foodbasicInfoCheck) {
+        return foodbasicInfoCheckMapper.selectByExample(foodbasicInfoCheck);
+    }
+
+    //保存数据
+    @Override
+    public void save(StorageFoodbasicInfoCheck foodbasicInfoCheck) {
+        if (foodbasicInfoCheck.getId() == null)
+            foodbasicInfoCheckMapper.insert(foodbasicInfoCheck);//新增数据
+        else
+            foodbasicInfoCheckMapper.updateByPrimaryKey(foodbasicInfoCheck);//修改数据
+    }
+
+    @Override
+    public StorageFoodbasicInfoCheck loadDataById(int id) {
+        return foodbasicInfoCheckMapper.selectByPrimaryKey(id);
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoLocationMapper;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocation;
+import com.chinaitop.depot.storage.model.StorageFoodbasicInfoLocationExample;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoLocationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/20
+ */
+@Service
+public class StorageFoodbasicInfoLocationServiceImpl implements StorageFoodbasicInfoLocationService {
+    @Resource
+    private StorageFoodbasicInfoLocationMapper foodbasicInfoLocationMapper;
+    @Override
+    public List<StorageFoodbasicInfoLocation> queryByFoodbasicInfoLocation(StorageFoodbasicInfoLocation location) {
+        return foodbasicInfoLocationMapper.queryByExample(location);
+    }
+
+    @Override
+    public void save(StorageFoodbasicInfoLocation foodbasicInfoLocation) {
+        if (foodbasicInfoLocation.getId() == null)
+            foodbasicInfoLocationMapper.insert(foodbasicInfoLocation);//新增数据
+        else
+            foodbasicInfoLocationMapper.updateByPrimaryKey(foodbasicInfoLocation);//修改数据
+    }
+
+    @Override
+    public StorageFoodbasicInfoLocation loadDataById(int id) {
+        return foodbasicInfoLocationMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<StorageFoodbasicInfoLocation> getFoodbasicInfoLocationByWarehouseCode(Integer houseId, Integer wareHouseId) {
+        StorageFoodbasicInfoLocationExample example = new StorageFoodbasicInfoLocationExample();
+        StorageFoodbasicInfoLocationExample.Criteria criteria = example.createCriteria();
+    	criteria.andHouseIdEqualTo(houseId);
+    	criteria.andWarehouseIdEqualTo(wareHouseId);
+    	return foodbasicInfoLocationMapper.selectByExample(example);
+    }
+}

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

@@ -0,0 +1,367 @@
+package com.chinaitop.depot.storage.service.impl;
+
+
+import com.chinaitop.depot.storage.mapper.StorageFoodbasicInfoCheckMapper;
+import com.chinaitop.depot.storage.mapper.StorageFoodbasicinfoMapper;
+import com.chinaitop.depot.storage.mapper.StorageQualitycheckMapper;
+import com.chinaitop.depot.storage.model.*;
+import com.chinaitop.depot.storage.model.vo.StorageQualitycheckVo;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoLocationService;
+import com.chinaitop.depot.storage.service.StorageFoodbasicInfoService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.chinaitop.depot.storage.utils.ZxingHandler;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/10/26
+ */
+@Service
+@Transactional
+public class StorageFoodbasicInfoServiceImpl implements StorageFoodbasicInfoService {
+    @Resource
+    private StorageFoodbasicinfoMapper foodbasicInfoMapper;
+    @Resource
+    private StorageQualitycheckMapper qualitycheckMapper;
+    @Resource
+    private StorageFoodbasicInfoCheckMapper foodbasicInfoCheckMapper;
+    @Resource
+    private StorageFoodbasicInfoLocationService foodbasicInfoLocationService;
+
+    @Value("${web.upload-path}")
+    private String rootPath;
+
+    /**
+     * 根据仓号得到对应的粮情专卡
+     * @param foodbasicInfo
+     * @return
+     */
+    @Override
+    public List<StorageFoodbasicinfo> selectByExample(StorageFoodbasicinfo foodbasicInfo) {
+        //对list进行处理获取仓房名称和货位名称
+       return  foodbasicInfoMapper.queryByExample(foodbasicInfo);
+    }
+
+    @Override
+    public List<StorageFoodbasicinfo> getByHouseIdAndWarehouseId(StorageFoodbasicinfo foodbasicInfo) {
+        //设置保管员的名字
+        List<StorageFoodbasicinfo> list = foodbasicInfoMapper.getFoodbasicInfoByHouseIdAndWarehouseId(foodbasicInfo);
+        return list;
+    }
+
+    @Override
+    public void save(StorageFoodbasicinfo foodbasicInfo, StorageQualitycheckVo qualitycheckVo,Integer orgId){
+        StorageQualitycheck qualitycheck = new StorageQualitycheck();
+        //获得仓房id和货位ID
+        Integer houseId = foodbasicInfo.getHouseId();
+        Integer wareHouseId = foodbasicInfo.getWarehouseId();
+        // 组织机构信息.
+        foodbasicInfo.setOrgId(orgId);
+        foodbasicInfo.setHouseType(qualitycheckVo.getStorehouseType());
+        foodbasicInfo.setDesignHouseCapacity(qualitycheckVo.getDesignCapacity());//设计仓容
+//              foodbasicInfo.setLineHeight(storehouse.getLadeLineHeight());//装粮线高度(m)
+        foodbasicInfo.setLength(qualitycheckVo.getLength());//长
+        foodbasicInfo.setWidth(qualitycheckVo.getWidth());//宽
+
+        //保存该仓房对应的保管员
+        foodbasicInfo.setKeeperIds(qualitycheckVo.getKeeperNames());
+
+        foodbasicInfo.setLocationNum(qualitycheckVo.getWarehouseCode());//货位编号
+        //③保存验收的信息  qualitycheckService   var houseId=2;  var warehouseId=2;
+        StorageQualitycheckExample qualityCheckExample = new StorageQualitycheckExample();
+        StorageQualitycheckExample.Criteria qualityCriteria = qualityCheckExample.createCriteria();
+        qualityCriteria.andHouseIdEqualTo(houseId);
+        qualityCriteria.andWarehouseIdEqualTo(wareHouseId);
+        qualityCriteria.andTypeEqualTo("1");//查询验收的粮食
+        qualityCheckExample.setOrderByClause("id desc");
+        if(houseId !=null){
+            StorageQualitycheck qualitycheckData =qualitycheckMapper.queryPrimaryKey(qualitycheckVo.getQualitycheckId());
+            qualitycheck = qualitycheckData;
+        }
+        if(qualitycheck != null){
+            foodbasicInfo.setWater(qualitycheck.getWater());//水分
+            foodbasicInfo.setImpurity(qualitycheck.getImpurity());//杂质
+            foodbasicInfo.setUnsound(qualitycheck.getBadpart());//不完善粒
+            foodbasicInfo.setWeight(qualitycheck.getCapacity());//容重
+            foodbasicInfo.setLevel(String.valueOf(qualitycheck.getLevel()));//粮食等级
+            foodbasicInfo.setInputYear(qualitycheck.getInputTime());//入仓时间
+            foodbasicInfo.setGlutenWaterCount(qualitycheck.getGlutenWaterCount());//面筋吸水量
+            foodbasicInfo.setEatScore(qualitycheck.getEatScore());//品尝评分值
+            foodbasicInfo.setFatIndex(qualitycheck.getFatIndex());//酸值
+            foodbasicInfo.setPeroxideValue(qualitycheck.getPeroxideValue());//过氧化值
+        }
+
+        //④保存分仓保管账
+        //储粮性质，品种，实际数量，折合标准数量，产地，收货年度
+        //1.1储粮性质
+        foodbasicInfo.setQuality(qualitycheckVo.getHwxz());
+        //1.2品种
+        foodbasicInfo.setSubType(Integer.valueOf(qualitycheckVo.getPz()));
+        //明细品种
+        foodbasicInfo.setSubTypeDetailed(Integer.valueOf(qualitycheckVo.getMxpz()));
+
+        //1.3实际数量(kg)
+        foodbasicInfo.setNumber(qualitycheckVo.getKcsl());
+        //1.4折合标准数量(吨) 将实际数量kg转换成折合标准数量吨
+        foodbasicInfo.setStandNumber(qualitycheckVo.getKcsl()*0.001);
+
+        //1.5产地hwcd
+        if(StringUtils.isNoneBlank(qualitycheckVo.getHwcd())){
+            foodbasicInfo.setPlaceOfOrigin(qualitycheckVo.getHwcd());
+        }
+        //1.6收货年度scnf
+        if(StringUtils.isNoneBlank(qualitycheckVo.getScnf())){
+            foodbasicInfo.setGrowYear(Integer.valueOf(qualitycheckVo.getScnf()));
+        }
+        //⑤其他
+        foodbasicInfo.setKeepUnite(qualitycheckVo.getDepotName());//所属库点名称
+        foodbasicInfo.setSealStatus("1");//代表已经封仓
+
+        // ⑥更新粮食验收
+        //1.1状态已封仓
+
+        qualitycheck.setSealStatus("1");
+        //1.2封仓时间
+        Date date=new Date();
+        qualitycheck.setSealDate(date);
+        //⑦更新货位的状态
+      //  warehouse.setWarehouseStatus(2965);//满货位
+
+
+        //⑧更新仓房的状态
+        //1.1先查看该仓房下所有的货位是不是都已经满货位 是：更新仓房的状态  否：不更新
+  /*      BasicWarehouseExample wareExample = new BasicWarehouseExample();
+        BasicWarehouseExample.Criteria criteria = wareExample.createCriteria();
+        criteria.andStorehouseIdEqualTo(houseId);
+        criteria.andWarehouseStatusNotEqualTo(2965);
+        //如果list个数为零 说明该仓下所有货物都已经满仓 可以更新仓房状态
+        List<BasicWarehouse> warehouseList=warehouseService.findCondition(wareExample);
+        if(warehouseList.size()==0){
+            storehouse.setStorehouseState(2965);//满货位
+            try{
+                storehouseService.updateBasicStorehouse(storehouse);//更新仓房状态
+            }catch (Exception ex){
+                ex.printStackTrace();
+            }
+
+        }*/
+
+        //⑨更新货位状态
+        //warehouseService.update(warehouse);
+        //生成库存识别码
+        this.generateStockIDcode(foodbasicInfo, qualitycheck, houseId, wareHouseId,qualitycheckVo,date);
+
+        foodbasicInfo.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //保存粮食专卡
+        foodbasicInfoMapper.insertSelective(foodbasicInfo);
+
+        qualitycheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //更新验收信息
+        qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);
+
+        //在粮情检测表中保存当前验收的信息用于在粮情卡中进行显示
+        //获取刚刚保存的专卡的Id
+        Integer foodbasicInfoId = foodbasicInfo.getId();
+        if(foodbasicInfoId != null){
+            StorageFoodbasicInfoCheck check = new StorageFoodbasicInfoCheck();
+            check.setFoodbasicinfoId(foodbasicInfoId);
+            check.setQualitycheckId(qualitycheck.getId());
+            check.setHouseId(houseId);
+            check.setWarehouseId(wareHouseId);
+            check.setOrgId(orgId);
+
+            foodbasicInfoCheckMapper.insertSelective(check);
+        }
+    }
+
+    /**
+     * 生成库存识别码方法
+     * @param foodbasicInfo
+     * @param qualitycheck
+     * @param houseId
+     * @param wareHouseId
+     * @param date
+     * @throws Exception
+     */
+    public void generateStockIDcode(StorageFoodbasicinfo foodbasicInfo, StorageQualitycheck qualitycheck, Integer houseId,Integer wareHouseId,
+                                   StorageQualitycheckVo qualitycheckVo,Date date){
+        //1.3生成库存识别码(二维码)
+        // 服务器路径
+        //   String rootPath = request.getSession().getServletContext().getRealPath("");
+        // 文件相对路径
+        String relativePath = "upload/img";
+        // 如路径不存在，则创建它
+        //File directory = new File(rootPath + relativePath);
+        //if (!directory.exists()) {
+        //    directory.mkdirs();
+        //}
+
+        //图片的命名
+        String authcodeName=houseId+""+wareHouseId+".png";
+        //图片完整路径
+        String filePath=relativePath+"/"+authcodeName;//于是二维码需要保存的地方
+        String fullPath=rootPath+"/"+filePath;
+        int width2 = 300, height2 = 300;
+
+          /*  var neirong="组织代码：163837911；货位编码："+$("#HWBH").text()+"00100101；货位封仓时间：201511010955；根码标志：0；
+            组织代码：163837911；货位编码："+$("#HWBH").text()+"00100101；货位封仓时间："+currentTime+"；
+            粮食性质：110；业务号：001；数量："+$("#ZHBZSL").text()+"；品种代码：1141001；产地代码：220112；
+            生产年份："+rcsjYear+"；等级代码：01";*/
+        StringBuffer sb = new StringBuffer();
+        //根据登录人的组织机构查找信息
+        String orgCode="";
+        String currentWareCode="";
+
+        //①组织机构代码(9位代码)
+        String companyNature = qualitycheckVo.getCompanyNature();
+        sb.append("组织代码:"+companyNature);
+        //②货位编码：当前粮食所在货位的编码（组织代码+仓房代码+000+货位代码）
+        orgCode = qualitycheckVo.getOrgCode();//当前组织的组织代码
+
+       // String storehouseCode = storehouse.getStorehouseCode();//当前仓房的仓房编码
+       //String granary = "000";//因为没有廒间代码 就用3个0替代
+       //根据当前货位id获得货位记录
+       // String warehouseCode=warehouse.getWarehouseCode();//货位编码
+        currentWareCode=orgCode+qualitycheckVo.getStorehouseCode()+qualitycheckVo.getStorehouseCode()+qualitycheckVo.getWarehouseCode();
+        sb.append(";货位编码:"+currentWareCode);
+
+        //③货位封仓时间：粮食封仓日期
+        SimpleDateFormat myFmt1=new SimpleDateFormat("yyyyMMddHHmm");
+        String sealDate=myFmt1.format(date);
+        sb.append(";货位封仓时间:"+sealDate);
+        // ④根码标志：0(固定的)
+        String mark="0";
+        sb.append(";根码标志:"+mark);
+        // ⑤组织机构代码：当前粮食所在库的编码
+        String companyNature2=companyNature;
+        sb.append(";组织代码:"+companyNature2);
+        //⑥货位编码：变更前的货位(从前台传来的是当前货位也就是变更后的) 从货位变更表中查找是否有该货位的变更记录   有：变更前的货位   无：还是原来的货位 ，）
+        List<StorageFoodbasicInfoLocation> location=foodbasicInfoLocationService.getFoodbasicInfoLocationByWarehouseCode(houseId, wareHouseId);
+        String oldwarehouseCode="";
+        Integer warehouseId;
+        String changSsealDate="";
+        StorageFoodbasicInfoLocation infoLocation = new StorageFoodbasicInfoLocation();
+        SimpleDateFormat myFmt2=new SimpleDateFormat("yyyyMMddHHmm");
+
+        if(location.size()>0 && location != null) {
+            infoLocation = location.get(0);//得到当前货位的初始货位
+            oldwarehouseCode = infoLocation.getWarehouseCode();//初始的货位编码
+            warehouseId=infoLocation.getWarehouseId();//初始的货位Id
+            Integer firstHouseId=infoLocation.getHouseId();//初始的仓房id
+            StorageQualitycheckExample exple = new StorageQualitycheckExample();
+            StorageQualitycheckExample.Criteria criteria1=exple.createCriteria();
+            if(firstHouseId != null){
+                criteria1.andHouseIdEqualTo(firstHouseId);
+            }
+            if(warehouseId != null){
+                criteria1.andWarehouseIdEqualTo(warehouseId);
+            }
+            exple.setOrderByClause("id desc");
+            //根据初始的货位id和仓房id得到粮情专卡 从粮情专卡中取出建卡的日期就是封仓的日期
+            List<StorageQualitycheck>  basicInfo  = qualitycheckMapper.selectByExample(exple);
+            StorageQualitycheck qualitycheck1=null;
+            if(basicInfo.size()>0 &&basicInfo != null){
+                qualitycheck1=basicInfo.get(0);
+            }
+            if(qualitycheck1 != null){
+                Date sealDate1=qualitycheck1.getSealDate();//得到初始货位的封仓日期
+                if(sealDate1 != null){
+                    changSsealDate=myFmt2.format(sealDate1);
+                }
+            }
+            //变更的货位编码
+            oldwarehouseCode =orgCode+qualitycheckVo.getStorehouseCode()+qualitycheckVo.getStorehouseCode()+oldwarehouseCode;
+        }else{
+            oldwarehouseCode=currentWareCode;//没变更 还是原来的货位编码
+            changSsealDate=myFmt1.format(date);//没变更  还是原来的封仓时间
+        }
+
+        sb.append(";货位编码:"+oldwarehouseCode);
+
+        sb.append(";货位封仓时间:"+changSsealDate);
+
+        //遍历仓房保管账对象
+
+        //粮食性质  从分仓保管账带出
+        //1.1储粮性质
+        sb.append(";粮食性质:"+qualitycheckVo.getHwxz());
+        //业务号：分仓保管账的文件号（粮情卡带出）（粮情卡增加这个字段  保存粮情卡的时候直接从分仓保管账取出）
+        if(ParameterUtil.isnotnull(qualitycheckVo.getWjh())){
+            sb.append(";业务号:"+qualitycheckVo.getWjh());
+        }else{
+            sb.append(";业务号:");
+        }
+
+        //数量：粮情卡带出
+        sb.append(";数量:"+qualitycheckVo.getKcsl());
+
+        //  品种代码：粮情卡带出(enumCode)
+        sb.append(";品种代码:"+qualitycheckVo.getPzCode());
+        //产地代码：粮情卡带出
+        sb.append(";产地代码:"+qualitycheckVo.getPlaceCode());
+
+        // 生产年份：粮情卡带出
+        sb.append(";收获年份:"+qualitycheckVo.getScnfName());
+
+        //等级代码：粮情卡带出
+        Integer level=qualitycheck.getLevel();
+        sb.append(";等级代码:"+level);
+
+        // 生产年份：粮情卡带出
+        sb.append(";代码标识:"+companyNature+qualitycheckVo.getWarehouseCode()+changSsealDate);
+        String contents2=sb.toString();
+
+        //生成二维码
+        ZxingHandler.encode2(contents2, width2, height2, fullPath);
+
+
+        qualitycheck.setAuthCode(filePath);//质量检查中保存库存识别码用于在封仓列表中展示
+        foodbasicInfo.setAuthCode(filePath);//粮情专卡中保存库存识别码用于在粮情卡页面展示
+    }
+
+
+    @Override
+    public StorageFoodbasicinfo loadDataById(int id) {
+        StorageFoodbasicinfo foodbasicinfo = foodbasicInfoMapper.selectByPrimaryKey(id);
+        return foodbasicinfo;
+    }
+
+    /**
+     * 更新粮情专卡为历史数据
+     * @param houseId
+     * @return
+     */
+    @Override
+    public void setFoodBasicInfoHistoryStatus(Integer houseId,Integer warehouseId) {
+
+        StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
+        //0:最新数据  1:历史数据
+        foodbasicinfo.setHistoryStatus(1);
+
+        StorageFoodbasicinfoExample foodbasicinfoExample = new StorageFoodbasicinfoExample();
+        StorageFoodbasicinfoExample.Criteria qualityCriteria = foodbasicinfoExample.createCriteria();
+        if(ParameterUtil.isnotnull(houseId)){
+            qualityCriteria.andHouseIdEqualTo(houseId);
+        }
+        if(ParameterUtil.isnotnull(warehouseId)){
+            qualityCriteria.andWarehouseIdEqualTo(warehouseId);
+        }
+
+        //更新粮情专卡状态为历史数据
+        foodbasicInfoMapper.updateByExampleSelective(foodbasicinfo,foodbasicinfoExample);
+
+    }
+
+	@Override
+	public List<StorageFoodbasicinfo> findByCondition(StorageFoodbasicinfoExample example) {
+		return foodbasicInfoMapper.selectByExample(example);
+	}
+}