Merge branch 'master_cj_zq' into master_sample_order

@@ -583,6 +583,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         Assert.greaterThanZero(pageSize);
         Assert.greaterThanZero(pageSize);
         vo.setFreeze(true);
         vo.setFreeze(true);
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
+        List<String> includeStatus = new ArrayList<>();
+        includeStatus.add("ISSUED");
+        includeStatus.add("WAIT");
+        includeStatus.add("TRANSIT");
+        vo.setIncludeStatus(includeStatus);
         List<PurchaseOrderInfo> datas = getBaseMapper().query(vo);
         List<PurchaseOrderInfo> datas = getBaseMapper().query(vo);
         if (CollectionUtils.isNotEmpty(datas)) {
         if (CollectionUtils.isNotEmpty(datas)) {
             List<String> ids = datas.stream()
             List<String> ids = datas.stream()

@@ -135,4 +135,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("排除主键集合")
     @ApiModelProperty("排除主键集合")
     private List<String> excludeIds;
     private List<String> excludeIds;
+
+    /**
+     * 状态集合
+     */
+    @ApiModelProperty("状态集合")
+    private List<String> includeStatus;
 }
 }

@@ -183,6 +183,12 @@
                     #{id}
                     #{id}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="vo.includeStatus != null and !vo.includeStatus.isEmpty()">
+                AND tb.status IN
+                <foreach collection="vo.includeStatus" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>