fix:结算单-选择已验收货位修改

src/main/java/com/inkasso/factoring/settlement/service/Impl/SettlementManagementServiceImpl.java

@@ -308,8 +308,9 @@ public class SettlementManagementServiceImpl extends ServiceImpl<SettlementBasic
         CAcceptanceBasicInfo basicInfo = new CAcceptanceBasicInfo();
         basicInfo.setBusinessNumber(businessNumber);
         basicInfo.setAcceptanceStatus(ProjectInitiationStatusEnum.COMPLETED.getCode());
+        basicInfo.setSettlement(false);
         List<CAcceptanceBasicInfo> acceptanceBasicInfos = icAcceptanceBasicInfoService.findByCondition(basicInfo, null);
-        acceptanceBasicInfos = acceptanceBasicInfos.stream().filter(r -> !CollectionUtil.isNotEmpty(settlementGoodsInfoService.list(new QueryWrapper<SettlementGoodsInfo>().eq("acceptance_goods_number", r.getAcceptanceGoodsNumber())))).collect(Collectors.toList());
+//        acceptanceBasicInfos = acceptanceBasicInfos.stream().filter(r -> !CollectionUtil.isNotEmpty(settlementGoodsInfoService.list(new QueryWrapper<SettlementGoodsInfo>().eq("acceptance_goods_number", r.getAcceptanceGoodsNumber())))).collect(Collectors.toList());
         //验收单货物做过底层的话价格信息从底层取
         if (CollectionUtil.isNotEmpty(acceptanceBasicInfos)) {
             for (CAcceptanceBasicInfo acceptanceBasicInfo : acceptanceBasicInfos) {

src/main/resources/mapping/acceptanceManagement/CAcceptanceBasicInfoMapper.xml

@@ -149,6 +149,9 @@
             <if test="basicInfo.receivables != null">
                 AND t2.is_receivables = #{basicInfo.receivables}
             </if>
+            <if test="basicInfo.settlement != null">
+                AND t2.is_settlement = #{basicInfo.settlement}
+            </if>
         </where>
         GROUP BY t1.acceptance_goods_number
     </select>