Commit cce1bef53c665dca9ee6e47fc306501b9bfd0838

Authored by 房远帅
1 parent 9a3c2759

资金协调手续:协调发货数据过滤

... ... @@ -580,6 +580,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
580 580 Assert.greaterThanZero(pageSize);
581 581 vo.setFreeze(true);
582 582 PageHelperUtil.startPage(pageIndex, pageSize);
  583 + List<String> includeStatus = new ArrayList<>();
  584 + includeStatus.add("ISSUED");
  585 + includeStatus.add("WAIT");
  586 + includeStatus.add("TRANSIT");
  587 + vo.setIncludeStatus(includeStatus);
583 588 List<PurchaseOrderInfo> datas = getBaseMapper().query(vo);
584 589 if (CollectionUtils.isNotEmpty(datas)) {
585 590 List<String> ids = datas.stream()
... ...
... ... @@ -129,4 +129,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
129 129 */
130 130 @ApiModelProperty("排除主键集合")
131 131 private List<String> excludeIds;
  132 +
  133 + /**
  134 + * 状态集合
  135 + */
  136 + @ApiModelProperty("状态集合")
  137 + private List<String> includeStatus;
132 138 }
... ...
... ... @@ -176,6 +176,12 @@
176 176 #{id}
177 177 </foreach>
178 178 </if>
  179 + <if test="vo.includeStatus != null and !vo.includeStatus.isEmpty()">
  180 + AND tb.status IN
  181 + <foreach collection="vo.includeStatus" item="status" open="(" separator="," close=")">
  182 + #{status}
  183 + </foreach>
  184 + </if>
179 185 </where>
180 186 ORDER BY tb.update_time DESC
181 187 </select>
... ...