Browse Source

修改库存管理bug

shenjj 7 years ago
parent
commit
c71857f4f3

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -3765,11 +3765,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.dateArea = 'formMe';
     $scope.dateArea = 'formMe';
     var _item = null
     var _item = null
     $scope.editProductUpOff = function(commodity, index) {
     $scope.editProductUpOff = function(commodity, index) {
-      if (commodity.erpReserve === '' ||  commodity.erpReserve === 0) {
+      if (commodity.erpReserve === '' ||  commodity.erpReserve === 0 || !commodity.erpReserve) {
         toaster.pop('warning','提示','当前物料库存为0,请先入库')
         toaster.pop('warning','提示','当前物料库存为0,请先入库')
         return;
         return;
       }
       }
-      if (commodity.minPackQty === 0  || commodity.minPackQty === '') {
+      if (commodity.minPackQty === 0  || commodity.minPackQty === '' || !commodity.minPackQty) {
         toaster.pop('warning','提示','请先编辑物料,最小包装数选项')
         toaster.pop('warning','提示','请先编辑物料,最小包装数选项')
         return;
         return;
       }
       }

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1451,7 +1451,7 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">发货出库</a>
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">发货出库</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>-->
                                 <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>-->
-                                <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 &&!purchase.uasPurcid" ng-click="modifyLogistic(purchase)" style="position: relative;">修改物流</a>
+                                <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 &&!purchase.uasPurcid" ng-click="modifyLogistic(purchase)" style="position: relative;">修改物流</a>-->
 								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate && requestOver==purchases.length">追加评价</a>
 								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate && requestOver==purchases.length">追加评价</a>
 								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate && requestOver==purchases.length">评价</a>
 								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate && requestOver==purchases.length">评价</a>
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">