瀏覽代碼

修复独码删除报错

huxy 2 年之前
父節點
當前提交
0fdd88d4e1

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

@@ -296,7 +296,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public Integer delMain(String id) {
 		List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
 		for (SyPreAssembledPackingListItem item : items2){
-			updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
+			if(item.getTotal()!=null){
+				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
+			}
 		}
 		QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
 		queryWrapperCount.select("id");
@@ -414,11 +416,14 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public PackingHeaderVo pushData(String id) {
 		PackingHeaderVo vo=syPreAssembledPackingListMapper.pushData(id);
 		List<PackingLineVo> packingLineVoList =syPreAssembledPackingListItemMapper.pushData(id);
-		if(packingLineVoList.size()>0)
-		vo.setLines(packingLineVoList);
+		if(packingLineVoList.size()>0){
+			vo.setLines(packingLineVoList);
+		}
 		return vo;
 	}
 
+
+
 	@Override
 	public List<PackingHeaderVo> pushDataBatch(String[] ids) {
 		List<PackingHeaderVo> vo=syPreAssembledPackingListMapper.pushDataBatch(ids);