1

src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js

@@ -156,15 +156,15 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
                 $scope.pageInfo = data.data;
                 if ($scope.pageInfo.list.length > 0) {
                 	$scope.grainCard.fcqrdId = $scope.pageInfo.list[0].id;
-                	grainCardService.saveGrainOilCardData($scope.grainCard).then(function (data) {
-                        if (data.retCode === '200' && data.message === 'success') {
+                	grainCardService.saveGrainOilCardData($scope.grainCard).then(function (datas) {
+                        if (datas.retCode === '200' && datas.message === 'success') {
                             alert("保存成功");
                             $scope.retList();
                         } else {
                             alert("保存失败");
                         }
-                    }, function (data) {
-                        console.log(data);
+                    }, function (datas) {
+                        console.log(datas);
                     });
                 } else {
                 	alert("请先做封仓确认单业务！");

src/main/resources/static/app/storage/grainCard/controller/oilCarAddCtrl.js

@@ -1,5 +1,5 @@
 "use strict"; // 新增原油 (补录)
-angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $state, $rootScope, $uibModal, $filter, $stateParams, grainCardService) {
+angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $state, $rootScope, $filter, $stateParams, grainCardService, pageListService) {
     // 初始保存对象
     $scope.oilCard = {};
 
@@ -84,24 +84,35 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
             }
             // 验收类型名
             if ($scope.oilCard.checkTypeNum === '0') { // 入库验收
-                $scope.oilCard.checkTypeName = '入库验收';
+                $scope.oilCard.checkTypeName = '入库';
                 $scope.oilCard.sfmc = '1'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else if ($scope.oilCard.checkTypeNum === '1') { // 倒仓验收
-                $scope.oilCard.checkTypeName = '倒仓验收';
+                $scope.oilCard.checkTypeName = '倒仓';
                 $scope.oilCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else { // 移库验收
-                $scope.oilCard.checkTypeName = '移库验收';
+                $scope.oilCard.checkTypeName = '移库';
                 $scope.oilCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             }
-            grainCardService.saveGrainOilCardData($scope.oilCard).then(function (data) {
-                if (data.retCode === '200' && data.message === 'success') {
-                    alert("保存成功");
-                    $scope.retList();
+            $scope.search = {auditState: 3, houseId: $scope.grainCard.storehouseId, warehouseId: null};
+            pageListService.getPageList(1, 1, $scope.search).then(function (datas) {
+            	$scope.pageInfo = datas.data;
+                if ($scope.pageInfo.list.length > 0) {
+                	$scope.oilCard.fcqrdId = $scope.pageInfo.list[0].id;
+                	grainCardService.saveGrainOilCardData($scope.oilCard).then(function (data) {
+                        if (data.retCode === '200' && data.message === 'success') {
+                            alert("保存成功");
+                            $scope.retList();
+                        } else {
+                            alert("保存失败");
+                        }
+                    }, function (data) {
+                        console.log(data);
+                    });
                 } else {
-                    alert("保存失败");
+                	alert("请先做封仓确认单业务！");
                 }
-            }, function (data) {
-                console.log(data);
+            }, function (datas) {
+                console.log(datas);
             });
         }
     };