装箱单调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -465,6 +465,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Override
 	@Transactional
 	public void delMain(String id) {
+		SyPackingListFabric fabric=syPackingListFabricMapper.selectById(id);
+		if(fabric.getStatus().equals("1")){
+			throw new JeecgBootException("该单据已提交，不能删除");
+		}
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("sy_packing_list_fabric_id",id);
 		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper);
@@ -491,12 +495,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@Override
 	@Transactional
 	public void delBatchMain(Collection<? extends Serializable> idList) {
+		List<String> idsList2=new ArrayList<String>();
+		List<SyPackingListFabric> listFabricList=syPackingListFabricMapper.selectBatchIds(idList);
+		for (SyPackingListFabric fabric : listFabricList){
+			if (fabric.getStatus().equals("0")){
+				idsList2.add(fabric.getId());
+			}
+		}
 		Map<String,SyPackingListFabricItem> maps=new HashMap();
 		QueryWrapper queryWrapper=new QueryWrapper();
-		queryWrapper.in("sy_packing_list_fabric_id",idList);
+		queryWrapper.in("sy_packing_list_fabric_id",idsList2);
 		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper);
 		List<String> idItems=new ArrayList<>();
-		String[] ids=idList.toArray(new String[idList.size()]);
+		String[] ids=idsList2.toArray(new String[idsList2.size()]);
 		for(SyPackingListFabricItem item : syPackingListFabricItems){
 			if(item.getActualDeclaredQuantity()==null){
 				item.setActualDeclaredQuantity(new BigDecimal("0"));