Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

# Conflicts: # .idea/compiler.xml # .idea/workspace.xml # src/main/java/com/huaheng/pc/system/user/controller/UserController.java

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop
# Conflicts: # .idea/compiler.xml # .idea/workspace.xml # src/main/java/com/huaheng/pc/system/user/controller/UserController.java
wangyanxiong
2 parents 083bd839 950ab0df
Showing 65 changed files with 1788 additions and 1479 deletions
.gitignore
.idea/MyBatisCodeHelperDatasource.xml
.idea/encodings.xml
.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml
.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml
.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml
.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml
.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml
.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
.idea/libraries/Maven__commons_io_commons_io_2_2.xml
.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml
.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml
.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
.idea/misc.xml
pom.xml
src/main/java/com/huaheng/HuaHengApplication.java
src/main/java/com/huaheng/common/redis/RedisConfig.java
src/main/java/com/huaheng/common/redis/controller/RedisController.java
src/main/java/com/huaheng/common/redis/model/RedisModel.java
src/main/java/com/huaheng/common/redis/service/IRedisService.java
@@ -11,6 +11,8 @@ target/
 *.iml
 *.ipr
 .idea/workspace.xml
+.idea/compiler.xml
+
  
 ### NetBeans ###
 /nbproject/private/
@@ -6,9 +6,9 @@
         <option name="addSerializeUid" value="true" />
         <option name="generateService" value="true" />
         <option name="generateServiceInterface" value="true" />
-        <option name="javaMapperPackage" value="com.huaheng.pc.system.userWarehousel.mapper" />
+        <option name="javaMapperPackage" value="com.huaheng.pc.config.containerCapacityl.mapper" />
         <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
-        <option name="javaModelPackage" value="com.huaheng.pc.system.userWarehousel.domain" />
+        <option name="javaModelPackage" value="com.huaheng.pc.config.containerCapacityl.domain" />
         <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
         <option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
         <option name="moduleNameToPackageAndPathMap">
@@ -30,15 +30,15 @@
             <entry key="huaheng">
               <value>
                 <UserPackageAndPathInfoByModule>
-                  <option name="javaMapperPackage" value="com.huaheng.pc.system.userWarehousel.mapper" />
+                  <option name="javaMapperPackage" value="com.huaheng.pc.config.containerCapacityl.mapper" />
                   <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="javaModelPacakge" value="com.huaheng.pc.system.userWarehousel.domain" />
+                  <option name="javaModelPacakge" value="com.huaheng.pc.config.containerCapacityl.domain" />
                   <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="javaServiceInterfacePackage" value="com.huaheng.pc.system.userWarehousel.service" />
+                  <option name="javaServiceInterfacePackage" value="com.huaheng.pc.config.containerCapacityl.service" />
                   <option name="javaServiceInterfacePath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="javaServicePackage" value="com.huaheng.pc.system.userWarehousel.service" />
+                  <option name="javaServicePackage" value="com.huaheng.pc.config.containerCapacityl.service" />
                   <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="xmlPackage" value="system" />
+                  <option name="xmlPackage" value="config" />
                   <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
                 </UserPackageAndPathInfoByModule>
               </value>
@@ -77,6 +77,16 @@
                 </TableGenerateConfig>
               </value>
             </entry>
+            <entry key="wms_v2:container_capacity">
+              <value>
+                <TableGenerateConfig>
+                  <option name="generatedKey" value="id" />
+                  <option name="javaModelName" value="ContainerCapacity" />
+                  <option name="moduleName" value="huaheng" />
+                  <option name="useActualColumnName" value="true" />
+                </TableGenerateConfig>
+              </value>
+            </entry>
             <entry key="wms_v2:container_type">
               <value>
                 <TableGenerateConfig>
@@ -283,7 +293,7 @@
         <option name="useLomBokOnModel" value="true" />
         <option name="useSwagger" value="true" />
         <option name="userMybatisPlus" value="true" />
-        <option name="xmlMapperPackage" value="system" />
+        <option name="xmlMapperPackage" value="config" />
         <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
       </ProjectProfile>
     </option>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: com.baomidou:mybatis-plus:3.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: commons-fileupload:commons-fileupload:1.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: commons-io:commons-io:2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis:3.5.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: org.mybatis:mybatis-spring:2.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
-<component name="libraryTable">
-  <library name="Maven: org.projectlombok:lombok:1.18.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -5,16 +5,16 @@
  
 	<groupId>com.huaheng</groupId>
 	<artifactId>huaheng</artifactId>
-	<version>2.3.0</version>
+	<version>4.0.0</version>
 	<packaging>jar</packaging>
  
 	<name>huaheng</name>
-	<description>华恒管理系统</description>
+	<description>华恒WMS管理系统</description>
  
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.1.3.RELEASE</version>
 		<relativePath />
 	</parent>
  
@@ -22,20 +22,20 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<shiro.version>1.4.0</shiro.version>
+		<shiro.version>1.4.1</shiro.version>
 		<thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
 		<!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>-->
 		<pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version>
-		<fastjson.version>1.2.47</fastjson.version>
-		<druid.version>1.1.10</druid.version>
-		<commons.io.version>2.2</commons.io.version>
+		<fastjson.version>1.2.59</fastjson.version>
+		<druid.version>1.1.18</druid.version>
+		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.4</commons.fileupload.version>
-		<bitwalker.version>1.19</bitwalker.version>
+		<bitwalker.version>1.21</bitwalker.version>
 		<lombok.version>1.18.8</lombok.version>
 		<velocity.version>1.7</velocity.version>
 		<kaptcha.version>2.3.2</kaptcha.version>
-		<swagger.version>2.7.0</swagger.version>
-		<jsoup.version>1.11.3</jsoup.version>
+		<swagger.version>2.9.2</swagger.version>
+		<jsoup.version>1.12.1</jsoup.version>
 		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
 	</properties>
  
@@ -114,16 +114,10 @@
 		</dependency>
  
 		<!--阿里数据库连接池 -->
-<!--	<dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>-->
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.17</version>
+            <version>${druid.version}</version>
         </dependency>
  
 		<!--常用工具类 -->
@@ -199,12 +193,12 @@
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
             <version>2.3.1</version>
-			<exclusions>
+			<!--<exclusions>
 				<exclusion>
 					<groupId>com.mchange</groupId>
 					<artifactId>c3p0</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions>-->
 		</dependency>
  
 		<!--velocity代码生成使用模板 -->
@@ -262,51 +256,13 @@
 		<!--<version>6.0.0</version>-->
 	<!--</dependency>-->
  
-		<!--共享Session-spring-session-data-redis分布式系统中-->
-		<dependency>
-			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session-data-redis</artifactId>
-		</dependency>
-		<!-- Spring Boot Redis依赖 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-			<!-- 1.5的版本默认采用的连接池技术是jedis  2.0以上版本默认连接池是lettuce, 在这里采用jedis，所以需要排除lettuce的jar -->
-			<exclusions>
-				<exclusion>
-					<groupId>redis.clients</groupId>
-					<artifactId>jedis</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.lettuce</groupId>
-					<artifactId>lettuce-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- 添加jedis客户端 -->
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-		</dependency>
-
-		<!--spring2.0集成redis所需common-pool2-->
-		<!-- 必须加上，jedis依赖此  -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-pool2</artifactId>
-			<version>2.5.0</version>
-		</dependency>
-
-		<!-- 将作为Redis对象序列化器 -->
+        <!--json库-->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.47</version>
+			<version>${fastjson.version}</version>
 		</dependency>
  
-
-
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -317,25 +273,29 @@
 			<artifactId>httpcore</artifactId>
 		</dependency>
  
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
  
-
-
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.8.2</version>
 		</dependency>
  
-		<dependency>
+<!--		<dependency>
 			<groupId>com.huaheng.soft</groupId>
 			<artifactId>echarts</artifactId>
 			<version>1.1</version>
-		</dependency>
+		</dependency>-->
+
+        <dependency>
+            <groupId>com.github.abel533</groupId>
+            <artifactId>ECharts</artifactId>
+            <version>3.0.0.5</version>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -392,6 +352,38 @@
 		</plugins>
 	</build>
  
+    <!--阿里maven地址-->
+    <!--<repositories>
+        <repository>
+            <id>nexus-aliyun</id>
+            <name>Nexus aliyun</name>
+            <layout>default</layout>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus-aliyun</id>
+            <name>Nexus aliyun</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>-->
+
+    <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+
 	<repositories>
 		<repository>
 			<id>nexus</id>
@@ -10,8 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * 
  * @author huaheng
  */
-//@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.huaheng.pc.**.**.mapper")
+@MapperScan({"com.huaheng.pc.**.**.mapper","com.huaheng.common.**.**.mapper"})
 //添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class HuaHengApplication
@@ -20,7 +19,7 @@ public class HuaHengApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(HuaHengApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  华恒启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("***************  华恒WMS启动成功  ***************\n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +
-package com.huaheng.common.redis;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.*;
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-public class RedisConfig {
-
-    /**
-     * 注入 RedisConnectionFactory
-     */
-    @Autowired
-    RedisConnectionFactory redisConnectionFactory;
-
-    /**
-     * 实例化 RedisTemplate 对象
-     *
-     * @return
-     */
-    @Bean
-    public RedisTemplate<String, Object> functionDomainRedisTemplate() {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        initDomainRedisTemplate(redisTemplate, redisConnectionFactory);
-        return redisTemplate;
-    }
-
-    /**
-     * 设置数据存入 redis 的序列化方式
-     *
-     * @param redisTemplate
-     * @param factory
-     */
-    private void initDomainRedisTemplate(RedisTemplate<String, Object> redisTemplate, RedisConnectionFactory factory) {
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
-        redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
-        redisTemplate.setConnectionFactory(factory);
-    }
-
-    /**
-     * 实例化 HashOperations 对象,可以使用 Hash 类型操作
-     *
-     * @param redisTemplate
-     * @return
-     */
-    @Bean
-    public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
-        return redisTemplate.opsForHash();
-    }
-
-    /**
-     * 实例化 ValueOperations 对象,可以使用 String 操作
-     *
-     * @param redisTemplate
-     * @return
-     */
-    @Bean
-    public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
-        return redisTemplate.opsForValue();
-    }
-
-    /**
-     * 实例化 ListOperations 对象,可以使用 List 操作
-     *
-     * @param redisTemplate
-     * @return
-     */
-    @Bean
-    public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
-        return redisTemplate.opsForList();
-    }
-
-    /**
-     * 实例化 SetOperations 对象,可以使用 Set 操作
-     *
-     * @param redisTemplate
-     * @return
-     */
-    @Bean
-    public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
-        return redisTemplate.opsForSet();
-    }
-
-    /**
-     * 实例化 ZSetOperations 对象,可以使用 ZSet 操作
-     *
-     * @param redisTemplate
-     * @return
-     */
-    @Bean
-    public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
-        return redisTemplate.opsForZSet();
-    }
-}
 \ No newline at end of file
