封仓确认单-性质转变效验

src/main/resources/static/app/business/storageSealedConfirmation/controller/pageEditCtrl.js

@@ -63,10 +63,10 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
         $scope.sealedStorage.saveProcess.applyNameId = $rootScope.userInfo.userId;
         $scope.sealedStorage.saveProcess.applyName = $rootScope.userInfo.realName;
 
-        if(auditType === '2' && $scope.sealedStorage.auditState === 1) {
+        if (auditType === '2' && $scope.sealedStorage.auditState === 1) {
             $scope.sealedStorage.saveProcess.taskName = '员工提交';
             $scope.sealedStorage.saveProcess.applyResult = '待审批';
-            $scope.sealedStorage.saveProcess.applyContent = $rootScope.userInfo.realName +  '提交';
+            $scope.sealedStorage.saveProcess.applyContent = $rootScope.userInfo.realName + '提交';
             $scope.sealedStorage.auditState = auditType;
         } else if (auditType === '3') {
             $scope.sealedStorage.saveProcess.taskName = '驳回';
@@ -104,30 +104,52 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
     $scope.selectNotSealedStorageList();
 
     // 货位列表
-    $scope.loadWare = function() {
+    $scope.loadWare = function () {
         // datatype 0:仓房,1:油罐
-        console.log($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype)
+        // console.log($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype)
         if ($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype == 1) {
             // 油罐,没有货位
             $scope.warelist = [];
             $scope.checkGrainAttribute();
         } else {
             // 仓房获取货位
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function(data){
+            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function (data) {
                 $scope.warelist = data.wareList;
-            },function(data){
+            }, function (data) {
                 console.log(data);
             });
         }
     };
 
     // 获取封仓数据
-    $scope.checkGrainAttribute = function() {
-        console.log($scope.sealedStorage.houseId)
-        pageListService.checkGrainAttribute($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId, $scope.sealedStorage.warehouseId).then(function(data){
-            $scope.sealedStorage = data.data;
+    $scope.checkGrainAttribute = function () {
+        pageListService.checkGrainAttribute($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId, $scope.sealedStorage.warehouseId).then(function (data) {
+            let sealedStorage = data.data;
+            if (sealedStorage === null) {
+                alert("未查询到关联数据");
+            } else {
+                $scope.sealedStorage = data.data;
+                console.log("sealedStorage:", $scope.sealedStorage)
+                for (let i = 0; i < $scope.warelist.length; i++) {
+                    if ($scope.sealedStorage.warehouseId === $scope.warelist[i].warehouseId) {
+                        // 存放粮油类型(0:原粮/油,1:成品粮/油)
+                        if ('0' === $scope.warelist[i].lylx) {// 效验性质转变单审批状态
+                            pageListService.checkAuditState($scope.sealedStorage.houseId, $scope.sealedStorage.harvestYear, $scope.sealedStorage.warehouseId).then(function (data) {
+                                // 审批状态(0:仓储部经理审批,1:质检部经理审批,2:统计经理审批,3:会计审批,4:库领导审批,5:审批结束)
+                                let auditState = data.data;
+                                if (auditState !== '5') {
+                                    alert("性质转变单审批未通过");
+                                    $scope.sealedStorage = {};
+                                }
+                            }, function (data) {
+                                console.log(data);
+                            });
+                        }
+                    }
+                }
+            }
             console.log($scope.sealedStorage)
-        },function(data){
+        }, function (data) {
             console.log(data);
         });
     };
@@ -135,8 +157,8 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
     // 表单效验
     var validator = $("#storageSealed-form").validate();
     // 保存
-    $scope.save = function() {
-        if(validator.form()) {
+    $scope.save = function () {
+        if (validator.form()) {
             pageListService.saveData($scope.sealedStorage).then(function (data) {
                 if (data.retCode === '200') {
                     alert('保存成功');
@@ -151,8 +173,8 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
     };
 
     // 修改
-    $scope.update = function() {
-        if(validator.form()) {
+    $scope.update = function () {
+        if (validator.form()) {
             pageListService.updateData($scope.sealedStorage).then(function (data) {
                 if (data.retCode === '200') {
                     alert('修改成功');

src/main/resources/static/app/business/storageSealedConfirmation/service/pageListService.js

@@ -124,4 +124,22 @@ angular.module('app.business').service("pageListService", function ($http, $root
         });
         return d.promise;
     };
+
+    this.checkAuditState = function(houseId, harvestYear, warehouseId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkAuditState/' + houseId + '/' + harvestYear,
+            params : {
+                warehouseId : warehouseId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });