瀏覽代碼

增加查询条件

gaodd 2 年之前
父節點
當前提交
c73dbdcac3

+ 4 - 3
src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -304,11 +304,12 @@ angular.module('app.storage')
304 304
         $scope.remove = function(qualitycheck) {
305 305
         	if(qualitycheck.typeUpdate == 0){//自检
306 306
         		//查询 是否做了粮情卡
307
-            	grainCardService.findGrainCard(qualitycheck.id).then(function (data) {
308
-                    if(data.cardOnetList.length > 0){
307
+        		$scope.search = {qualitycheckId : qualitycheck.id}
308
+        		grainCardService.getPageInfo($scope.pageInfo, $scope.search).then(function (data) {
309
+                    if(data.data.size > 0){
309 310
                     	alert("该数据已被粮情卡引用,不可删除!");
310 311
                     }else{
311
-                    	qualitycheckService.removeById(id).then(function (data) {
312
+                    	qualitycheckService.removeById(qualitycheck.id).then(function (data) {
312 313
                             if(data.msg == "success"){
313 314
                                 alert("删除成功");
314 315
                                 $scope.loadData();

+ 2 - 1
src/main/resources/static/app/storage/grainCard/service/grainCardService.js

@@ -13,7 +13,8 @@ angular.module('app.storage').service("grainCardService", function ($http, $q, A
13 13
                 warehouseId: search.warehouseId,
14 14
                 createTime: search.createTime,
15 15
                 orgId: $rootScope.orgInfo.orgId,
16
-                sfgd: search.sfgd
16
+                sfgd: search.sfgd,
17
+                qualitycheckId : search.qualitycheckId
17 18
             }
18 19
         }).then(function successCallback(response) {
19 20
             // 请求成功执行代码