Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -137,8 +137,9 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param standard 是否是标准的信息
      * @return 返回所属该公司的产品信息
      */
-    @Query(value = "select p from Product p where p.enUU = :enuu and p.standard = :standard")
-    List<Product> findProductByEnuuAndStandard(@Param("enuu") Long enuu, @Param("standard") Integer standard);
+    @Query(value = "select p from products p left join product$private pp on pp.pr_id = p.pr_id where " +
+            "p.pr_enuu=:enuu and p.pr_pcmpcode is not null and p.pr_pbranden is not null and p.pr_standard = :standard and pp.pr_b2cenabled = :enabled", nativeQuery = true)
+    List<Product> findProductByEnuuAndStandardAndEnabled(@Param("enuu") Long enuu, @Param("standard") Integer standard, @Param("enabled") Integer enabled);
 
 
     /**

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

@@ -503,7 +503,7 @@ public class ProductServiceImpl implements ProductService {
         } else {
             standard = IntegerConstant.NO_SHORT;
         }
-        List<Product> products = productDao.findProductByEnuuAndStandard(uu, standard);
+        List<Product> products = productDao.findProductByEnuuAndStandardAndEnabled(uu, standard, IntegerConstant.YES_SHORT);
         Set<String> uuids = new HashSet<>();
         for (Product product : products) {
             if (null != isPerson && isPerson.intValue() == IntegerConstant.YES_SHORT.intValue()) {

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

@@ -1218,6 +1218,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
                 product.setpBrandUuid(releaseProductByBatch.getBranduuid());
                 product.setStandard(releaseProductByBatch.getComponentUuId() == null ? (short)0 : (short)1);
                 product.setCmpUuid(releaseProductByBatch.getComponentUuId());
+                product.setCreateTime(new Date(System.currentTimeMillis()));
                 if (isAPerson) {
                     product.setSpec(releaseProductByBatch.getPackaging());
                 }

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1525,12 +1525,11 @@
 					<a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作</span></a>
 					<span class="check-btn" ng-show="isBatch">
 						<label class="check-active">
-							<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
+							<input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" ng-disabled="currenctMaterial.length == 0" id="AllChoose"/>
 							<label for="AllChoose"></label>
 							<span>全选</span>
 						</label>
-						<a
-								ng-click="deleteBatch()" name="delete-material">删除</a>
+						<a ng-click="deleteBatch()" name="delete-material">删除</a>
 						<a ng-click="exitBatch()">取消</a>
 					</span>
 				</div>