Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -55,7 +55,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @return count by enuu and status
      */
     @Query(value = "select count(1) from products p left join product$private pp on pp.pr_id = p.pr_id where " +
-            "p.pr_enuu=:enuu and p.pr_standard = :standard and pp.pr_b2cenabled = :enabled", nativeQuery = true)
+            "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)
     Integer getCountByEnuuAndStatusAndEnabled(@Param("enuu") Long enuu, @Param("standard") Short standard, @Param("enabled") Integer enabled);
 
     /**

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

@@ -1360,6 +1360,19 @@ public class GoodsServiceImpl implements GoodsService {
 
     private ResultMap putOnGoods(Goods goods) {
         if (goods != null) {
+            if(goods.getProductid() != null) {
+                Product product = productDao.findOne(goods.getProductid());
+                if(product != null) {
+                    if (StringConstant.ERP.equals(product.getSourceApp())) {
+                        List<Goods> goodses = goodsDao.findByProductId(product.getId());
+                        Double reserve = productService.getGoodsReserveByErpReserve(product.getErpReserve(), goodses);
+                        reserve = NumberUtil.sub(reserve, goods.getReserve());
+                        if (NumberUtil.compare(reserve, DoubleConstant.zero) < 0) {
+                            throw new IllegalOperatorException("总在售库存量超过空闲库存量");
+                        }
+                    }
+                }
+            }
             setGoodsDefault(goods);
             ResultMap resultMap = checkGoods(goods);
             if (resultMap.getCode() != CodeType.OK.code()) {

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

@@ -1589,7 +1589,10 @@
 						</td>
 						<td class="edit">
 							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
-							<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)"><span>添加产品</span></span>
+							<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
+								<span ng-if="material.batchCount">添加产品</span>
+								<span ng-if="!material.batchCount">编辑上架</span>
+							</span>
 							<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>
 							<!--收起-->
 							<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>