入库单删除数据校验

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

@@ -6,20 +6,16 @@ package com.jeeplus.modules.warehouse.storage.service;
 import java.math.BigDecimal;
 import java.util.*;
 
-import com.jeeplus.common.utils.CacheUtils;
-import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.warehouse.goods.entity.Goods;
 import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo;
 import com.jeeplus.modules.warehouse.goods.mapper.GoodsInfoMapper;
 import com.jeeplus.modules.warehouse.goods.mapper.GoodsMapper;
 import com.jeeplus.modules.warehouse.ikanalyzer.IKSegmenter;
-import com.jeeplus.modules.warehouse.ledger.dto.CountLedgerInfo;
 import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
 import com.jeeplus.modules.warehouse.qrcode.mapper.QrCodeMapper;
 import com.jeeplus.modules.warehouse.shelves.entity.Shelves;
 import com.jeeplus.modules.warehouse.shelves.mapper.ShelvesMapper;
 import com.jeeplus.modules.warehouse.shelves.utils.ShelvesUtil;
-import com.jeeplus.modules.warehouse.storage.dto.CountStorageInfo;
 import com.jeeplus.modules.warehouse.warehouse.entity.Warehouse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,6 +127,7 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 		tem.setStorage(storage);
 		List<StorageInfo> list = storageInfoMapper.findList(tem);
 		boolean b = false;
+		String flag = "已有已入库数据，无法删除";
 		for (StorageInfo si : list) {
 			QrCode qrCode = si.getQrCode();
 			if ("2".equals(qrCode.getState())) {
@@ -155,8 +152,44 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 			}
 			super.delete(storage);
 			storageInfoMapper.delete(new StorageInfo(storage));
+			flag = "删除成功";
 		}
 	}
+	@Transactional(readOnly = false)
+	public String delete2(Storage storage) {
+		StorageInfo tem = new StorageInfo();
+		tem.setStorage(storage);
+		List<StorageInfo> list = storageInfoMapper.findList(tem);
+		boolean b = false;
+		String flag = "已有已入库数据，无法删除";
+		for (StorageInfo si : list) {
+			QrCode qrCode = si.getQrCode();
+			if ("2".equals(qrCode.getState())) {
+				b = true;
+			}
+			if("1".equals(qrCode.getState())){
+				GoodsInfo goodsInfo1 = goodsInfoMapper.get(si.getGoodsInfo());
+				Goods goods = goodsMapper.get(goodsInfo1.getGoods());
+				goods.setSum(goodsInfo1.getInfoSum());
+				goodsMapper.update(goods);
+				QrCode qr = qrCodeMapper.get(qrCode.getId());
+				qr.setState("0");
+				qrCodeMapper.update(qr);
+			}
+		}
+		if (!b) {
+			for (StorageInfo si : list) {
+				QrCode qrCode = si.getQrCode();
+				QrCode qr = qrCodeMapper.get(qrCode.getId());
+				qr.setState("0");
+				qrCodeMapper.update(qr);
+			}
+			super.delete(storage);
+			storageInfoMapper.delete(new StorageInfo(storage));
+			flag = "删除成功";
+		}
+		return flag;
+	}
 
 
 	@Transactional(readOnly = false)

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

@@ -141,8 +141,8 @@ public class StorageController extends BaseController {
 	@RequestMapping(value = "delete")
 	public AjaxJson delete(Storage storage) {
 		AjaxJson j = new AjaxJson();
-		storageService.delete(storage);
-		j.setMsg("删除入库信息成功");
+		String s = storageService.delete2(storage);
+		j.setMsg(s);
 		return j;
 	}
 
@@ -166,9 +166,17 @@ public class StorageController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		String idArray[] =ids.split(",");
 		for(String id : idArray){
-			storageService.delete(storageService.get(id));
+			String s = storageService.delete2(storageService.get(id));
+			if(s.equals("删除成功")){
+				j.setMsg("删除成功");
+			}
+		}
+		if(StringUtils.isNotBlank(j.getMsg())){
+			return j;
+		}else {
+			j.setMsg("已有已入库数据，无法删除");
+			j.setSuccess(false);
 		}
-		j.setMsg("删除入库信息成功");
 		return j;
 	}