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

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

@@ -2586,7 +2586,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return;
       }
       if (index === 0) {
-        if (Number(prices[index].rMBPrice) > 0) {
+        if (Number(prices[index].rMBPrice) > 0 && $scope.store.enType !== 'HK') {
+          $scope.productUpOff.goods.autoPublish = true
+        } else if (Number(prices[index].uSDPrice) > 0) {
           $scope.productUpOff.goods.autoPublish = true
         }
       }

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

@@ -375,10 +375,12 @@ define([ 'app/app' ], function(app) {
                         flag = 1
                     } else if((val.erpReserve < val.qty) && $scope.storage_tab === 'outBound') {
                         flag = 2
+                    } else if(val.qty && Number(val.qty) <= 0) {
+                        flag = 4
                     } else if(val.qty) {
                         val.price ?
-                        $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty), price: Number(val.price)}) :
-                        $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty)});
+                            $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty), price: Number(val.price)}) :
+                            $scope.othenParam.detail.push({productId: val.id, qty: Number(val.qty)});
                     } else {
                         flag = 3
                     }
@@ -396,6 +398,10 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('info', '提示', '请填写数量！');
                 return;
             }
+            if(flag === 4) {
+                toaster.pop('info', '提示', '填写的数量不能小于0！');
+                return;
+            }
             if($scope.othenParam.detail.length <= 0) {
                 toaster.pop('info', '提示', '至少填写一条数据！');
                 return;

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

@@ -1473,7 +1473,7 @@
                                         <span ng-if="list.number === list.shipQty">-</span>
                                         <input type="text" ng-pattern="/^[1-9]\d*$/" ng-model="list.sendCount" ng-change="onAmountChange(list, list.sendCount, 'sendCount', 9)" ng-blur="outBlurSendCount(list, list.sendCount)" ng-if="list.number !== list.shipQty" class="form-control">
                                     </td>
-                                    <td width="80"><span ng-bind="list.taxUnitprice || '-'" title="{{list.taxUnitprice}}"></span></td>
+                                    <td width="80"><span ng-bind="list.taxUnitPrice || '-'" title="{{list.taxUnitPrice}}"></span></td>
                                 </tr>
                             </table>
                         </div>