Commit 4587d00742fe42ab096652851e5beb37f59e7dbc

Authored by 房远帅
1 parent 27b269c1

过磅码单:筛选增加分厂

@@ -29,6 +29,9 @@ public class QueryProcurementWeighingTicketVo extends SortPageVo implements Seri @@ -29,6 +29,9 @@ public class QueryProcurementWeighingTicketVo extends SortPageVo implements Seri
29 @ApiModelProperty("公司简称ID") 29 @ApiModelProperty("公司简称ID")
30 private String companyShortId; 30 private String companyShortId;
31 31
  32 + @ApiModelProperty("分厂ID")
  33 + private String workshopId;
  34 +
32 @ApiModelProperty("审核状态 DRAFT/AUDIT/PASS/REFUSE/CANCEL") 35 @ApiModelProperty("审核状态 DRAFT/AUDIT/PASS/REFUSE/CANCEL")
33 private String approvalStatus; 36 private String approvalStatus;
34 37
@@ -143,6 +143,9 @@ @@ -143,6 +143,9 @@
143 <if test="vo.companyShortId != null and vo.companyShortId != ''"> 143 <if test="vo.companyShortId != null and vo.companyShortId != ''">
144 AND tb.company_short_id = #{vo.companyShortId} 144 AND tb.company_short_id = #{vo.companyShortId}
145 </if> 145 </if>
  146 + <if test="vo.workshopId != null and vo.workshopId != ''">
  147 + AND tb.workshop_id = #{vo.workshopId}
  148 + </if>
146 <if test="vo.approvalStatus != null and vo.approvalStatus != ''"> 149 <if test="vo.approvalStatus != null and vo.approvalStatus != ''">
147 AND tb.approval_status = #{vo.approvalStatus} 150 AND tb.approval_status = #{vo.approvalStatus}
148 </if> 151 </if>