Sfoglia il codice sorgente

修复成衣独码保存失败

huxy 2 anni fa
parent
commit
e527f1c460

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

@@ -178,8 +178,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					syPreAssembledPackingListItemMapper.updateById(item1);//如果没修改成功就是新增数据
 				}
 				//这个构造器用来获取预装箱单里所有参照了改发运明细数量的合计
-				QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
-				queryWrapperCount.select("sum(total) total");
+				/*QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
+				queryWrapperCount.select("COALESCE(sum(total),0)  total");
 				queryWrapperCount.eq("del_Flag","0");
 				queryWrapperCount.eq("sy_Declaration_Elements_Item_Id",item1.getSyDeclarationElementsItemId());
 				BigDecimal total=syPreAssembledPackingListItemMapper.selectOne(queryWrapperCount).getTotal();
@@ -191,7 +191,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					//标识已被参照
 					//syItem.setIsReference(1);	由预托书回写
 					syShippingDetailsItemMapper.updateById(syItem);//修改发运明细发货数量和超出数量,如不需要就注释
-				}
+				}*/
 				typeConversion(item1);//修改预托书数量
 			}
 		}
@@ -655,6 +655,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					}
 					queryWrapper=new QueryWrapper();
 					queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(",")));
+					queryWrapper.eq("del_flag","0");
 					queryWrapper.select("sum(total) as total");
 					SyPreAssembledPackingListItem sypre=syPreAssembledPackingListItemMapper.selectOne(queryWrapper);
 					if(sypre!=null){

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

@@ -646,6 +646,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 				queryWrapper=new QueryWrapper();
 				queryWrapper.in("sy_Shipping_Details_Item_Id", Arrays.asList(ids.split(",")));
+				queryWrapper.eq("del_flag","0");
 				queryWrapper.select("sum(actual_Declared_Quantity) as actual_Declared_Quantity");
 				SyPackingListFabricItem syPackingListFabricItem=syPackingListFabricItemMapper.selectOne(queryWrapper);
 				if(syPackingListFabricItem!=null){