|
|
@@ -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();
|