批量上架的bug的处理。

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductDao.java

@@ -123,7 +123,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param sourceapp 来源
      * @return
      */
-    @Query(value = "select p from Product p where p.enUU = :enuu and p.sourceApp = :sourceapp and (p.batchCount = 0 or p.batchCount is null) and (p.erpReserve is not null and p.erpReserve <> 0)")
+    @Query(value = "select p from Product p where p.enUU = :enuu and p.sourceApp = :sourceapp and (p.batchCount = 0 or p.batchCount is null) and (p.erpReserve is not null and p.erpReserve <> 0) and p.b2cEnabled = 1")
     List<Product> findByEnUUAndSourceAppNotPutOn(@Param("enuu") Long enuu, @Param("sourceapp") String sourceapp);
 
     /**
@@ -133,7 +133,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param sourceapp 来源
      * @return
      */
-    @Query(value = "select count(1) from Product p where p.enUU = :enuu and p.sourceApp = :sourceapp and (p.batchCount = 0 or p.batchCount is null)")
+    @Query(value = "select count(1) from Product p where p.enUU = :enuu and p.sourceApp = :sourceapp and (p.batchCount = 0 or p.batchCount is null) and p.b2cEnabled = 1")
     Integer findCountByEnUUAndSourceAppNotPutOn(@Param("enuu") Long enuu, @Param("sourceapp") String sourceapp);
 
     /**

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

@@ -1238,6 +1238,16 @@ public class ProductServiceImpl implements ProductService {
         for (String uuid : uuids) {
             goodsService.updateComponentTradeInfos(uuid);
         }
+        List<Product> list = new ArrayList<>();
+        for (Goods goods : result) {
+            for (Product product : sourceAppNotPutOn) {
+                if (product.getId().longValue() == goods.getProductid().longValue()) {
+                    product.setBatchCount(com.uas.platform.b2c.prod.commodity.constant.IntegerConstant.YES_INT);
+                    list.add(product);
+                }
+            }
+        }
+        productDao.save(list);
         String message = "";
         if (result.size() != 0) {
             message = "成功上架" + result.size() + "个";

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

@@ -1995,7 +1995,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		$scope.saveBatchPutOnProperty = function() {
 			var isPass = $scope.validateBatchPutOnProperty();
 			if (!isPass) {
-				return ;
+				return false;
 			}
 			$scope.uasBatchPutOnProperty.fluctuateRate = $scope.uasBatchPutOnProperty.editFluctuateRate / 100;
 			$scope.uasBatchPutOnProperty.minDelivery = $scope.uasBatchPutOnProperty.editMinDelivery;
@@ -2019,6 +2019,14 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		 * 批量上架信息
 		 */
 		$scope.batchPutOn = function () {
+			var isFluctuateRateChange = $scope.uasBatchPutOnProperty.editFluctuateRate == $scope.uasBatchPutOnProperty.fluctuateRate * 100;
+			var isMinDeliveryChange = $scope.uasBatchPutOnProperty.editMinDelivery == $scope.uasBatchPutOnProperty.minDelivery;
+			var isMaxDeliveryChange = $scope.uasBatchPutOnProperty.editMaxDelivery == $scope.uasBatchPutOnProperty.maxDelivery;
+			if (isFluctuateRateChange || isMinDeliveryChange || isMaxDeliveryChange) {
+				toaster.pop('warning', '提示', '批量上架配置信息被修改，请保存批量上架配置信息之后再上架');
+                return ;
+				// $scope.saveBatchPutOnProperty();
+			}
 			Material.batchPutOn(null, null, function (data) {
 				toaster.pop('success', '成功', data.message);
 			}, function (response) {