预装箱单导出调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -234,7 +234,6 @@
         ON a.id = b.sy_pre_assembled_packing_list_id
         left join sy_shipping_details_item c
         on b.sy_declaration_elements_item_id=c.id
-        AND b.del_flag = '0'
         ${ew.customSqlSegment}
         GROUP BY a.id
         ORDER BY a.`update_time` DESC

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

@@ -635,6 +635,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 
 	@Override
 	public List<SyPreAssembledPackingListVo> selectPage2( QueryWrapper<SyPreAssembledPackingListVo> queryWrapper) {
+		queryWrapper.eq("b.del_flag", 0);
 		return syPreAssembledPackingListMapper.selectPage2(queryWrapper);
 	}