处理非标bug问题

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

@@ -835,6 +835,8 @@ public class ProductServiceImpl implements ProductService {
             }
         }
         goodsDao.save(saveList);
+        product.setBatchCount(product.getBatchCount() + saveList.size());
+        productDao.save(product);
         goodsHistoryDao.save(historyList);
     }
 

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

@@ -14,13 +14,13 @@ import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ShortConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
+import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
 import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
 import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
-import com.uas.platform.b2c.prod.commodity.type.ReleaseConstant;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
@@ -45,12 +45,10 @@ import org.springframework.jdbc.core.StatementCallback;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -93,6 +91,9 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
+	@Autowired
+	private ProductDao productDao;
+
 	@Override
 	public ReleaseProductByBatch save(ReleaseProductByBatch releaseProductByBatch) {
 		return releaseProductByBatch;
@@ -497,6 +498,10 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		return result;
 	}
 
+	private void resetTag(ReleaseProductByBatch aProduct) {
+//		Product product = product
+	}
+
 	/**
 	 * 初始化产品导入分段价格
 	 * @param row 行对象

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1676,42 +1676,68 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		 * 获取物料交易信息
 		 * @param product
 		 */
-		function showShelfArea(product) {
-			ComponentActive.getComponentListByUuid({ uuids: product.cmpUuId}, function (components) {
-				if (components.length > 0) {
-					var component = components[0];
-					angular.forEach($scope.currenctMaterial, function (product) {
-						delete product.selected;
-					});
-					$scope.goods = { isBreakUp: 1, isSelfSupport: 1, prices: [{}] };
-					$scope.goods.prices = [];
-					$scope.goods.prices.push({start : $scope.minReserve, end : $scope.maxReserve});
-					$scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
-					product.img = component.img || null;
-					if ('ERP' == product.sourceApp) {// 如果是erp上传物料获取物料交易信息
-						getProductDetail(product);
-					} else {
-						product.selected = true;
-					}
-				} else {
-					$scope.goods = { editBreakUp: false, editSelfSale: 2};
-					if($scope.store.enType === 'HK') {
-						$scope.goods.currencyName = 'USD';
-					}else {
-						$scope.goods.currencyName = 'RMB';
-					}
-					// 先保存产品id，方便去获取tag是否重复
-					$scope.goods.productid = material.id;
-					$scope.goods.prodNum = material.prodNum;
-					$scope.goods.editPrices = [];
-					$scope.goods.editPrices.push({start : $scope.minReserve, end : $scope.maxReserve});
-					// $scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
-					material.selected = true;
-				}
-			}, function (error) {
-				toaster.pop('error', '当前产品对应的器件[' + product.cmpUuId + ']已失效');
-				console.log(error);
+		function showShelfArea(material) {
+			// ComponentActive.getComponentListByUuid({ uuids: material.cmpUuId}, function (components) {
+			// 	if (components.length > 0) {
+			// 		var component = components[0];
+			// 		angular.forEach($scope.currenctMaterial, function (product) {
+			// 			delete product.selected;
+			// 		});
+			// 		$scope.goods = { isBreakUp: 1, isSelfSupport: 1, prices: [{}] };
+			// 		$scope.goods.prices = [];
+			// 		$scope.goods.prices.push({start : $scope.minReserve, end : $scope.maxReserve});
+			// 		$scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
+			// 		material.img = component.img || null;
+			// 		if ('ERP' == product.sourceApp) {// 如果是erp上传物料获取物料交易信息
+			// 			getProductDetail(product);
+			// 		} else {
+			// 			product.selected = true;
+			// 		}
+			// 	} else {
+			// 		$scope.goods = { editBreakUp: false, editSelfSale: 2};
+			// 		if($scope.store.enType === 'HK') {
+			// 			$scope.goods.currencyName = 'USD';
+			// 		}else {
+			// 			$scope.goods.currencyName = 'RMB';
+			// 		}
+			// 		// 先保存产品id，方便去获取tag是否重复
+			// 		$scope.goods.productid = material.id;
+			// 		$scope.goods.prodNum = material.prodNum;
+			// 		$scope.goods.editPrices = [];
+			// 		$scope.goods.editPrices.push({start : $scope.minReserve, end : $scope.maxReserve});
+			// 		// $scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
+			// 		material.selected = true;
+			// 	}
+			// }, function (error) {
+			// 	toaster.pop('error', '当前产品对应的器件[' + material.cmpUuId + ']已失效');
+			// 	console.log(error);
+			// });
+
+			angular.forEach($scope.currenctMaterial, function (material) {
+				delete material.selected;
+				material.exPandOper = false;
+				material.addGoodsOper = false;
 			});
+			material.addGoodsOper = true;
+			material.exPandOper = true;
+			$scope.expandGoods(material, material.addGoodsOper);
+			if ('ERP' == material.sourceApp) {// 如果是erp上传物料获取物料交易信息
+				getProductDetail(material);
+			} else {
+				$scope.goods = { editBreakUp: false, editSelfSale: 2};
+				if($scope.store.enType === 'HK') {
+					$scope.goods.currencyName = 'USD';
+				}else {
+					$scope.goods.currencyName = 'RMB';
+				}
+				// 先保存产品id，方便去获取tag是否重复
+				$scope.goods.productid = material.id;
+				$scope.goods.prodNum = material.prodNum;
+				$scope.goods.editPrices = [];
+				$scope.goods.editPrices.push({start : $scope.minReserve, end : $scope.maxReserve});
+				// $scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
+				material.selected = true;
+			}
 		}
 
 		/**