删除修改

src/main/webapp/webpage/modules/warehouse/goods/goodsList.js

@@ -212,21 +212,56 @@ function getIdSelections() {
 }
 
 function deleteAll(){
-
     jp.confirm('确认要删除该货品模块记录吗？', function(){
         jp.loading();
-        jp.get("${ctx}/warehouse/goods/goods/deleteAll?ids=" + getIdSelections(), function(data){
-            if(data.success){
-                $('#goodsTable').bootstrapTable('refresh');
-                jp.success(data.msg);
-            }else{
-                jp.error(data.msg);
+        const ids = getIdSelections();
+
+        getDetails(ids, function (canDel) {
+            if (canDel) {
+                jp.get("${ctx}/warehouse/goods/goods/deleteAll?ids=" + ids, function(data){
+                    if(data.success){
+                        $('#goodsTable').bootstrapTable('refresh');
+                        jp.success(data.msg);
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+            } else {
+                jp.warning('不可删除');
             }
-        })
+        });
 
     })
 }
 
+function getDetails (ids, callback) {
+
+    var l = ids.length;
+    var canDel = true;
+    var i = 0;
+
+    getDetail$(i);
+
+    function getDetail$ (index) {
+        if (!canDel || index === l) {
+            callback && callback(canDel);
+            return
+        }
+        var id = ids[index];
+        $.get("${ctx}/warehouse/goods/goods/detail?id="+id, function (result) {
+            var list =  result.goodsInfoList;
+
+            canDel = list.every(function (el) {
+                return el.qrCode ? Number(el.qrCode.state) === 0 : true;
+            });
+            console.log(canDel)
+            i++;
+            getDetail$(i);
+        });
+    }
+
+}
+
 //刷新列表
 function refresh(){
     $('#goodsTable').bootstrapTable('refresh');

src/main/webapp/webpage/modules/warehouse/storage/storageList.js

@@ -221,18 +221,55 @@ function deleteAll(){
 
     jp.confirm('确认要删除该入库信息记录吗？', function(){
         jp.loading();
-        jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){
-            if(data.success){
-                $('#storageTable').bootstrapTable('refresh');
-                jp.success(data.msg);
-            }else{
-                jp.error(data.msg);
+        var ids = getIdSelections();
+        getDetails(ids, function (canDel) {
+            if (canDel) {
+                // jp.get("${ctx}/warehouse/storage/storage/deleteAll?ids=" + getIdSelections(), function(data){
+                //     if(data.success){
+                //         $('#storageTable').bootstrapTable('refresh');
+                //         jp.success(data.msg);
+                //     }else{
+                //         jp.error(data.msg);
+                //     }
+                // })
+            } else {
+                jp.warning('不可删除');
             }
-        })
+        });
+
+
 
     })
 }
 
+function getDetails (ids, callback) {
+
+    var l = ids.length;
+    var canDel = true;
+    var i = 0;
+
+    getDetail$(i);
+
+    function getDetail$ (index) {
+        if (!canDel || index === l) {
+            callback && callback(canDel);
+            return
+        }
+        var id = ids[index];
+        $.get("${ctx}/warehouse/storage/storage/detail?id="+id, function (result) {
+            var list =  result.storageInfoList;
+
+            canDel = list.every(function (el) {
+                return el.qrCode ? Number(el.qrCode.state) < 2 : true;
+            });
+            i++;
+            getDetail$(i);
+        });
+    }
+
+}
+
+
 //刷新列表
 function refresh(){
     $('#storageTable').bootstrapTable('refresh');