-package com.huaheng.common.redis.controller;
-
-import com.huaheng.common.redis.model.RedisModel;
-import com.huaheng.common.redis.serviceimpl.RedisServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@Controller
-public class RedisController {
-
-    @Autowired
-    private RedisServiceImpl service;
-
-    //添加
-//    @RequestMapping(value = "/add", method = RequestMethod.GET)
-    public void test() {
-        System.out.println("start.....");
-        RedisModel m = new RedisModel();
-        m.setName("张三");
-        m.setTel("1111");
-        m.setAddress("长沙");
-        m.setRedisKey("zhangsanKey01");
-        service.put(m.getRedisKey(), m, -1);
-
-        RedisModel m2 = new RedisModel();
-        m2.setName("张三2");
-        m2.setTel("2222");
-        m2.setAddress("长沙2");
-        m2.setRedisKey("zhangsanKey02");
-        service.put(m2.getRedisKey(), m2, -1);
-
-        RedisModel m3 = new RedisModel();
-        m3.setName("张三3");
-        m3.setTel("2222");
-        m3.setAddress("长沙3");
-        m3.setRedisKey("zhangsanKey03");
-        service.put(m3.getRedisKey(), m3, -1);
-
-        System.out.println("add success end...");
-    }
-
-    //查询所有对象
-//    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
-//    @ResponseBody
-    public Object getAll() {
-        return service.getAll();
-    }
-
-    //查询所有key
-//    @RequestMapping(value = "/getKeys", method = RequestMethod.GET)
-//    @ResponseBody
-    public Object getKeys() {
-        return service.getKeys();
-    }
-
-    //根据key查询
-//    @RequestMapping(value = "/get", method = RequestMethod.GET)
-    public Object get(String key) {
-        RedisModel m = new RedisModel();
-        m.setRedisKey(key);
-        return service.get(m.getRedisKey());
-    }
-
-    //删除
-//    @RequestMapping(value = "/remove", method = RequestMethod.GET)
-//    @ResponseBody
-    public void remove() {
-        RedisModel m = new RedisModel();
-        m.setRedisKey("zhangsanKey01");
-        service.remove(m.getRedisKey());
-    }
-
-    //判断key是否存在
-//    @RequestMapping(value = "/isKeyExists", method = RequestMethod.GET)
-//    @ResponseBody
-    public void isKeyExists() {
-        RedisModel m = new RedisModel();
-        m.setRedisKey("zhangsanKey01");
-        boolean flag = service.isKeyExists(m.getRedisKey());
-        System.out.println("zhangsanKey01 是否存在: "+flag);
-    }
-
-    //查询当前缓存的数量
-//    @RequestMapping(value = "/count", method = RequestMethod.GET)
-//    @ResponseBody
-    public Object count() {
-        return service.count();
-    }
-
-    //清空所有key
-//    @RequestMapping(value = "/empty", method = RequestMethod.GET)
-//    @ResponseBody
-    public void empty() {
-        service.empty();
-    }
-}
 \ No newline at end of file
