|
|
@@ -28,16 +28,19 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
|
|
28
|
28
|
if(data.cardOnetList.length > 0 ){
|
|
29
|
29
|
//原始数据
|
|
30
|
30
|
$scope.oneCard = data.cardOnetList[0];
|
|
31
|
|
- //多次倒仓数据
|
|
32
|
|
- $scope.manyList = data.manyList;
|
|
|
31
|
+ /* 多次倒仓数据的展示判断start */
|
|
|
32
|
+ // 2022-2-25日,因为理解不通为什么要把倒仓的数据也展示出来,所以注释掉这6行
|
|
|
33
|
+ //因为目前当仓跟粮情卡的数据没有正确的对应关系,两个功能是完全无关的独立功能
|
|
|
34
|
+ //$scope.manyList = data.manyList;
|
|
33
|
35
|
|
|
34
|
|
- if($scope.manyList.length > 0){
|
|
35
|
|
- $scope.grainCardView = $scope.manyList[$scope.manyList.length-1];
|
|
36
|
|
- }
|
|
|
36
|
+ //if($scope.manyList.length > 0){
|
|
|
37
|
+ //$scope.grainCardView = $scope.manyList[$scope.manyList.length-1];
|
|
|
38
|
+ //}
|
|
37
|
39
|
|
|
38
|
|
- if($scope.manyList.length == 0){
|
|
|
40
|
+ //if($scope.manyList.length == 0){
|
|
39
|
41
|
$scope.grainCardView = $scope.oneCard;
|
|
40
|
|
- }
|
|
|
42
|
+ //}
|
|
|
43
|
+ /* 多次倒仓数据的展示判断 end */
|
|
41
|
44
|
|
|
42
|
45
|
//区分油罐和仓房 1.油罐 2.仓房
|
|
43
|
46
|
$scope.grainCardView.storehouseYG = 2;
|