Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/common/message/service/InternalMessageService.java

@@ -25,7 +25,7 @@ public interface InternalMessageService {
      * @param status 状态
      * @return 消息数量
      */
-    Integer getCount(Long recuu, Long recEnuu, String recType, String status);
+    Integer  getCount(Long recuu, Long recEnuu, String recType, String status);
 
     /**
      * 分页获取消息 (用户)

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

@@ -2219,9 +2219,9 @@ public class ProductServiceImpl implements ProductService {
         if (fromDate == null || toDate == null) {
             //统计所有的未审核的品牌信息
             Map<String, Integer> map = new HashedMap();
-            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
             map.put("productAmout", productAmout);
-            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p left join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
             map.put("productUserAmout", productUserAmout);
             return ResultMap.success(map);
         } else {
@@ -2229,9 +2229,9 @@ public class ProductServiceImpl implements ProductService {
             Date toT = new Date(toDate);
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Map<String, Integer> map = new HashedMap();
-            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
             map.put("productAmout", productAmout);
-            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p left join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
             map.put("productUserAmout", productUserAmout);
             return ResultMap.success(map);
         }

src/main/resources/dev/sys.properties

@@ -57,4 +57,4 @@ b2b=http://218.17.158.219/b2b_test
 b2bDomain=218.17.158.219:9000/b2b_test
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789/

src/main/resources/prod/sys.properties

@@ -60,4 +60,4 @@ b2bDomain=uas.ubtob.com
 b2bInner=http://10.10.100.103:8080
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789

src/main/resources/test/sys.properties

@@ -58,4 +58,4 @@ b2b=http://218.17.158.219/b2b_test
 b2bDomain=218.17.158.219:9000/b2b_test
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789/

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

@@ -3677,6 +3677,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
 
     $scope.editRegulPicture = function(Regulpic, commodity) {
+      if (commodity.erpReserve === '' ||  commodity.erpReserve === 0 || !commodity.erpReserve) {
+        toaster.pop('warning','提示','当前物料库存为0，请先入库')
+        return;
+      }
       if (commodity.editRegulShow ) return
       $scope.clearCheckBox()
       commodity.editRegulShow = true
@@ -3821,9 +3825,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return
       }
       if (!$scope.productUpOff.goods.breakUp && $scope.productUpOff.goods.minBuyQty !== $scope.productUpOff.minPackQty) {
-        $scope.productUpOff.goods.minBuyQty = $scope.productUpOff.minPackQty
-        toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
-        $scope.ProductupdateStartNumber($scope.productUpOff.goods.minBuyQty)
+        if ($scope.productUpOff.goods.minBuyQty % $scope.productUpOff.minPackQty !== 0) {
+          $scope.productUpOff.goods.minBuyQty = $scope.productUpOff.minPackQty
+          toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
+          $scope.ProductupdateStartNumber($scope.productUpOff.goods.minBuyQty)
+        }
       }
     }
     // 可拆卖 上下架开关