产品单个录入和批量录入增加默认值：

1、库存数量，默认值0
2、最小包装数，默认值1
3、包装方式，单个录入和批量录入，默认值“其他”

pom.xml

@@ -570,11 +570,11 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<plugin>
+			<!--<plugin>
 				<groupId>com.samaxes.maven</groupId>
 				<artifactId>minify-maven-plugin</artifactId>
 				<version>1.7.4</version>
-				<!-- 静态文件压缩 -->
+				&lt;!&ndash; 静态文件压缩 &ndash;&gt;
 				<executions>
 					<execution>
 						<id>default-minify</id>
@@ -630,12 +630,12 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
-			<plugin>
+			</plugin>-->
+			<!--<plugin>
 				<groupId>com.uas.plugins</groupId>
 				<artifactId>static-maven-plugin</artifactId>
 				<version>0.0.2-SNAPSHOT</version>
-				<!-- 静态资源分离 -->
+				&lt;!&ndash; 静态资源分离 &ndash;&gt;
 				<executions>
 					<execution>
 						<id>default-static</id>
@@ -653,7 +653,7 @@
 								<sourceInclude>resources/view/**/*.html</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
-							<!-- http://static.ubtoc.com/css/index.css?_v=1450321871828 -->
+							&lt;!&ndash; http://static.ubtoc.com/css/index.css?_v=1450321871828 &ndash;&gt;
 							<versionSuffix>
 								<suffix>?_v=${timestamp}</suffix>
 								<exclude>*/require.js,*.min.js,*.min.css</exclude>
@@ -664,8 +664,8 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
-			<plugin>
+			</plugin>-->
+			<!--<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.4</version>
@@ -679,20 +679,20 @@
 						</resource>
 					</webResources>
 				</configuration>
-			</plugin>
+			</plugin>-->
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
-					<port>8080</port>
+					<port>8090</port>
 					<path>/</path>
 					<uriEncoding>utf-8</uriEncoding>
 				</configuration>
 			</plugin>
 		</plugins>
 		<pluginManagement>
-			<plugins>
+			<!--<plugins>
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -725,7 +725,7 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-			</plugins>
+			</plugins>-->
 		</pluginManagement>
 	</build>
 	<distributionManagement>

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2490,14 +2490,7 @@ public class ProductServiceImpl implements ProductService {
         }
         Long enUU = SystemSession.getUser().getEnterprise().getUu();
         Long userUU = SystemSession.getUser().getUserUU();
-        product.setPbrand(product.getBrand());
-        product.setPbranden(product.getBrand());
-        product.setPcmpcode(product.getCmpCode());
-        product.setKind(product.getProdName());
-        product.setSourceApp("B2C");
-        product.setEnUU(enUU);
-        product.setUserUU(userUU);
-        product.setCreateTime(new Date(System.currentTimeMillis()));
+        setDefaultInfo(enUU, userUU, product);
         // PCB产品做标准判断处理
         if (null != isPcb && Objects.equals(IntegerConstant.YES_SHORT, isPcb)) {
             // 判断传入的数据是否是标准的
@@ -2566,6 +2559,33 @@ public class ProductServiceImpl implements ProductService {
         return ResultMap.success();
     }
 
+    /**
+     * 物料信息赋值
+     *
+     * @param enUU 企业UU
+     * @param userUU 用户UU
+     * @param product 物料信息
+     */
+    private void setDefaultInfo(Long enUU, Long userUU, Product product) {
+        product.setPbrand(product.getBrand());
+        product.setPbranden(product.getBrand());
+        product.setPcmpcode(product.getCmpCode());
+        product.setKind(product.getProdName());
+        product.setSourceApp("B2C");
+        product.setEnUU(enUU);
+        product.setUserUU(userUU);
+        product.setCreateTime(new Date(System.currentTimeMillis()));
+        if (null == product.getPackaging()) {
+            product.setPackaging("其他");
+        }
+        if (null == product.getErpReserve()) {
+            product.setErpReserve(DoubleConstant.zero);
+        }
+        if (null == product.getMinPackQty()) {
+            product.setMinPackQty(DoubleConstant.minReserve);
+        }
+    }
+
     /**
      * 判断是否是标准物料
      *

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2c.core.constant.IntegerConstant;
 import com.uas.platform.b2c.core.constant.ReleaseStatus;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
+import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
 import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
@@ -197,6 +198,12 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
         aProduct.setPublisherName(SystemSession.getUser().getUserName());
         aProduct.setPublisherTel(SystemSession.getUser().getUserTel());
         aProduct.setPublisherUu(SystemSession.getUser().getUserUU());
+        if (null == aProduct.getReserve()) {
+            aProduct.setReserve(DoubleConstant.zero);
+        }
+        if (null == aProduct.getPackaging()) {
+            aProduct.setPackaging("其他");
+        }
     }
 
     /**