删除注释

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -450,55 +450,57 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Transactional
 	public Integer delMain(String id) {
 		long startTime = System.currentTimeMillis();
-		List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
-		Map<String,BigDecimal> maps=new HashMap();
-		for (SyPreAssembledPackingListItem item : items2){
-			if(item.getTotal()!=null){
-				if(item.getTotal().doubleValue()>0){
-					if(maps.containsKey(item.getSyDeclarationElementsItemId())){
-						maps.put(item.getSyDeclarationElementsItemId(),maps.get(item.getSyDeclarationElementsItemId()).add(item.getTotal()));
-					}else{
-						maps.put(item.getSyDeclarationElementsItemId(),item.getTotal());
-					}
-					//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
-				}
-			}
-		}
-		for (String key : maps.keySet()){
-			//updateQuantity(maps.get(key).negate(),key);
-		}
-		/*for (SyPreAssembledPackingListItem item : items2){
-			if(item.getTotal()!=null){
-				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
-			}
-		}*/
-		QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
-		queryWrapperCount.select("id");
-		queryWrapperCount.ne("del_Flag","0");
-		queryWrapperCount.eq("sy_Pre_Assembled_Packing_List_Id",id);
-		List<Object> objs=syPreAssembledPackingListItemMapper.selectObjs(queryWrapperCount);
-		syPreAssembledPackingListItemMapper.deleteByMainId(id);//将删除状态更改为1
-		int row=syPreAssembledPackingListMapper.deleteId(id);//将删除状态更改为1
-		QueryWrapper queryWrapper=new QueryWrapper();
-		queryWrapper.eq("sy_pre_assembled_packing_list_id",id);
-		List<SyLetterDepositItem> syLetterDepositItem=syLetterDepositItemMapper.selectList(queryWrapper);
-		if(syLetterDepositItem.size()>0){//如果有关于该装箱单的数据就...
-			UpdateWrapper wrapper=new UpdateWrapper();
-			wrapper.eq("sy_pre_assembled_packing_list_id",id);//修改主表有关数据
-			wrapper.set("del_flag","1");//修改为已删除
-			syLetterDepositItemMapper.update(null,wrapper);
-			String letId=syLetterDepositItem.get(0).getSyLetterDepositId();
-			queryWrapper=new QueryWrapper();
-			queryWrapper.eq("sy_letter_deposit_id",letId);
-			queryWrapper.eq("del_flag","0");
-			syLetterDepositItem =syLetterDepositItemMapper.selectList(queryWrapper);
-			if(syLetterDepositItem.size()==0){//如果该装箱单里的数据都被删除，就会将与托书中的数据删除
-				UpdateWrapper wrapper1=new UpdateWrapper();
-				wrapper1.eq("id",letId);//修改主表有关数据
-				wrapper1.set("del_flag","1");//修改为已删除
-				syLetterDepositMapper.update(null,wrapper1);
-			}
-		}
+		//List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
+		syPreAssembledPackingListMapper.deleteId(id);
+		syPreAssembledPackingListItemMapper.deleteByMainId(id);
+//		Map<String,BigDecimal> maps=new HashMap();
+//		for (SyPreAssembledPackingListItem item : items2){
+//			if(item.getTotal()!=null){
+//				if(item.getTotal().doubleValue()>0){
+//					if(maps.containsKey(item.getSyDeclarationElementsItemId())){
+//						maps.put(item.getSyDeclarationElementsItemId(),maps.get(item.getSyDeclarationElementsItemId()).add(item.getTotal()));
+//					}else{
+//						maps.put(item.getSyDeclarationElementsItemId(),item.getTotal());
+//					}
+//					//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
+//				}
+//			}
+//		}
+//		for (String key : maps.keySet()){
+//			//updateQuantity(maps.get(key).negate(),key);
+//		}
+//		/*for (SyPreAssembledPackingListItem item : items2){
+//			if(item.getTotal()!=null){
+//				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
+//			}
+//		}*/
+//		QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
+//		queryWrapperCount.select("id");
+//		queryWrapperCount.ne("del_Flag","0");
+//		queryWrapperCount.eq("sy_Pre_Assembled_Packing_List_Id",id);
+//		List<Object> objs=syPreAssembledPackingListItemMapper.selectObjs(queryWrapperCount);
+//		syPreAssembledPackingListItemMapper.deleteByMainId(id);//将删除状态更改为1
+//		int row=syPreAssembledPackingListMapper.deleteId(id);//将删除状态更改为1
+//		QueryWrapper queryWrapper=new QueryWrapper();
+//		queryWrapper.eq("sy_pre_assembled_packing_list_id",id);
+//		List<SyLetterDepositItem> syLetterDepositItem=syLetterDepositItemMapper.selectList(queryWrapper);
+//		if(syLetterDepositItem.size()>0){//如果有关于该装箱单的数据就...
+//			UpdateWrapper wrapper=new UpdateWrapper();
+//			wrapper.eq("sy_pre_assembled_packing_list_id",id);//修改主表有关数据
+//			wrapper.set("del_flag","1");//修改为已删除
+//			syLetterDepositItemMapper.update(null,wrapper);
+//			String letId=syLetterDepositItem.get(0).getSyLetterDepositId();
+//			queryWrapper=new QueryWrapper();
+//			queryWrapper.eq("sy_letter_deposit_id",letId);
+//			queryWrapper.eq("del_flag","0");
+//			syLetterDepositItem =syLetterDepositItemMapper.selectList(queryWrapper);
+//			if(syLetterDepositItem.size()==0){//如果该装箱单里的数据都被删除，就会将与托书中的数据删除
+//				UpdateWrapper wrapper1=new UpdateWrapper();
+//				wrapper1.eq("id",letId);//修改主表有关数据
+//				wrapper1.set("del_flag","1");//修改为已删除
+//				syLetterDepositMapper.update(null,wrapper1);
+//			}
+//		}
 		long endTime2 = System.currentTimeMillis();
 		System.out.println("删除时间：" + (endTime2 - startTime) + "ms");
 		//return row;