封仓时间数量11

src/main/resources/static/app/storage/controller/foodbasicinfo/foodbasicinfoCtrl.js

@@ -52,36 +52,47 @@ angular.module('app.storage')
         //========================查看粮情专卡开始=============================
 
         $scope.showfoodDetails = function (id,houseId,warehouseId,quality,subType) {
-            if((quality == 6877) && (subType == 3164)){
-                //查看粮情专卡信息(省储粮-小麦)
+            if(subType == 3164){//查看粮情专卡信息(小麦)
                 $state.go('app.storage.foodbasicinfo.centralWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 3164)){
-                //查看粮情专卡信息(市(州)储粮-小麦)
-                $state.go('app.storage.foodbasicinfo.stateWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 3164)){
-                //查看粮情专卡信息(县储粮-小麦)
-                $state.go('app.storage.foodbasicinfo.prefeWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6877) && (subType == 3165)){
-                //查看粮情专卡信息(省储粮-玉米)
+            }else if(subType == 3165){//查看粮情专卡信息(玉米)
                 $state.go('app.storage.foodbasicinfo.centralCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 3165)){
-                //查看粮情专卡信息(市(州)地储粮-玉米)
-                $state.go('app.storage.foodbasicinfo.stateCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 3165)){
-                //查看粮情专卡信息(县储粮-玉米)
-                $state.go('app.storage.foodbasicinfo.prefeCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6877) && (subType == 6905)){
-                //查看粮情专卡信息(省储粮-油)
+            }else if(subType == 6905){//查看粮情专卡信息(油)
                 $state.go('app.storage.foodbasicinfo.centralOil',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 6905)){
-                //查看粮情专卡信息(市(州)地储粮-油)
-                $state.go('app.storage.foodbasicinfo.stateOil',{id:id,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 6905)){
-                //查看粮情专卡信息(县储粮-油)
-                $state.go('app.storage.foodbasicinfo.prefeOil',{id:id,houseId:houseId,warehouseId:warehouseId});
+            }else if(subType == 3166){//查看粮情专卡信息(稻谷)
+                $state.go('app.storage.foodbasicinfo.centralRice',{id:id,houseId:houseId,warehouseId:warehouseId});
             }else{
                 $state.go('app.storage.foodbasicinfo.foodDetails',{id:id,houseId:houseId,warehouseId:warehouseId});
             }
+            // if((quality == 6877) && (subType == 3164)){
+            //     //查看粮情专卡信息(省储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.centralWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 3164)){
+            //     //查看粮情专卡信息(市(州)储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.stateWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 3164)){
+            //     //查看粮情专卡信息(县储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.prefeWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6877) && (subType == 3165)){
+            //     //查看粮情专卡信息(省储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.centralCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 3165)){
+            //     //查看粮情专卡信息(市(州)地储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.stateCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 3165)){
+            //     //查看粮情专卡信息(县储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.prefeCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6877) && (subType == 6905)){
+            //     //查看粮情专卡信息(省储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.centralOil',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 6905)){
+            //     //查看粮情专卡信息(市(州)地储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.stateOil',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 6905)){
+            //     //查看粮情专卡信息(县储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.prefeOil',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }else{
+            //     $state.go('app.storage.foodbasicinfo.foodDetails',{id:id,houseId:houseId,warehouseId:warehouseId});
+            // }
         }
 
         //========================查看粮情专卡结束=============================
@@ -463,36 +474,47 @@ angular.module('app.storage')
 
         //封仓管理中的查看粮情卡按钮
         $scope.showfoodhouseCard = function (id,quality,subType,houseId,warehouseId) {
-            if((quality == 6877) && (subType == 3164)){
-                //查看粮情专卡信息(省储粮-小麦)
-                $state.go('app.storage.foodbasicinfo.centralWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 3164)){
-                //查看粮情专卡信息(市(州)储粮-小麦)
-                $state.go('app.storage.foodbasicinfo.stateWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 3164)){
-                //查看粮情专卡信息(县储粮-小麦)
-                $state.go('app.storage.foodbasicinfo.prefeWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6877) && (subType == 3165)){
-                //查看粮情专卡信息(省储粮-玉米)
-                $state.go('app.storage.foodbasicinfo.centralCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 3165)){
-                //查看粮情专卡信息(市(州)地储粮-玉米)
-                $state.go('app.storage.foodbasicinfo.stateCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 3165)){
-                //查看粮情专卡信息(县储粮-玉米)
-                $state.go('app.storage.foodbasicinfo.prefeCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6877) && (subType == 6905)){
-                //查看粮情专卡信息(省储粮-油)
-                $state.go('app.storage.foodbasicinfo.centralOil',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if((quality == 6878)&& (subType == 6905)){
-                //查看粮情专卡信息(市(州)地储粮-油)
-                $state.go('app.storage.foodbasicinfo.stateOil',{id:0,houseId:houseId,warehouseId:warehouseId});
-            }else if(((quality == 6879)) && (subType == 6905)){
-                //查看粮情专卡信息(县储粮-油)
-                $state.go('app.storage.foodbasicinfo.prefeOil',{id:0,houseId:houseId,warehouseId:warehouseId});
+            if(subType == 3164){//查看粮情专卡信息(小麦)
+                $state.go('app.storage.foodbasicinfo.centralWheat',{id:id,houseId:houseId,warehouseId:warehouseId});
+            }else if(subType == 3165){//查看粮情专卡信息(玉米)
+                $state.go('app.storage.foodbasicinfo.centralCorn',{id:id,houseId:houseId,warehouseId:warehouseId});
+            }else if(subType == 6905){//查看粮情专卡信息(油)
+                $state.go('app.storage.foodbasicinfo.centralOil',{id:id,houseId:houseId,warehouseId:warehouseId});
+            }else if(subType == 3166){//查看粮情专卡信息(稻谷)
+                $state.go('app.storage.foodbasicinfo.centralRice',{id:id,houseId:houseId,warehouseId:warehouseId});
             }else{
-                $state.go('app.storage.foodbasicinfo.foodDetails',{id:0,houseId:houseId,warehouseId:warehouseId});
+                $state.go('app.storage.foodbasicinfo.foodDetails',{id:id,houseId:houseId,warehouseId:warehouseId});
             }
+            // if((quality == 6877) && (subType == 3164)){
+            //     //查看粮情专卡信息(省储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.centralWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 3164)){
+            //     //查看粮情专卡信息(市(州)储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.stateWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 3164)){
+            //     //查看粮情专卡信息(县储粮-小麦)
+            //     $state.go('app.storage.foodbasicinfo.prefeWheat',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6877) && (subType == 3165)){
+            //     //查看粮情专卡信息(省储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.centralCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 3165)){
+            //     //查看粮情专卡信息(市(州)地储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.stateCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 3165)){
+            //     //查看粮情专卡信息(县储粮-玉米)
+            //     $state.go('app.storage.foodbasicinfo.prefeCorn',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6877) && (subType == 6905)){
+            //     //查看粮情专卡信息(省储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.centralOil',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if((quality == 6878)&& (subType == 6905)){
+            //     //查看粮情专卡信息(市(州)地储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.stateOil',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else if(((quality == 6879)) && (subType == 6905)){
+            //     //查看粮情专卡信息(县储粮-油)
+            //     $state.go('app.storage.foodbasicinfo.prefeOil',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }else{
+            //     $state.go('app.storage.foodbasicinfo.foodDetails',{id:0,houseId:houseId,warehouseId:warehouseId});
+            // }
 
         }
 
@@ -528,36 +550,47 @@ angular.module('app.storage')
                     var id = $stateParams.id;
                     qualitycheckService.findByStoreWarehouse(houseId,warehouseId,"1").then(function(data){
                         $scope.qualitycheck = data;
-                        if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==3164)){
-                            //查看粮情专卡信息(省储粮-小麦)
+                        if($scope.qualitycheck.subType==3164){//查看粮情专卡信息(小麦)
                             $state.go('app.storage.foodbasicinfo.sealhouse.centralWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality == 6878)&& ($scope.qualitycheck.subType == 3164)){
-                            //查看粮情专卡信息(市(州)储粮-小麦)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.stateWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if((($scope.qualitycheck.quality==6879)) && ($scope.qualitycheck.subType==3164)){
-                            //查看粮情专卡信息(县储粮-小麦)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.prefeWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==3165)){
-                            //查看粮情专卡信息(省储粮-玉米)
+                        }else if($scope.qualitycheck.subType == 3165){//查看粮情专卡信息(玉米)
                             $state.go('app.storage.foodbasicinfo.sealhouse.centralCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality == 6878)&& ($scope.qualitycheck.subType == 3165)){
-                            //查看粮情专卡信息(市(州)地储粮-玉米)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.stateCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality==6879) && ($scope.qualitycheck.subType==3165)){
-                            //查看粮情专卡信息(县储粮-玉米)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.prefeCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==6905)){
-                            //查看粮情专卡信息(省储粮-油)
+                        }else if($scope.qualitycheck.subType==6905){//查看粮情专卡信息(油)
                             $state.go('app.storage.foodbasicinfo.sealhouse.centralOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality==6878) && ($scope.qualitycheck.subType==6905)){
-                            //查看粮情专卡信息(市(州)地储粮-油)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.stateOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
-                        }else if(($scope.qualitycheck.quality==6879) && ($scope.qualitycheck.subType==6905)){
-                            //查看粮情专卡信息(县储粮-油)
-                            $state.go('app.storage.foodbasicinfo.sealhouse.prefeOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        }else if($scope.qualitycheck.subType==3166){//查看粮情专卡信息(稻谷)
+                            $state.go('app.storage.foodbasicinfo.sealhouse.centralRice',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
                         }else{//原始页面
                             $state.go('app.storage.foodbasicinfo.basicCard',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId,id:id});
                         }
+                        // if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==3164)){
+                        //     //查看粮情专卡信息(省储粮-小麦)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.centralWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality == 6878)&& ($scope.qualitycheck.subType == 3164)){
+                        //     //查看粮情专卡信息(市(州)储粮-小麦)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.stateWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if((($scope.qualitycheck.quality==6879)) && ($scope.qualitycheck.subType==3164)){
+                        //     //查看粮情专卡信息(县储粮-小麦)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.prefeWheat',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==3165)){
+                        //     //查看粮情专卡信息(省储粮-玉米)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.centralCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality == 6878)&& ($scope.qualitycheck.subType == 3165)){
+                        //     //查看粮情专卡信息(市(州)地储粮-玉米)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.stateCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality==6879) && ($scope.qualitycheck.subType==3165)){
+                        //     //查看粮情专卡信息(县储粮-玉米)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.prefeCorn',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality==6877) && ($scope.qualitycheck.subType==6905)){
+                        //     //查看粮情专卡信息(省储粮-油)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.centralOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality==6878) && ($scope.qualitycheck.subType==6905)){
+                        //     //查看粮情专卡信息(市(州)地储粮-油)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.stateOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else if(($scope.qualitycheck.quality==6879) && ($scope.qualitycheck.subType==6905)){
+                        //     //查看粮情专卡信息(县储粮-油)
+                        //     $state.go('app.storage.foodbasicinfo.sealhouse.prefeOil',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId});
+                        // }else{//原始页面
+                        //     $state.go('app.storage.foodbasicinfo.basicCard',{foodbasic:angular.toJson($scope.foodbasicinfo),houseId:houseId,warehouseId:warehouseId,id:id});
+                        // }
                     },function(data){
                         // console.log(data);
                     });