diff --git a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java index 9d5fe8c..9a9a30a 100644 --- a/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java +++ b/src/main/java/com/gaotao/modules/wms/data/InboundQcResultData.java @@ -42,4 +42,5 @@ public class InboundQcResultData extends QueryPage { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; + private String notifyNo; } diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index 25d42e6..a6d3f02 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -7,6 +7,7 @@ SELECT a.site, a.bu_no, + A.order_no AS notifyNo, d.inspection_no AS order_no, a.order_status, d.part_no, @@ -36,7 +37,10 @@ and A.bu_no=#{query.buNo,jdbcType=CHAR} - and A.order_no like '%'+ #{query.orderNo,jdbcType=CHAR} +'%' + and d.inspection_no like '%'+ #{query.orderNo} +'%' + + + and a.order_no like '%'+ #{query.notifyNo} +'%' and b.part_no like '%'+ #{query.partNo,jdbcType=CHAR} +'%'