-package com.huaheng.common.redis.model;
-
-import java.io.Serializable;
-
-public class RedisModel implements Serializable {
-
-
-    private String redisKey;//redis中的key
-    private String name;//姓名
-    private String tel;//电话
-    private String address;//住址
-
-    public String getRedisKey() {
-        return redisKey;
-    }
-
-    public void setRedisKey(String redisKey) {
-        this.redisKey = redisKey;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTel() {
-        return tel;
-    }
-
-    public void setTel(String tel) {
-        this.tel = tel;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-}
 \ No newline at end of file
-package com.huaheng.common.redis.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-public abstract class IRedisService<T> {
-
-
-    @Autowired
-    protected RedisTemplate<String, Object> redisTemplate;
-    @Resource
-    protected HashOperations<String, String, T> hashOperations;
-
-    /**
-     * 存入redis中的key
-     *
-     * @return
-     */
-    protected abstract String getRedisKey();
-
-
-    /**
-     * 添加
-     *
-     * @param key    key
-     * @param doamin 对象
-     * @param expire 过期时间(单位:秒),传入 -1 时表示不设置过期时间
-     */
-    public void put(String key, T doamin, long expire) {
-        hashOperations.put(getRedisKey(), key, doamin);
-        if (expire != -1) {
-            redisTemplate.expire(getRedisKey(), expire, TimeUnit.SECONDS);
-        }
-    }
-
-    /**
-     * 删除
-     *
-     * @param key 传入key的名称
-     */
-    public void remove(String key) {
-        hashOperations.delete(getRedisKey(), key);
-    }
-
-    /**
-     * 查询
-     *
-     * @param key 查询的key
-     * @return
-     */
-    public T get(String key) {
-        return hashOperations.get(getRedisKey(), key);
-    }
-
-    /**
-     * 获取当前redis库下所有对象
-     *
-     * @return
-     */
-    public List<T> getAll() {
-        return hashOperations.values(getRedisKey());
-    }
-
-    /**
-     * 查询查询当前redis库下所有key
-     *
-     * @return
-     */
-    public Set<String> getKeys() {
-        return hashOperations.keys(getRedisKey());
-    }
-
-    /**
-     * 判断key是否存在redis中
-     *
-     * @param key 传入key的名称
-     * @return
-     */
-    public boolean isKeyExists(String key) {
-        return hashOperations.hasKey(getRedisKey(), key);
-    }
-
-    /**
-     * 查询当前key下缓存数量
-     *
-     * @return
-     */
-    public long count() {
-        return hashOperations.size(getRedisKey());
-    }
-
-    /**
-     * 清空redis
-     */
-    public void empty() {
-        Set<String> set = hashOperations.keys(getRedisKey());
-        set.stream().forEach(key -> hashOperations.delete(getRedisKey(), key));
-    }
-}
 \ No newline at end of file
-package com.huaheng.common.redis.serviceimpl;
-
-import com.huaheng.common.redis.model.RedisModel;
-import com.huaheng.common.redis.service.IRedisService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RedisServiceImpl extends IRedisService<RedisModel> {
-
-    private static final String REDIS_KEY = "TEST_REDIS_KEY";
-
-    @Override
-    protected String getRedisKey() {
-
-
-        return this.REDIS_KEY;
-    }
-}
+package com.huaheng.pc.config.containerCapacity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
+import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
+import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.general.material.service.MaterialService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 容器容量值
+ * 信息操作处理
+ *
+ * @author ricard
+ * @date 2019-08-12
+ */
+@Controller
+@RequestMapping("/config/containerCapacity")
+public class ContainerCapacityController extends BaseController {
+
+    private String prefix = "config/containerCapacity";
+
+    @Autowired
+    private ContainerCapacityService containerCapacityService;
+
+    @Autowired
+    private MaterialService materialService;
+
+    @RequiresPermissions("config:containerCapacity:view")
+    @GetMapping()
+    public String containerCapacity()
+    {
+        return prefix + "/containerCapacity";
+    }
+
+    /**
+     * 查询容器容量列表
+     */
+    @RequiresPermissions("config:containerCapacity:list")
+    @Log(title = "配置-容器容量设置", operating = "查看容器容量", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ContainerCapacity containerCapacity,String createdBegin, String createdEnd)
+    {
+        LambdaQueryWrapper<ContainerCapacity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ContainerCapacity::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), ContainerCapacity::getCreated, createdEnd)
+                .eq(ContainerCapacity::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                .eq(StringUtils.isNotEmpty(containerCapacity.getMaterialCode()),ContainerCapacity::getMaterialCode,containerCapacity.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(containerCapacity.getContainerType()), ContainerCapacity::getContainerType, containerCapacity.getContainerType())
+                .like(StringUtils.isNotEmpty(containerCapacity.getMaterialName()), ContainerCapacity::getMaterialName, containerCapacity.getMaterialName())
+                .orderByAsc(ContainerCapacity::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /**
+             * 使用分页查询
+             */
+            Page<ContainerCapacity> page = new Page<>(pageNum, pageSize);
+            IPage<ContainerCapacity> iPage = containerCapacityService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+        } else {
+            List<ContainerCapacity> list = containerCapacityService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+
+    /**
+     * 新增容器容量数据
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存容器容量数据
+     */
+    @RequiresPermissions("config:containerCapacity:add")
+    @Log(title = "配置-容器容量设置", operating = "新增容器容量", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ContainerCapacity containerCapacity)
+    {
+        AjaxResult ajaxResult=containerCapacityService.insertModel(containerCapacity);
+        return ajaxResult;
+    }
+
+    /**
+     * 修改容器容量
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+    {
+        ContainerCapacity containerCapacity = containerCapacityService.getById(id);
+        mmap.put("containerCapacity", containerCapacity);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存容器容量
+     */
+    @RequiresPermissions("config:containerCapacity:edit")
+    @Log(title = "配置-容器容量设置", operating = "修改容器容量", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ContainerCapacity containerCapacity)
+    {
+        containerCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(containerCapacityService.saveOrUpdate(containerCapacity));
+    }
+
+    /**
+     * 删除容器类型
+     */
+    @RequiresPermissions("config:containerCapacity:remove")
+    @Log(title = "配置-容器容量设置", operating = "删除容器容量", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("id不能为空");
+        for (Integer id : Convert.toIntArray(ids))
+        {
+
+        }
+        return AjaxResult.success("删除成功！");
+    }
+
+
+
+}
+package com.huaheng.pc.config.containerCapacity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.config.containerCapacityl.domain.ContainerCapacity")
+@Data
+@TableName(value = "container_capacity")
+public class ContainerCapacity implements Serializable {
+    /**
+     * 内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="内部号")
+    private Integer id;
+
+    /**
+     * 容器类型编码
+     */
+    @TableField(value = "containerType")
+    @ApiModelProperty(value="容器类型编码")
+    private String containerType;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 商品编码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="商品编码")
+    private String materialCode;
+
+    /**
+     * 商品名称
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="商品名称")
+    private String materialName;
+
+    /**
+     * 商品规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value="商品规格")
+    private String materialSpec;
+
+    /**
+     * 商品单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="商品单位")
+    private String materialUnit;
+
+    /**
+     * 存放数量
+     */
+    @TableField(value = "qty")
+    @ApiModelProperty(value="存放数量")
+    private BigDecimal qty;
+
+    /**
+     * 启用；0—禁用状态
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="启用；0—禁用状态")
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1-robot交互用字段
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1-robot交互用字段")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_CONTAINERTYPE = "containerType";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_MATERIALCODE = "materialCode";
+
+    public static final String COL_MATERIALNAME = "materialName";
+
+    public static final String COL_MATERIALSPEC = "materialSpec";
+
+    public static final String COL_MATERIALUNIT = "materialUnit";
+
+    public static final String COL_QTY = "qty";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+}
 \ No newline at end of file
+package com.huaheng.pc.config.containerCapacity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
+
+public interface ContainerCapacityMapper extends BaseMapper<ContainerCapacity> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.containerCapacity.service;
+
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface ContainerCapacityService extends IService<ContainerCapacity>{
+
+
+    //新增容器容量
+    AjaxResult insertModel(ContainerCapacity containerCapacity);
+
+}
+package com.huaheng.pc.config.containerCapacity.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.general.material.service.MaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.containerCapacity.mapper.ContainerCapacityMapper;
+import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
+
+@Service
+public class ContainerCapacityServiceImpl extends ServiceImpl<ContainerCapacityMapper, ContainerCapacity> implements ContainerCapacityService{
+
+    @Autowired
+    private MaterialService materialService;
+    @Autowired
+    private ContainerTypeService containerTypeService;
+
+
+    //判断容器类别是否存在，添加容器容量时，查找到该物料的具体信息，一并加入到容器容量中
+    @Override
+    public AjaxResult insertModel(ContainerCapacity containerCapacity) {
+        containerCapacity.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        containerCapacity.setCreatedBy(ShiroUtils.getLoginName());
+        containerCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+        //查找该容器类别信息
+        LambdaQueryWrapper<ContainerType> lambdaQueryWrappers = Wrappers.lambdaQuery();
+        lambdaQueryWrappers.eq(StringUtils.isNotEmpty(containerCapacity.getContainerType()),ContainerType::getCode, containerCapacity.getContainerType())
+                .eq(StringUtils.isNotEmpty(containerCapacity.getWarehouseCode()),ContainerType::getWarehouseCode, containerCapacity.getWarehouseCode());
+        ContainerType containerType=containerTypeService.getOne(lambdaQueryWrappers);
+        if(containerType==null){
+            return AjaxResult.error("系统没有该容器类型");
+        }
+
+        //查找该物料信息
+        LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(containerCapacity.getMaterialCode()),Material::getCode, containerCapacity.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(containerCapacity.getWarehouseCode()),Material::getWarehouseCode, containerCapacity.getWarehouseCode());
+        Material material=materialService.getOne(lambdaQueryWrapper);
+        if(material==null){
+            return AjaxResult.error("系统没有该物料");
+        }
+        containerCapacity.setMaterialName(material.getName());
+        containerCapacity.setMaterialSpec(material.getSpec());
+        containerCapacity.setMaterialUnit(material.getUnit());
+        if(!this.save(containerCapacity)){
+            return AjaxResult.error("新增容器容量失败");
+        }
+        return AjaxResult.success("新增容器容量成功");
+    }
+}
@@ -27,8 +27,8 @@ import java.util.List;
 /**
  * 容器类型 信息操作处理
  * 
- * @author huaheng
- * @date 2018-08-19
+ * @author ricard
+ * @date 2019-08-12
  */
 @Controller
 @RequestMapping("/config/containerType")
@@ -53,7 +53,7 @@ public class ContainerType implements Serializable {
      */
     @TableField(value = "enable")
     @ApiModelProperty(value="启用；0—禁用状态")
-    private Integer enable;
+    private Boolean enable;
  
     /**
      * 序号
@@ -116,7 +116,7 @@ public class ContainerType implements Serializable {
      */
     @TableField(value = "useAsDEFAULT")
     @ApiModelProperty(value="作为默认货箱")
-    private Integer useAsDEFAULT;
+    private Boolean useAsDEFAULT;
  
     /**
      * 状态
@@ -373,23 +373,6 @@ public class ContainerType implements Serializable {
         this.companyCode = companyCode;
     }
  
-    /**
-     * 获取启用；0—禁用状态
-     *
-     * @return enable - 启用；0—禁用状态
-     */
-    public Integer getEnable() {
-        return enable;
-    }
-
-    /**
-     * 设置启用；0—禁用状态
-     *
-     * @param enable 启用；0—禁用状态
-     */
-    public void setEnable(Integer enable) {
-        this.enable = enable;
-    }
  
     /**
      * 获取序号
@@ -517,39 +500,33 @@ public class ContainerType implements Serializable {
         this.maxWeight = maxWeight;
     }
  
-    /**
-     * 获取装满度
-     *
-     * @return fillPercent - 装满度
-     */
     public Integer getFillPercent() {
         return fillPercent;
     }
  
-    /**
-     * 设置装满度
-     *
-     * @param fillPercent 装满度
-     */
     public void setFillPercent(Integer fillPercent) {
         this.fillPercent = fillPercent;
     }
  
     /**
-     * 获取作为默认货箱
+     * 获取装满度
      *
-     * @return useAsDEFAULT - 作为默认货箱
+     * @return fillPercent - 装满度
      */
-    public Integer getUseAsDEFAULT() {
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public Boolean getUseAsDEFAULT() {
         return useAsDEFAULT;
     }
  
-    /**
-     * 设置作为默认货箱
-     *
-     * @param useAsDEFAULT 作为默认货箱
-     */
-    public void setUseAsDEFAULT(Integer useAsDEFAULT) {
+    public void setUseAsDEFAULT(Boolean useAsDEFAULT) {
         this.useAsDEFAULT = useAsDEFAULT;
     }
  
 package com.huaheng.pc.config.locationType.controller;
  
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,133 +16,150 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
-import com.huaheng.pc.general.location.domain.Location;
-import com.huaheng.pc.general.location.service.LocationService;
+import com.huaheng.pc.config.zone.domain.Zone;
+import com.huaheng.pc.config.zone.service.ZoneService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
-import java.util.Arrays;
 import java.util.List;
  
+/**
+ * 库位类型 信息操作处理
+ * 
+ * @author ricard
+ * @date 2019-08-12
+ */
 @Controller
 @RequestMapping("/config/locationType")
-public class LocationTypeController extends BaseController {
-
+public class LocationTypeController extends BaseController
+{
     private String prefix = "config/locationType";
-
-    @Autowired
-    private LocationTypeService locationTypeService;
-    @Autowired
-    private LocationService locationService;
-
-    @RequestMapping("config:locationType:view")
-    @GetMapping()
-    public String locationType()
-    {
-        return prefix + "/locationType";
-    }
-
-    /**
-     * 查询库位类型列表
-     */
-    @RequiresPermissions("config:locationType:list")
-    @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT)
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd)  {
-        LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-
-        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
-                            .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
-                            .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
-                            .eq(StringUtils.isNotEmpty(locationType.getCode()),LocationType::getCode,locationType.getCode())
-                            .like(StringUtils.isNotEmpty(locationType.getName()),LocationType::getName,locationType.getName());
-
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
-            /**
-             * 使用分页查询
-             */
-            Page<LocationType> page = new Page<>(pageNum, pageSize);
-            IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
-            return getDataTable(iPage.getRecords());
-        } else {
-            List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
-            return getDataTable(list);
-        }
-    }
-
-    /**
-     * 新增库位类型
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存库位类型
-     */
-    @RequiresPermissions("config:locationType:add")
-    @Log(title = "通用-库位类型管理", operating = "新增库位类型", action = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(LocationType locationType)  {
-        Boolean result = locationTypeService.save(locationType);
-        return toAjax(result);
-    }
-
-    /**
-     * 修改库位类型
-     */
-    @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
-        LocationType locationType = locationTypeService.getById(id);
-        mmap.put("locationType", locationType);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存库位类型
-     */
-    @RequiresPermissions("config:locationType:edit")
-    @Log(title = "通用-库位类型管理", operating = "修改库位类型", action = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(LocationType locationType) {
-        locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
-        Boolean result = locationTypeService.updateById(locationType);
-        return toAjax(result);
-    }
-
-    /**
-     * 删除库位
-     */
-    @RequiresPermissions("config:locationType:remove")
-    @Log(title = "通用-库位类型管理", operating = "删除库位类型", action = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids) {
-        if (StringUtils.isEmpty(ids)){
-            return AjaxResult.error("id不能为空");
-        }
-
-        for (Integer id : Convert.toIntArray(ids)) {
-            LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(Location::getLocationType,id);
-
-            int count = locationService.count(lambdaQueryWrapper);
-            if (count != 0){
-                return AjaxResult.error("库位类型id="+id+",存在库位，不能删除。");
-            }
-        }
-        List<Integer> list = Arrays.asList(Convert.toIntArray(ids));
-        locationTypeService.removeByIds(list);
-        return AjaxResult.success("删除成功！");
-    }
+	
+	@Autowired
+	private LocationTypeService locationTypeService;
+	@Autowired
+	private ZoneService zoneService;
+	
+	@RequiresPermissions("config:locationType:view")
+	@GetMapping()
+	public String locationType()
+	{
+	    return prefix + "/locationType";
+	}
+	
+	/**
+	 * 查询库位类型列表
+	 */
+	@RequiresPermissions("config:locationType:list")
+	@Log(title = "配置-库位类型设置", operating = "查看库位类型", action = BusinessType.GRANT)
+	@PostMapping("/list")
+	@ResponseBody
+	public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd)
+	{
+		LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		PageDomain pageDomain = TableSupport.buildPageRequest();
+		Integer pageNum = pageDomain.getPageNum();
+		Integer pageSize = pageDomain.getPageSize();
+
+		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
+				.le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
+				.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode())
+				.eq(StringUtils.isNotEmpty(locationType.getCode()), LocationType::getCode, locationType.getCode())
+				.like(StringUtils.isNotEmpty(locationType.getName()), LocationType::getName, locationType.getName())
+				.orderByAsc(LocationType::getId);
+
+		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+			/**
+			 * 使用分页查询
+			 */
+			Page<LocationType> page = new Page<>(pageNum, pageSize);
+			IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
+			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+		} else {
+			List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
+			return getDataTable(list);
+		}
+	}
+	
+	/**
+	 * 新增库位类型
+	 */
+	@GetMapping("/add")
+	public String add()
+	{
+	    return prefix + "/add";
+	}
+	
+	/**
+	 * 新增保存库位类型
+	 */
+	@RequiresPermissions("config:locationType:add")
+	@Log(title = "配置-库位类型设置", operating = "新增库位类型", action = BusinessType.INSERT)
+	@PostMapping("/add")
+	@ResponseBody
+	public AjaxResult addSave(LocationType locationType)
+	{
+		if(StringUtils.isEmpty(locationType.getCode())){
+			return AjaxResult.error("库位类型为空");
+		}
+		//查找location，是否存在
+		Zone zone=new Zone();
+		LambdaQueryWrapper<Zone> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		lambdaQueryWrapper.eq(Zone::getLocationType,locationType.getCode())
+				.eq(Zone::getWarehouseCode,ShiroUtils.getWarehouseCode());
+		zone=zoneService.getOne(lambdaQueryWrapper);
+		if(zone==null){
+			return AjaxResult.error("系统没有此库位类型");
+		}
+		locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+		locationType.setCreatedBy(ShiroUtils.getLoginName());
+		locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
+		return toAjax(locationTypeService.save(locationType));
+	}
+
+	/**
+	 * 修改库位类型
+	 */
+	@GetMapping("/edit/{id}")
+	public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+	{
+		LocationType locationType = locationTypeService.getById(id);
+		mmap.put("locationType", locationType);
+	    return prefix + "/edit";
+	}
+	
+	/**
+	 * 修改保存库位类型
+	 */
+	@RequiresPermissions("config:locationType:edit")
+	@Log(title = "配置-库位类型设置", operating = "修改库位类型", action = BusinessType.UPDATE)
+	@PostMapping("/edit")
+	@ResponseBody
+	public AjaxResult editSave(LocationType locationType)
+	{
+		locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
+		return toAjax(locationTypeService.saveOrUpdate(locationType));
+	}
+	
+	/**
+	 * 删除库位类型
+	 */
+	@RequiresPermissions("config:locationType:remove")
+	@Log(title = "配置-库位类型设置", operating = "删除库位类型", action = BusinessType.DELETE)
+	@PostMapping( "/remove")
+	@ResponseBody
+	public AjaxResult remove(String ids)
+	{
+		if (StringUtils.isEmpty(ids))
+			return AjaxResult.error("id不能为空");
+		for (Integer id : Convert.toIntArray(ids))
+		{
+            locationTypeService.removeById(id);
+		}
+		return AjaxResult.success("删除成功！");
+	}
+	
 }
@@ -93,7 +93,7 @@ public class LocationType implements Serializable {
      * 有效
      */
     @TableField(value = "enable")
-    private Integer enable;
+    private Boolean enable;
  
     /**
      * 创建时间
@@ -7,6 +7,4 @@ import java.util.List;
 import java.util.Map;
  
 public interface LocationTypeService extends IService<LocationType>{
-
-    List<Map<String,Object>> getLocationPrefix();
 }
@@ -14,13 +14,4 @@ import java.util.Map;
 @Service("locationType")
 public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{
  
-    @Override
-    public List<Map<String, Object>> getLocationPrefix() {
-        LocationType locationType=new LocationType();
-        locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        locationType.setEnable(0);
-        LambdaQueryWrapper<LocationType> lambda = Wrappers.lambdaQuery(locationType);
-
-        return this.listMaps(lambda);
-    }
 }
@@ -24,6 +24,13 @@ import org.springframework.web.bind.annotation.*;
  
 import java.util.List;
  
+/**
+ * 库区 信息操作处理
+ *
+ * @author ricard
+ * @date 2019-08-12
+ */
+
 @Controller
 @RequestMapping("/config/zone")
 public class ZoneController extends BaseController {
@@ -29,7 +29,7 @@ import java.util.List;
  * 库区容量 信息操作处理
  * 
  * @author ricard
- * @date 2019-08-18
+ * @date 2019-08-12
  */
 @Controller
 @RequestMapping("/config/zoneCapacity")
+package com.huaheng.pc.general.bom.controller;
+
+import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.huaheng.pc.general.bom.service.BomDetailService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/general/bomDetail")
+public class BomDetailController {
+
+    private String prefix = "general/bomDetail";
+
+    @Resource
+    private BomDetailService bomDetailService;
+}
+package com.huaheng.pc.general.bom.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.huaheng.pc.general.bom.domain.BomHeader;
+import com.huaheng.pc.general.bom.service.BomDetailService;
+import com.huaheng.pc.general.bom.service.BomHeaderService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/general/bomHeader")
+public class BomHeaderController extends BaseController {
+
+    private String prefix = "general/bomHeader";
+
+    @Resource
+    private BomHeaderService bomHeaderService;
+
+    @Resource
+    private BomDetailService bomDetailService;
+
+    @RequiresPermissions("general:bomHeader:view")
+    @GetMapping()
+    public String company() {
+        return prefix + "/bomHeader";
+    }
+
+    /**
+     * 查询商品列表
+     */
+    @ApiOperation(value="查看商品列表", notes="根据物料编码、物料名称、货主编码、创建时间获取商品信息", httpMethod = "POST")
+    @RequiresPermissions("general:bomHeader:list")
+    @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="bomHeader",value="物料编码、物料名称、货主编码") BomHeader bomHeader,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<BomHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), BomHeader::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), BomHeader::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(bomHeader.getMaterialCode()), BomHeader::getMaterialCode, bomHeader.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(bomHeader.getMaterialName()), BomHeader::getMaterialName, bomHeader.getMaterialName())
+                .eq(StringUtils.isNotEmpty(bomHeader.getCompanyCode()), BomHeader::getCompanyCode, bomHeader.getCompanyCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<BomHeader> page = new Page<>(pageNum, pageSize);
+            IPage<BomHeader> iPage = bomHeaderService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<BomHeader> list = bomHeaderService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增商品
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存商品
+     */
+    @ApiOperation(value="新增商品", notes="新增商品", httpMethod = "POST")
+    @RequiresPermissions("general:bomHeader:add")
+    @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(@ApiParam(name = "containerType", value = "商品类型", required = true)
+                                          BomHeader bomHeader)  {
+        return toAjax(bomHeaderService.save(bomHeader));
+    }
+
+    /**
+     * 修改商品
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        mmap.put("bomHeader", bomHeaderService.getById(id));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存商品
+     */
+    @ApiOperation(value="修改商品", notes="修改商品", httpMethod = "POST")
+    @RequiresPermissions("general:bomHeader:edit")
+    @Log(title = "通用-商品", operating = "修改商品", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(
+            @ApiParam(name = "bomHeader", value = "商品实体类", required = true)BomHeader bomHeader) {
+        return toAjax(bomHeaderService.updateById(bomHeader));
+    }
+
+    /**
+     * 删除容器
+     */
+    @ApiOperation(value="删除商品", notes="根据id批量删除商品，参数示例1,2,3", httpMethod = "POST")
+    @RequiresPermissions("general:bomHeader:remove")
+    @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>();
+        for (Integer id : Convert.toIntArray(ids)) {
+
+            LambdaQueryWrapper<BomDetail> lambda = Wrappers.lambdaQuery();
+            List<BomDetail> bomDetailList = bomDetailService.list(lambda.eq(BomDetail::getBomId, id));
+            if (bomDetailList.size() != 0) {
+                list.add(id);
+            } else {
+                return AjaxResult.error("商品编码为(" + id + ")存在商品详情");
+            }
+        }
+        return toAjax(bomHeaderService.removeByIds(list));
+    }
+
+}
+package com.huaheng.pc.general.bom.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.general.bom.domain.BomDetail")
+@Data
+@TableName(value = "bom_detail")
+public class BomDetail implements Serializable {
+    /**
+     * 内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="内部号")
+    private Integer id;
+
+    /**
+     * 仓库代码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库代码")
+    private String warehouseCode;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主")
+    private String companyCode;
+
+    /**
+     * 物料清单内部号
+     */
+    @TableField(value = "bomId")
+    @ApiModelProperty(value="物料清单内部号")
+    private Integer bomId;
+
+    /**
+     * 物料编码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="物料编码")
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="物料名称")
+    private String materialName;
+
+    /**
+     * 数量单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="数量单位")
+    private String materialUnit;
+
+    /**
+     * 组套层次
+     */
+    @TableField(value = "buildLevel")
+    @ApiModelProperty(value="组套层次")
+    private Integer buildLevel;
+
+    /**
+     * 序号
+     */
+    @TableField(value = "buildSequence")
+    @ApiModelProperty(value="序号")
+    private Integer buildSequence;
+
+    /**
+     * 每成品需要数量
+     */
+    @TableField(value = "qty")
+    @ApiModelProperty(value="每成品需要数量")
+    private Integer qty;
+
+    /**
+     * 分配规则
+     */
+    @TableField(value = "allocationRule")
+    @ApiModelProperty(value="分配规则")
+    private String allocationRule;
+
+    /**
+     * 从货位
+     */
+    @TableField(value = "fromLocation")
+    @ApiModelProperty(value="从货位")
+    private String fromLocation;
+
+    /**
+     * 有效
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="有效")
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_BOMID = "bomId";
+
+    public static final String COL_MATERIALCODE = "materialCode";
+
+    public static final String COL_MATERIALNAME = "materialName";
+
+    public static final String COL_MATERIALUNIT = "materialUnit";
+
+    public static final String COL_BUILDLEVEL = "buildLevel";
+
+    public static final String COL_BUILDSEQUENCE = "buildSequence";
+
+    public static final String COL_QTY = "qty";
+
+    public static final String COL_ALLOCATIONRULE = "allocationRule";
+
+    public static final String COL_FROMLOCATION = "fromLocation";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_USERDEF4 = "userDef4";
+
+    public static final String COL_USERDEF5 = "userDef5";
+
+    public static final String COL_USERDEF6 = "userDef6";
+
+    public static final String COL_USERDEF7 = "userDef7";
+
+    public static final String COL_USERDEF8 = "userDef8";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+}
 \ No newline at end of file
+package com.huaheng.pc.general.bom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.general.bom.domain.BomDetail;
+
+public interface BomDetailMapper extends BaseMapper<BomDetail> {
+}
 \ No newline at end of file
+package com.huaheng.pc.general.bom.service;
+
+import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface BomDetailService extends IService<BomDetail>{
+
+
+}
+package com.huaheng.pc.general.bom.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.huaheng.pc.general.bom.mapper.BomDetailMapper;
+
+@Service
+public class BomDetailServiceImpl extends ServiceImpl<BomDetailMapper, BomDetail> implements BomDetailService{
+
+}
@@ -10,6 +10,9 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
  
+/**
+ * 承运商
+ */
 @ApiModel(value="com.huaheng.pc.general.carrier.domain.Carrier")
 @Data
 @TableName(value = "carrier")
@@ -11,7 +11,7 @@ public interface CompanyService extends IService&lt;Company&gt;{
  
     public List<Company> selectCompanyByCurrentUserId();
  
-    List<Company> selectCompanyByUserId(Integer userId);
+    public List<Company> selectCompanyByUserId();
  
     public AjaxResult addCompany(Company company);
  
@@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
      * @return
      */
     @Override
-    public List<Company> selectCompanyByUserId(Integer userId) {
+    public List<Company> selectCompanyByUserId() {
         UserCompany condition = new UserCompany();
-        condition.setUserId(userId);
+        condition.setUserId(ShiroUtils.getUserId());
         List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition);
         Company company = new Company();
         company.setWarehouseCode(ShiroUtils.getWarehouseCode());
@@ -180,7 +180,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "enable")
     @ApiModelProperty(value="状态")
-    private byte[] enable;
+    private Boolean enable;
  
     /**
      * 创建时间
@@ -2,7 +2,12 @@ package com.huaheng.pc.general.materialUnit.service;
  
 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
 public interface MaterialUnitService extends IService<MaterialUnit>{
  
+    public List<Map<String, Object>> getUnit();
  
 }
 package com.huaheng.pc.general.materialUnit.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
 import com.huaheng.pc.general.materialUnit.mapper.MaterialUnitMapper;
 import com.huaheng.pc.general.materialUnit.service.MaterialUnitService;
-@Service
+@Service("materialUnitService")
 public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{
  
+    @Override
+    public List<Map<String, Object>> getUnit(){
+        LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery();
+        return this.listMaps(lambda);
+    }
 }
@@ -60,6 +60,7 @@ public class Role
     private String warehouseCode;
  
     /** 用户是否存在此角色标识 默认不存在 */
+    @TableField(exist = false)
     private boolean flag = false;
  
     /** 菜单组 */
@@ -87,7 +88,6 @@ public class Role
     private Date updateTime;
  
     /** 备注 */
-//    @TableField(exist=false)
     @TableField
     private String remark;
  
@@ -6,10 +6,7 @@ import com.github.abel533.echarts.Option;
 import com.github.abel533.echarts.axis.Axis;
 import com.github.abel533.echarts.axis.CategoryAxis;
 import com.github.abel533.echarts.axis.ValueAxis;
-import com.github.abel533.echarts.code.Orient;
-import com.github.abel533.echarts.code.PointerType;
-import com.github.abel533.echarts.code.SeriesType;
-import com.github.abel533.echarts.code.Trigger;
+import com.github.abel533.echarts.code.*;
 import com.github.abel533.echarts.json.GsonUtil;
 import com.github.abel533.echarts.series.Line;
 import com.github.abel533.echarts.series.Pie;
@@ -76,7 +73,7 @@ public class IndexController extends BaseController
         pie.itemStyle().emphasis().setShadowBlur(10);
         pie.itemStyle().emphasis().setShadowOffsetX(0);
         pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)");
-        String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = '" + ShiroUtils.getWarehouseCode()+"'";
+        String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = ' " + ShiroUtils.getWarehouseCode()+"' ;";
         List<LinkedHashMap<String, Object>> results = mapper.selectCommon(sql);
         for(LinkedHashMap<String, Object> item : results){
             ChartData chartData = new ChartData();
@@ -226,7 +223,8 @@ public class IndexController extends BaseController
         option.legend().setTop(10);
         option.legend().setBottom(10);
         option.legend().setData(new ArrayList<String>());
-        option.legend().setType("scroll");
+        option.legend().setType(LegendType.scroll);
+        // option.legend().setType("scroll");
  
         Pie pie = new Pie();
         pie.setName("库存");
@@ -2,7 +2,7 @@
 #\u540D\u79F0
 huaheng.name=huaheng
 #\u7248\u672C
-huaheng.version=2.6.0
+huaheng.version=4.0.0
 #\u7248\u6743\u5E74\u4EFD
 huaheng.copyrightYear=2018
 #\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84
@@ -107,31 +107,5 @@ gen.autoRemovePre=false
 # \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
 gen.tablePrefix=sys_
  
-# default-store in spring session. it will be set in redis only outside.
-spring.session.store-type=none
-# REDIS (RedisProperties)
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0  
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=127.0.0.1
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=6379  
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-#spring.redis.pool.max-active=8
-spring.redis.jedis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-#spring.redis.pool.max-wait=-1
-spring.redis.jedis.pool.max-wait=-1ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-#spring.redis.pool.max-idle=8
-spring.redis.jedis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-#spring.redis.pool.min-idle=0
-spring.redis.jedis.pool.min-idle= 0
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout= 0  
-spring.redis.lettuce.shutdown-timeout=0ms
  
  
+<?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.huaheng.pc.config.containerCapacity.mapper.ContainerCapacityMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="containerType" jdbcType="VARCHAR" property="containerType" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="materialName" jdbcType="VARCHAR" property="materialName" />
+    <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
+    <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="qty" jdbcType="DECIMAL" property="qty" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, containerType, warehouseCode, companyCode, materialCode, materialName, materialSpec, 
+    materialUnit, qty, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, 
+    userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
@@ -6,23 +6,13 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-containerCapacity-add">
         <div class="form-group">
-            <label class="col-sm-3 control-label">库区编码：</label>
+            <label class="col-sm-3 control-label">容器类型编码：</label>
             <div class="col-sm-8">
-                <select id="zonecode" name="zonecode" class="form-control" th:with="result=${@zone.getZoneCodeList()}">
-                    <option th:each="item : ${result}" th:text="${item['code']}" th:value="${item['code']}"></option>
-                </select>
+                <input id="containerType" name="containerType" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">容器类型名称：</label>
-            <div class="col-sm-8">
-                <select id="containercapacity" name="containercapacity" class="form-control" th:with="list=${@containerType.getAllContainerType()}">
-                    <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['name']}" th:attr = " containerTypeId = ${item['id']}, containerTypeCode = ${item['code']}"></option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">物料编码：</label>
+            <label class="col-sm-3 control-label">商品编码：</label>
             <div class="col-sm-8">
                 <input id="materialCode" name="materialCode" class="form-control" type="text">
             </div>
@@ -34,17 +24,12 @@
             <!--</div>-->
         <!--</div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label">上限值：</label>
-            <div class="col-sm-8">
-                <input id="uph" name="uph" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
+            <label class="col-sm-3 control-label">存放数量：</label>
             <div class="col-sm-8">
-                <input id="remark" name="remark" class="form-control" type="text">
+                <input id="qty" name="qty" class="form-control" type="text">
             </div>
         </div>
+
         <!--<div class="form-group">	-->
         <!--<label class="col-sm-3 control-label">创建时间：</label>-->
         <!--<div class="col-sm-8">-->
@@ -131,7 +116,7 @@
     var prefix = ctx + "config/containerCapacity";
     $("#form-containerCapacity-add").validate({
         rules:{
-            uph:{
+            qty:{
                 required:true,
                 digits:true,
                 number:true,
@@ -146,12 +131,9 @@
                 data : {
                     "enable" : $("input[name='enable']").is(':checked'),
                     "materialCode" :$("input[name='materialCode']").val(),
-                    "uph"  :$("input[name='uph']").val(),
-                    "remark"  :$("input[name='remark']").val(),
-                    "code" : $("#zonecode option:selected").val(),
-                    "containerTypeName" : $("#containercapacity option:selected").val(),
-                    "containerTypeId" : $("#containercapacity option:selected").attr("containerTypeId"),
-                    "containerTypeCode": $("#containercapacity option:selected").attr("containerTypeCode"),
+                    "qty"  :$("input[name='qty']").val(),
+                    "containerType"  :$("input[name='containerType']").val(),
+
                 },
                 async : false,
                 error : function(request) {
@@ -10,13 +10,13 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            库区编码：<input type="text" name="code"/>
+                            容器类型编码：<input type="text" name="containerType"/>
                         </li>
                         <li>
-                            物料编码：<input type="text" name="materialCode"/>
+                            商品编码：<input type="text" name="materialCode"/>
                         </li>
                         <li>
-                            物料名称：<input type="text" name="materialName"/>
+                            商品名称：<input type="text" name="materialName"/>
                         </li>
                         <!--<li>-->
                         <!--角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">-->
@@ -75,32 +75,24 @@
                     title : '标识'
                 },
                 {
-                    field : 'code',
-                    title : '编码'
-                },
-                {
-                    field : 'containerTypeName',
-                    title : '容器类型名称'
-                },
-                {
-                    field : 'containerTypeCode',
+                    field : 'containerType',
                     title : '容器类型编码'
                 },
                 {
                     field : 'materialCode',
-                    title : '物料编码'
+                    title : '商品编码'
                 },
                 {
                     field : 'materialName',
-                    title : '物料名称'
+                    title : '商品名称'
                 },
                 {
-                    field : 'uph',
-                    title : '上限值'
+                    field : 'materialSpec',
+                    title : '商品单位'
                 },
                 {
-                    field : 'remark',
-                    title : '备注'
+                    field : 'qty',
+                    title : '存放数量'
                 },
                 {
                     field : 'created',
@@ -6,22 +6,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-containerCapacity-edit" th:object="${containerCapacity}">
         <input id="id" name="id" th:field="*{id}"  type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label">库区编码：</label>
-            <div class="col-sm-8">
-                <select id="zonecode" name="zonecode" class="form-control" th:with="result=${@zone.getZoneCodeList()}" disabled="disabled">
-                    <option th:each="item : ${result}" th:field="*{code}" th:text="${item['code']}" th:value="${item['code']}"></option>
-                </select>
-                 </div>
-            </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">容器类型名称：</label>
-            <div class="col-sm-8">
-                <select id="containercapacity" name="containercapacity" class="form-control" th:with="list=${@containerType.getAllContainerType()}" disabled="disabled">
-                    <option th:each="item : ${list}"  th:field="*{containerTypeName}" th:text="${item['name']}" th:value="${item['name']}" th:attr = " containerTypeId = ${item['id']}, containerTypeCode = ${item['code']}"></option>
-                </select>
-            </div>
-        </div>
+
         <!--<div class="form-group">	-->
         <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
         <!--<div class="col-sm-8">-->
@@ -35,29 +20,36 @@
         <!--</div>-->
         <!--</div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label">物料编码：</label>
+            <label class="col-sm-3 control-label">容器类型编码：</label>
+            <div class="col-sm-8">
+                <input id="containerType" name="containerType" th:field="*{containerType}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">商品编码：</label>
             <div class="col-sm-8">
-                <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text" disabled="disabled">
+                <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text" readonly="readonly">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">物料名称：</label>
+            <label class="col-sm-3 control-label">商品名称：</label>
             <div class="col-sm-8">
-                <input id="materialName" name="materialName" th:field="*{materialName}" class="form-control" type="text" disabled="disabled">
+                <input id="materialName" name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly="readonly">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">上限值：</label>
+            <label class="col-sm-3 control-label">商品规格：</label>
             <div class="col-sm-8">
-                <input id="uph" name="uph" th:field="*{uph}" class="form-control" type="text">
+                <input id="materialSpec" name="materialSpec" th:field="*{materialSpec}" class="form-control" type="text" readonly="readonly">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
+            <label class="col-sm-3 control-label">存放数量：</label>
             <div class="col-sm-8">
-                <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
+                <input id="qty" name="qty" th:field="*{qty}" class="form-control" type="text">
             </div>
         </div>
+
         <!--<div class="form-group">	-->
         <!--<label class="col-sm-3 control-label">创建时间：</label>-->
         <!--<div class="col-sm-8">-->
@@ -175,13 +167,11 @@
                     "id": $("input[name='id']").val(),
                     "enable" : $("input[name='enable']").is(':checked'),
                     "code" : $("#zonecode option:selected").val(),
-                    "containerTypeName" : $("#containercapacity option:selected").val(),
-                    "containerTypeId" : $("#containercapacity option:selected").attr("containerTypeId"),
-                    "containerTypeCode": $("#containercapacity option:selected").attr("containerTypeCode"),
                     "materialName" :$("input[name='materialName']").val(),
                     "materialCode" :$("input[name='materialCode']").val(),
-                    "uph"  :$("input[name='uph']").val(),
-                    "remark"  :$("input[name='remark']").val(),
+                    "qty"  :$("input[name='qty']").val(),
+                    "containerType"  :$("input[name='containerType']").val(),
+
                 },
                 async : false,
                 error : function(request) {
@@ -17,6 +17,12 @@
 					<input id="name" name="name" class="form-control" type="text">
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">序号：</label>
+				<div class="col-sm-8">
+					<input id="sequence" name="sequence" class="form-control" type="text">
+				</div>
+			</div>
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">仓库Id：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -30,12 +36,6 @@
 				<!--</div>-->
 			<!--</div>-->
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">前缀：</label>
-				<div class="col-sm-8">
-					<input id="prefix" name="prefix" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
 				<label class="col-sm-3 control-label">空箱重量kg：</label>
 				<div class="col-sm-8">
 					<input id="emptyWeight" name="emptyWeight" class="form-control" type="text">
@@ -71,6 +71,12 @@
 					<input id="fillPercent" name="fillPercent" class="form-control" type="text">
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">状态：</label>
+				<div class="col-sm-8">
+					<input id="status" name="status" class="form-control" type="text">
+				</div>
+			</div>
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">作为默认货箱：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -81,7 +87,7 @@
 			<label class="col-sm-3 control-label">是否默认容器：</label>
 			<div class="col-sm-8">
 				<div class="onoffswitch">
-					<input type="checkbox" th:checked="false" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
+					<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
 					<label class="onoffswitch-label" for="useAsDefault">
 						<span class="onoffswitch-inner"></span>
 						<span class="onoffswitch-switch"></span>
@@ -90,36 +96,6 @@
 			</div>
 		</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">类型描述：</label>
-				<div class="col-sm-8">
-					<input id="remark" name="remark" class="form-control" type="text">
-				</div>
-			</div>
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">创建时间：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="created" name="created" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">创建用户：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">创建时间：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">更新用户：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<div class="form-group">	
 				<label class="col-sm-3 control-label">是否有效：</label>
 				<div class="col-sm-8">
 					<!--<input id="enable" name="enable" class="form-control" type="text">-->
@@ -205,14 +181,14 @@
                         "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
                         "code" :$("input[name='code']").val(),
                         "name" :$("input[name='name']").val(),
-                        "prefix" :$("input[name='prefix']").val(),
+                        "sequence" :$("input[name='sequence']").val(),
                         "emptyWeight" :$("input[name='emptyWeight']").val(),
                         "length"  :$("input[name='length']").val(),
                         "width"  :$("input[name='width']").val(),
                         "height"  :$("input[name='height']").val(),
                         "maxWeight" :$("input[name='maxWeight']").val(),
                         "fillPercent" :$("input[name='fillPercent']").val(),
-                        "remark" :$("input[name='remark']").val()
+						"status" :$("input[name='status']").val(),
                     },
                     async : false,
                     error : function(request) {
@@ -87,6 +87,10 @@
 						field : 'companyCode',
 						title : '货主编码'
 					},
+					{
+						field : 'sequence',
+						title : '序号'
+					},
 				{
 					field : 'emptyWeight', 
 					title : '空箱重量kg'
@@ -124,10 +128,6 @@
 						}
 				},
 				{
-					field : 'remark', 
-					title : '类型描述' 
-				},
-				{
 					field : 'created', 
 					title : '创建时间' 
 				},
@@ -30,12 +30,7 @@
                     <!--<input id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">-->
                 <!--</div>-->
             <!--</div>-->
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">前缀：</label>
-                <div class="col-sm-8">
-                    <input id="prefix" name="prefix" th:field="*{prefix}" class="form-control" type="text">
-                </div>
-            </div>
+
             <div class="form-group">	
                 <label class="col-sm-3 control-label">空箱重量kg：</label>
                 <div class="col-sm-8">
@@ -78,24 +73,24 @@
                     <input id="useAsDefault" name="useAsDefault" th:field="*{ }" class="form-control" type="text">
                 </div>
             </div>-->
-            <div class="form-group">
-                <label class="col-sm-3 control-label">是否默认容器：</label>
-                <div class="col-sm-8">
-                    <div class="onoffswitch">
-                        <input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
-                        <label class="onoffswitch-label" for="useAsDefault">
-                            <span class="onoffswitch-inner"></span>
-                            <span class="onoffswitch-switch"></span>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">类型描述：</label>
-                <div class="col-sm-8">
-                    <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
+            <!--<div class="form-group">-->
+                <!--<label class="col-sm-3 control-label">是否默认容器：</label>-->
+                <!--<div class="col-sm-8">-->
+                    <!--<div class="onoffswitch">-->
+                        <!--<input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">-->
+                        <!--<label class="onoffswitch-label" for="useAsDefault">-->
+                            <!--<span class="onoffswitch-inner"></span>-->
+                            <!--<span class="onoffswitch-switch"></span>-->
+                        <!--</label>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="form-group">	-->
+                <!--<label class="col-sm-3 control-label">类型描述：</label>-->
+                <!--<div class="col-sm-8">-->
+                    <!--<input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">-->
+                <!--</div>-->
+            <!--</div>-->
             <!--<div class="form-group">	-->
                 <!--<label class="col-sm-3 control-label">创建时间：</label>-->
                 <!--<div class="col-sm-8">-->
@@ -17,12 +17,6 @@
 					<input id="name" name="name" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">前缀：</label>
-				<div class="col-sm-8">
-					<input id="prefix" name="prefix" class="form-control" type="text">
-				</div>
-			</div>
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">仓库Id：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -60,9 +54,33 @@
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">描述：</label>
+				<label class="col-sm-3 control-label">最小允许单位：</label>
+				<div class="col-sm-8">
+					<input id="minQtyUm" name="minQtyUm" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">校验位：</label>
+				<div class="col-sm-8">
+					<input id="checkDigit" name="checkDigit" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">最多混放物料数：</label>
+				<div class="col-sm-8">
+					<input id="maxMaterials" name="maxMaterials" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">最大批号数量：</label>
 				<div class="col-sm-8">
-					<input id="remark" name="remark" class="form-control" type="text">
+					<input id="maxLots" name="maxLots" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">最大允许托盘数：</label>
+				<div class="col-sm-8">
+					<input id="maxContainers" name="maxContainers" class="form-control" type="text">
 				</div>
 			</div>
 			<!--<div class="form-group">	-->
@@ -89,19 +107,19 @@
 					<!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
 				<!--</div>-->
 			<!--</div>-->
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">是否有效：</label>
-				<div class="col-sm-8">
-					<!--<input id="enable" name="enable" class="form-control" type="text">-->
-					<div class="onoffswitch">
-						<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
-						<label class="onoffswitch-label" for="enable">
-							<span class="onoffswitch-inner"></span>
-							<span class="onoffswitch-switch"></span>
-						</label>
-					</div>
-				</div>
-			</div>
+			<!--<div class="form-group">	-->
+				<!--<label class="col-sm-3 control-label">是否有效：</label>-->
+				<!--<div class="col-sm-8">-->
+					<!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
+					<!--<div class="onoffswitch">-->
+						<!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
+						<!--<label class="onoffswitch-label" for="enable">-->
+							<!--<span class="onoffswitch-inner"></span>-->
+							<!--<span class="onoffswitch-switch"></span>-->
+						<!--</label>-->
+					<!--</div>-->
+				<!--</div>-->
+			<!--</div>-->
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">是否删除：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -19,12 +19,6 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">前缀：</label>
-                <div class="col-sm-8">
-                    <input id="prefix" name="prefix" th:field="*{prefix}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
                 <label class="col-sm-3 control-label">长m：</label>
                 <div class="col-sm-8">
                     <input id="length" name="length" th:field="*{length}" class="form-control" type="text">
@@ -49,9 +43,33 @@
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">描述：</label>
+                <label class="col-sm-3 control-label">最小允许单位：</label>
+                <div class="col-sm-8">
+                    <input id="minQtyUm" name="minQtyUm" th:field="*{minQtyUm}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">校验位：</label>
+                <div class="col-sm-8">
+                    <input id="checkDigit" name="checkDigit" th:field="*{checkDigit}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">最多混放物料数：</label>
+                <div class="col-sm-8">
+                    <input id="maxMaterials" name="maxMaterials" th:field="*{maxMaterials}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">最大批号数量：</label>
+                <div class="col-sm-8">
+                    <input id="maxLots" name="maxLots" th:field="*{maxLots}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">最大允许托盘数：</label>
                 <div class="col-sm-8">
-                    <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
+                    <input id="maxContainers" name="maxContainers" th:field="*{maxContainers}" class="form-control" type="text">
                 </div>
             </div>
             <!--<div class="form-group">	-->
@@ -71,20 +71,12 @@
 					title : '库位类型Id'
 				},
                     {
-                        field : 'prefix',
-                        title : '前缀'
+                        field : 'code',
+                        title : '货位类型'
                     },
                     {
-                        field : 'name',
-                        title : '库位名称'
-                    },
-                    {
-					field : 'code', 
-					title : '编码' 
-				},
-				{
-					field : 'warehouseId', 
-					title : '仓库Id'
+					field : 'name',
+					title : '名称'
 				},
 				{
 					field : 'warehouseCode', 
@@ -107,9 +99,25 @@
 					title : '最大重量kg'
 				},
 				{
-					field : 'remark', 
-					title : '描述' 
-				},
+					field : 'minQtyUm',
+					title : '最小允许单位'
+				},
+					{
+						field : 'checkDigit',
+						title : '校验位'
+					},
+					{
+						field : 'checkDigit',
+						title : '校验位'
+					},
+					{
+						field : 'maxMaterials',
+						title : '最多混放物料数'
+					},
+					{
+						field : 'maxContainers',
+						title : '最大允许托盘数'
+					},
 				{
 					field : 'created', 
 					title : '创建时间' 
@@ -12,17 +12,11 @@
                     <input id="materialId" name="materialId" type="hidden">
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">仓库：</label>
-				<div class="col-sm-8">
-					<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">
-				</div>
-			</div>
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">货位过滤条件：</label>
 				<div class="col-sm-8">
-                    <select id="zoneId" name="zoneId" class="form-control" th:with="zones=${@zone.list()}">
-                        <option th:each="zone: ${zones}" th:text="${zone['name']}" th:value="${zone['id']}"></option>
+                    <select id="filterCode" name="filterCode" class="form-control" th:with="zones=${@zone.list()}">
+                        <option th:each="zone: ${zones}" th:text="${zone['name']}" th:value="${zone['code']}"></option>
                     </select>
 				</div>
 			</div>
@@ -54,7 +48,7 @@
                 materialCode:{
 					required:true,
 				},
-				warehouseCode:{
+				filterCode:{
 					required:true,
 				},
 				materialCode:{
@@ -7,98 +7,39 @@
         <form class="form-horizontal m" id="form-zoneCapacity-edit" th:object="${zoneCapacity}">
             <input id="id" name="id" th:field="*{id}"  type="hidden">
             <div class="form-group">	
-                <label class="col-sm-3 control-label">编码：</label>
+                <label class="col-sm-3 control-label">货位过滤条件：</label>
                 <div class="col-sm-8">
-                    <input id="code" name="code" th:field="*{code}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">名称：</label>
-                <div class="col-sm-8">
-                    <input id="name" name="name" th:field="*{name}" class="form-control" type="text">
+                    <input id="filterCode" name="filterCode" th:field="*{filterCode}" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">物料：</label>
+                <label class="col-sm-3 control-label">商品编码：</label>
                 <div class="col-sm-8">
-                    <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
-                    <input id="materialId" name="materialId" th:field="*{materialId}" type="hidden">
+                    <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">物料类别：</label>
+                <label class="col-sm-3 control-label">商品名称：</label>
                 <div class="col-sm-8">
-                    <select id="materialType" name="materialType"  th:field="*{materialType}" th:with="type=${@dict.getType('materialType')}" class="form-control">
-                        <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
-                    </select>
+                    <input id="materialName" name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">仓库区域：</label>
+                <label class="col-sm-3 control-label">商品规格：</label>
                 <div class="col-sm-8">
-                    <select id="zoneId" name="zoneId" class="form-control" th:field="*{zoneId}" th:with="zones=${@zone.getZoneCodeList()}">
-                        <option th:each="zone: ${zones}" th:text="${zone['name']}" th:value="${zone['id']}"></option>
-                    </select>
+                    <input id="materialSpec" name="materialSpec" th:field="*{materialSpec}" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">上限预警值：</label>
+                <label class="col-sm-3 control-label">最大数量：</label>
                 <div class="col-sm-8">
-                    <input id="uphAlarm" name="uphAlarm" th:field="*{uphAlarm}" class="form-control" type="text">
+                    <input id="maxQty" name="maxQty" th:field="*{maxQty}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">上限值：</label>
-                <div class="col-sm-8">
-                    <input id="uph" name="uph" th:field="*{uph}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">下限预警值：</label>
-                <div class="col-sm-8">
-                    <input id="lphAlarm" name="lphAlarm" th:field="*{lphAlarm}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">下限值：</label>
-                <div class="col-sm-8">
-                    <input id="lph" name="lph" th:field="*{lph}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">是否有效：</label>
-                <div class="col-sm-8">
-                    <div class="onoffswitch">
-                        <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
-                        <label class="onoffswitch-label" for="enable">
-                            <span class="onoffswitch-inner"></span>
-                            <span class="onoffswitch-switch"></span>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">创建时间：</label>
+                <label class="col-sm-3 control-label">最小数量：</label>
                 <div class="col-sm-8">
-                    <input id="created" name="created" th:field="*{created}" class="form-control" type="text" readonly="readonly">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">创建用户：</label>
-                <div class="col-sm-8">
-                    <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="readonly">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text" readonly="readonly">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">更新用户：</label>
-                <div class="col-sm-8">
-                    <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">
+                    <input id="minQty" name="minQty" th:field="*{minQty}" class="form-control" type="text">
                 </div>
             </div>
 			<div class="form-group">
@@ -114,30 +55,23 @@
 		var prefix = ctx + "config/zoneCapacity"
 		$("#form-zoneCapacity-edit").validate({
             rules:{
-                code:{
-                    required:true,
-                },
-                name:{
+                filterCode:{
                     required:true,
                 },
                 materialCode:{
                     required:true,
                 },
-                uphAlarm:{
+                materialName:{
                     required:true,
-                    range:[0, 100]
                 },
-                uph:{
+                materialSpec:{
                     required:true,
-                    range:[0, 100]
                 },
-                lphAlarm:{
+                maxQty:{
                     required:true,
-                    range:[0, 100]
                 },
-                lph:{
+                minQty:{
                     required:true,
-                    range:[0, 100]
                 },
             },
 			submitHandler: function(form) {
@@ -6,17 +6,37 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-material-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">存货编码：</label>
+				<label class="col-sm-3 control-label">编码：</label>
 				<div class="col-sm-8">
 					<input id="code" name="code" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">
+				<label class="col-sm-3 control-label">货主编码：</label>
+				<div class="col-sm-8">
+					<input id="companyCode" name="companyCode" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
 				<label class="col-sm-3 control-label">名称：</label>
 				<div class="col-sm-8">
 					<input id="name" name="name" class="form-control" type="text">
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">规格：</label>
+				<div class="col-sm-8">
+					<input id="spec" name="spec" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">单位：</label>
+				<div class="col-sm-8">
+					<select id="unit" name="unit" class="form-control" th:with="materialUnit=${@materialUnitService.getUnit()}">
+						<option th:each="item : ${materialUnit}" th:text="${item['unit']}" th:value="${item['unit']}"></option>
+					</select>
+				</div>
+			</div>
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">物料类别：</label>
 				<div class="col-sm-8">
@@ -26,140 +46,101 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">库区编码：</label>
+				<label class="col-sm-3 control-label">ABC分类：</label>
 				<div class="col-sm-8">
-					<input id="zoneCode" name="zoneCode" class="form-control" type="text" placeholder="指定该货物只能放在规定库区时填写，否则不填！"/>
+					<input id="abcClass" name="abcClass" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">货主：</label>
+				<label class="col-sm-3 control-label">保质期(天)</label>
 				<div class="col-sm-8">
-					<select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}">
-                        <option value ="" code="">全部货主</option>
-                        <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>
-					</select>
+					<input id="daysToExpire" name="daysToExpire" class="form-control" type="text"/>
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">条码：</label>
+				<label class="col-sm-3 control-label">定位规则：</label>
 				<div class="col-sm-8">
-					<input id="barcode" name="barcode" class="form-control" type="text">
+					<input id="locatingRule" name="locatingRule" class="form-control" type="text">
 				</div>
 			</div>
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">条码2：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="barcode2" name="barcode2" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">条码3：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="barcode3" name="barcode3" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">条码4：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="barcode4" name="barcode4" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">类别A：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="classA" name="classA" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">类别B：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="classB" name="classB" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">类别C：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="classC" name="classC" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">规格：</label>
+				<label class="col-sm-3 control-label">分配规则：</label>
 				<div class="col-sm-8">
-					<input id="specification" name="specification" class="form-control" type="text">
+					<input id="allocationRule" name="allocationRule" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">品牌：</label>
+				<label class="col-sm-3 control-label">补货规则：</label>
 				<div class="col-sm-8">
-					<input id="brand" name="brand" class="form-control" type="text">
+					<input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">空货位规则：</label>
+				<div class="col-sm-8">
+					<input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text">
 				</div>
 			</div>
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">尺码：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="size" name="size" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">颜色：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="color" name="color" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">产地：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="placeOfOrigin" name="placeOfOrigin" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">保质期（天）：</label>
+				<label class="col-sm-3 control-label">入库规则</label>
 				<div class="col-sm-8">
-					<input id="daysToExpire" name="daysToExpire" class="form-control" type="text">
+					<input id="receivingFlow" name="receivingFlow" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">临期预警天数：</label>
+				<label class="col-sm-3 control-label">出库流程：</label>
 				<div class="col-sm-8">
-					<input id="expiringDays" name="expiringDays" class="form-control" type="text">
+					<input id="shippingFlow" name="shippingFlow" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">收货预警天数：</label>
+				<label class="col-sm-3 control-label">属性模板：</label>
 				<div class="col-sm-8">
-					<input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
+					<input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">成本：</label>
+				<label class="col-sm-3 control-label">记录序列号：</label>
 				<div class="col-sm-8">
-					<input id="costPrice" name="costPrice" class="form-control" type="text">
+					<input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">标价：</label>
+				<label class="col-sm-3 control-label">自动生成序列号：</label>
 				<div class="col-sm-8">
-					<input id="listPrice" name="listPrice" class="form-control" type="text">
+					<input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text">
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">净价：</label>
+				<label class="col-sm-3 control-label">自动生成序列号表达式：</label>
 				<div class="col-sm-8">
-					<input id="netPrice" name="netPrice" class="form-control" type="text">
+					<input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text">
 				</div>
 			</div>
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">出入库是否按照 生产日期 来匹配：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="manufactureDate" name="manufactureDate" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
-			<!--<div class="form-group">	-->
-				<!--<label class="col-sm-3 control-label">出入库是否按照 入库时间 来匹配：</label>-->
-				<!--<div class="col-sm-8">-->
-					<!--<input id="receiptDate" name="receiptDate" class="form-control" type="text">-->
-				<!--</div>-->
-			<!--</div>-->
+			<div class="form-group">
+				<label class="col-sm-3 control-label">序列号模板：</label>
+				<div class="col-sm-8">
+					<input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">临期预警天数：</label>
+				<div class="col-sm-8">
+					<input id="expiringDays" name="expiringDays" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">收货预警天数：</label>
+				<div class="col-sm-8">
+					<input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
+				</div>
+			</div>
+			<!--<div class="form-group">
+				<label class="col-sm-3 control-label">数据版本：</label>
+				<div class="col-sm-8">
+					<input id="version" name="version" class="form-control" type="text">
+				</div>
+			</div>-->
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">创建时间：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -184,8 +165,9 @@
 					<!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
 				<!--</div>-->
 			<!--</div>-->
+
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">是否有效：</label>
+				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8">
 					<div class="onoffswitch">
 						<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
@@ -268,13 +250,7 @@
 				},
                 name:{
                     required:true,
-                },
-                /*zoneCode:{
-                    required:true,
-                },*/
-                barcode:{
-                    required:true,
-                },
+                }
 			},
 			submitHandler: function(form) {
 				// $.operate.save(prefix + "/add", $('#form-material-add').serialize());
@@ -282,8 +258,6 @@
                 // $.operate.save(prefix + "/add", tableValue);
                 var tableValue = $("#form-material-add").serialize();
                 tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
-                tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val());
-                tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code"));
                 $.operate.save(prefix + "/add", tableValue);
 			}
 		});
@@ -3,282 +3,260 @@
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-material-edit" th:object="${material}">
-            <input id="id" name="id" th:field="*{id}"  type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">存货编码：</label>
-                <div class="col-sm-8">
-                    <input id="code" name="code" th:field="*{code}" class="form-control" type="text" readonly="readonly">
-                </div>
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-material-add" th:object="${material}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">编码：</label>
+            <div class="col-sm-8">
+                <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">物料类别：</label>
-                <div class="col-sm-8">
-                    <select id="type" name="type" class="form-control" th:with="locationType=${@dict.getType('materialType')}">
-                        <option th:each="item : ${locationType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}" th:field="*{type}"></option>
-                    </select>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">名称：</label>
+            <div class="col-sm-8">
+                <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">货主：</label>
-                <div class="col-sm-8">
-                    <select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}"  th:field="*{companyId}" disabled="disabled">
-                        <option value ="" code="">全部货主</option>
-                        <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>
-                    </select>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">规格：</label>
+            <div class="col-sm-8">
+                <input id="spec" name="spec" class="form-control" type="text" th:field="*{spec}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">名称：</label>
-                <div class="col-sm-8">
-                    <input id="name" name="name" th:field="*{name}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单位：</label>
+            <div class="col-sm-8">
+                <select id="unit" name="unit" class="form-control" th:with="materialType=${@dict.getType('materialType')}">
+                    <option th:each="item : ${materialType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"
+                    th:field="*{unit}" ></option>
+                </select>
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">条码：</label>
-                <div class="col-sm-8">
-                    <input id="barcode" name="barcode" th:field="*{barcode}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料类别：</label>
+            <div class="col-sm-8">
+                <select id="type" name="type" class="form-control" th:with="materialType=${@dict.getType('materialType')}">
+                    <option th:each="item : ${materialType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"
+                            th:field="*{type}"></option>
+                </select>
             </div>
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">条码2：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="barcode2" name="barcode2" th:field="*{barcode2}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">条码3：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="barcode3" name="barcode3" th:field="*{barcode3}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">条码4：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="barcode4" name="barcode4" th:field="*{barcode4}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">类别A：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="classA" name="classA" th:field="*{classA}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">类别B：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="classB" name="classB" th:field="*{classB}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">类别C：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="classC" name="classC" th:field="*{classC}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">规格：</label>
-                <div class="col-sm-8">
-                    <input id="specification" name="specification" th:field="*{specification}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">ABC分类：</label>
+            <div class="col-sdm-8">
+                <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}"/>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">品牌：</label>
-                <div class="col-sm-8">
-                    <input id="brand" name="brand" th:field="*{brand}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">保质期(天)</label>
+            <div class="col-sm-8">
+                <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}"/>
             </div>
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">尺码：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="size" name="size" th:field="*{size}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">颜色：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="color" name="color" th:field="*{color}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">产地：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="placeOfOrigin" name="placeOfOrigin" th:field="*{placeOfOrigin}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">保质期（天）：</label>
-                <div class="col-sm-8">
-                    <input id="daysToExpire" name="daysToExpire" th:field="*{daysToExpire}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">定位规则：</label>
+            <div class="col-sm-8">
+                <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">临期预警天数：</label>
-                <div class="col-sm-8">
-                    <input id="expiringDays" name="expiringDays" th:field="*{expiringDays}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">分配规则：</label>
+            <div class="col-sm-8">
+                <input id="allocationRule" name="allocationRule" class="form-control" type="text" th:field="*{allocationRule}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">收货预警天数：</label>
-                <div class="col-sm-8">
-                    <input id="minShelfLifeDays" name="minShelfLifeDays" th:field="*{minShelfLifeDays}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">补货规则：</label>
+            <div class="col-sm-8">
+                <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text" th:field="*{replenishmentRule}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">成本：</label>
-                <div class="col-sm-8">
-                    <input id="costPrice" name="costPrice" th:field="*{costPrice}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">空货位规则：</label>
+            <div class="col-sm-8">
+                <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">标价：</label>
-                <div class="col-sm-8">
-                    <input id="listPrice" name="listPrice" th:field="*{listPrice}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库规则</label>
+            <div class="col-sm-8">
+                <input id="receivingFlow" name="receivingFlow" class="form-control" type="text" th:field="*{receivingFlow}">
             </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">净价：</label>
-                <div class="col-sm-8">
-                    <input id="netPrice" name="netPrice" th:field="*{netPrice}" class="form-control" type="text">
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">出库流程：</label>
+            <div class="col-sm-8">
+                <input id="shippingFlow" name="shippingFlow" class="form-control" type="text" th:field="*{shippingFlow}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">属性模板：</label>
+            <div class="col-sm-8">
+                <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">记录序列号：</label>
+            <div class="col-sm-8">
+                <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">自动生成序列号：</label>
+            <div class="col-sm-8">
+                <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">自动生成序列号表达式：</label>
+            <div class="col-sm-8">
+                <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}">
             </div>
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">出入库是否按照 生产日期 来匹配：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="manufactureDate" name="manufactureDate" th:field="*{manufactureDate}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">出入库是否按照 入库时间 来匹配：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="receiptDate" name="receiptDate" th:field="*{receiptDate}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">创建时间：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="created" name="created" th:field="*{created}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">创建用户：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">最后修改间：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">更新用户：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <div class="form-group">
-                <label class="col-sm-3 control-label">是否有效：</label>
-                <div class="col-sm-8">
-                    <div class="onoffswitch">
-                        <input type="checkbox" th:checked="${material.enable}" class="onoffswitch-checkbox" id="enable" name="enable">
-                        <label class="onoffswitch-label" for="enable">
-                            <span class="onoffswitch-inner"></span>
-                            <span class="onoffswitch-switch"></span>
-                        </label>
-                    </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">序列号模板：</label>
+            <div class="col-sm-8">
+                <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">临期预警天数：</label>
+            <div class="col-sm-8">
+                <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">收货预警天数：</label>
+            <div class="col-sm-8">
+                <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
+            </div>
+        </div>
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">数据版本：</label>
+            <div class="col-sm-8">
+                <input id="version" name="version" class="form-control" type="text">
+            </div>
+        </div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="created" name="created" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建用户：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">最后修改间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">更新用户：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">状态：</label>
+            <div class="col-sm-8">
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable" th:field="*{enable}">
+                    <label class="onoffswitch-label" for="enable">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
                 </div>
             </div>
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">是否删除：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef4" name="userDef4" th:field="*{userDef4}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef5" name="userDef5" th:field="*{userDef5}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段6：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef6" name="userDef6" th:field="*{userDef6}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段7：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef7" name="userDef7" th:field="*{userDef7}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="form-group">	-->
-                <!--<label class="col-sm-3 control-label">自定义字段8：</label>-->
-                <!--<div class="col-sm-8">-->
-                    <!--<input id="userDef8" name="userDef8" th:field="*{userDef8}" class="form-control" type="text">-->
-                <!--</div>-->
-            <!--</div>-->
-			<div class="form-group">
-				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary">提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
-				</div>
-			</div>
-		</form>
-    </div>
-    <div th:include="include::footer"></div>
-    <script type="text/javascript">
-		var prefix = ctx + "general/material";
-		$("#form-material-edit").validate({
-			rules:{
-                code:{
-                    required:true
-                },
-                name:{
-                    required:true
-                },
-                barcode:{
-                    required:true
-                }
+        </div>
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">是否删除：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段6：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef6" name="userDef6" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段7：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef7" name="userDef7" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段8：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef8" name="userDef8" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <div class="form-control-static col-sm-offset-9">
+                <button type="submit" class="btn btn-primary">提交</button>
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+            </div>
+        </div>
+    </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+    var prefix = ctx + "general/material";
+    $("#form-material-add").validate({
+        rules:{
+            code:{
+                required:true,
             },
-			submitHandler: function(form) {
-				// $.operate.save(prefix + "/edit", $('#form-material-edit').serialize());
-                // var tableValue = $.common.getTableValue("#form-material-edit");
-                // $.operate.save(prefix + "/edit", tableValue);
-                var tableValue = $("#form-material-edit").serialize();
-                tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
-                tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val());
-                tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code"));
-                $.operate.save(prefix + "/edit", tableValue);
-			}
-		});
-	</script>
+            name:{
+                required:true,
+            }
+        },
+        submitHandler: function(form) {
+            // $.operate.save(prefix + "/add", $('#form-material-add').serialize());
+            // var tableValue = $.common.getTableValue("#form-material-add");
+            // $.operate.save(prefix + "/add", tableValue);
+            var tableValue = $("#form-material-add").serialize();
+            tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
+            $.operate.save(prefix + "/add", tableValue);
+        }
+    });
+</script>
 </body>
 </html>
@@ -80,23 +80,10 @@
 					field : 'id', 
 					title : 'id'
 				},
-				// {
-				// 	field : 'warehouseCode',
-				// 	title : '仓库编码'
-				// },
 				{
 					field : 'code',
 					title : '物料编码'
 				},
-                {
-                    field : 'barcode',
-                    title : '条码',
-                    visible:false
-                },
-				{
-					field : 'userDef1',
-					title : '存货代码',
-				},
 				{
 					field : 'type', 
 					title : '物料类别' ,
@@ -105,10 +92,11 @@
                         return $.table.selectDictLabel(mType, value);
                     }
 				},
-                    {
-                        field : 'zoneCode',
-                        title : '库区编码'
-                    },
+				{
+					field : 'abcClass',
+					title : 'ABC分类' ,
+					align: 'center',
+				},
 				{
 					field : 'name', 
 					title : '名称' 
@@ -123,58 +111,68 @@
                     visible:false
 				},
 				{
-					field : 'size', 
-					title : '尺码' ,
+					field : 'daysToExpire',
+					title : '保质期(天)' ,
                     visible:false
 				},
 				{
-					field : 'color', 
-					title : '颜色',
-                    visible:false
+					field : 'locatingRule',
+					title : '定位规则',
 				},
 				{
-					field : 'placeOfOrigin', 
-					title : '产地' ,
-                    visible:false
+					field : 'allocationRule',
+					title : '分配规则' ,
 				},
 				{
-					field : 'daysToExpire', 
-					title : '保质期（天）' ,
-                    visible:false
+					field : 'replenishmentRule',
+					title : '补货规则' ,
 				},
 				{
-					field : 'expiringDays', 
-					title : '临期预警天数' ,
-                    visible:false
+					field : 'emptyLocRule',
+					title : '空货位规则' ,
 				},
 				{
-					field : 'minShelfLifeDays', 
-					title : '收货预警天数' ,
-                    visible:false
+					field : 'receivingFlow',
+					title : '入库流程' ,
 				},
 				{
-					field : 'costPrice', 
-					title : '成本',
-                    visible:false
+					field : 'shippingFlow',
+					title : '出库流程' ,
 				},
 				{
-					field : 'listPrice', 
-					title : '标价' ,
+					field : 'attributeTemplateCode',
+					title : '属性模板' ,
+				},
+				{
+					field : 'trackSerialNum',
+					title : '记录序列号' ,
+				},
+				{
+					field : 'autoGenSerialNum',
+					title : '自动生成序列号' ,
+				},
+				{
+					field : 'autoGenSerialNumFormat',
+					title : '自动生成序列号表达式' ,
+				},
+				{
+					field : 'snTemplateCode',
+					title : '序列号模板' ,
+				},
+				{
+					field : 'expiringDays',
+					title : '临期预警天数' ,
                     visible:false
 				},
 				{
-					field : 'netPrice', 
-					title : '净价',
+					field : 'minShelfLifeDays', 
+					title : '收货预警天数' ,
                     visible:false
 				},
-				// {
-				// 	field : 'manufactureDate',
-				// 	title : '出入库是否按照 生产日期 来匹配'
-				// },
-				// {
-				// 	field : 'receiptDate',
-				// 	title : '出入库是否按照 入库时间 来匹配'
-				// },
+				{
+					field : "version",
+					title: "数据版本"
+				},
 				{
 					field : 'created', 
 					title : '创建时间' 
@@ -193,7 +191,7 @@
 				},
 				{
 					field : 'enable', 
-					title : '是否有效'  ,
+					title : '状态'  ,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(datas, value);
@@ -204,8 +202,8 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	/*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        */actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
 						return actions.join('');
 		            }
 		        }]
@@ -54,7 +54,7 @@
 <!--</div>-->
  
 <div class="btn-group hidden-xs" id="toolbar" role="group">
-    <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'"
+    <a class="btn btn-outline btn-success btn-rounded"  th:value="${dict.dictType}" onclick="add()" id="add"
        shiro:hasPermission="system:dict:add">
         <i class="fa fa-plus"></i> 新增
     </a>
@@ -149,6 +149,12 @@
             dictType: $("#dictType").val()
         };
     }
+
+    function add() {
+        let id=$("#add").attr('value');
+        $.operate.add(id);
+    }
+
 </script>
 </body>
 </html>
 \ No newline at end of file