入库单删除数据校验

src/main/java/com/jeeplus/modules/warehouse/storage/service/StorageService.java

@@ -161,7 +161,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 		tem.setStorage(storage);
 		List<StorageInfo> list = storageInfoMapper.findList(tem);
 		boolean b = false;
-		String flag = "已有已入库数据，无法删除";
+		String flag = "有已入库数据，无法删除";
 		for (StorageInfo si : list) {
 			QrCode qrCode = si.getQrCode();
 			if ("2".equals(qrCode.getState())) {

src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java

@@ -143,6 +143,11 @@ public class StorageController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		String s = storageService.delete2(storage);
 		j.setMsg(s);
+		if(s.equals("删除成功")){
+			j.setSuccess(true);
+		}else {
+			j.setSuccess(false);
+		}
 		return j;
 	}
 
@@ -165,17 +170,19 @@ public class StorageController extends BaseController {
 	public AjaxJson deleteAll(String ids) {
 		AjaxJson j = new AjaxJson();
 		String idArray[] =ids.split(",");
+		String msg = "有已入库数据，无法删除";
 		for(String id : idArray){
 			String s = storageService.delete2(storageService.get(id));
 			if(s.equals("删除成功")){
-				j.setMsg("删除成功");
+				msg = s;
 			}
 		}
-		if(StringUtils.isNotBlank(j.getMsg())){
-			return j;
+		if(msg.equals("删除成功")){
+			j.setSuccess(true);
+			j.setMsg(msg);
 		}else {
-			j.setMsg("已有已入库数据，无法删除");
 			j.setSuccess(false);
+			j.setMsg(msg);
 		}
 		return j;
 	}