Authored by min.ling

fix:订单列表sku筛选项

@@ -122,6 +122,9 @@ @@ -122,6 +122,9 @@
122 <if test="buyerOrderReq.skup != null and buyerOrderReq.skup != 0 "> 122 <if test="buyerOrderReq.skup != null and buyerOrderReq.skup != 0 ">
123 and c.id = #{buyerOrderReq.skup} 123 and c.id = #{buyerOrderReq.skup}
124 </if> 124 </if>
  125 + <if test="buyerOrderReq.storageId != null and buyerOrderReq.storageId != 0 ">
  126 + and c.storage_id = #{buyerOrderReq.storageId}
  127 + </if>
125 <if test="buyerOrderReq.depotNo != null"> 128 <if test="buyerOrderReq.depotNo != null">
126 and c.depot_no = #{buyerOrderReq.depotNo} 129 and c.depot_no = #{buyerOrderReq.depotNo}
127 </if> 130 </if>
@@ -155,7 +158,7 @@ @@ -155,7 +158,7 @@
155 <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq"> 158 <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.order.model.BuyerOrderReq">
156 select count(a.id) 159 select count(a.id)
157 from buyer_order a 160 from buyer_order a
158 - <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)"> 161 + <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
159 LEFT JOIN buyer_order_goods b 162 LEFT JOIN buyer_order_goods b
160 ON( b.order_code=a.order_code) 163 ON( b.order_code=a.order_code)
161 LEFT JOIN seller_order_goods c 164 LEFT JOIN seller_order_goods c
@@ -176,7 +179,7 @@ @@ -176,7 +179,7 @@
176 <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq"> 179 <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
177 select a.* 180 select a.*
178 from buyer_order a 181 from buyer_order a
179 - <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null)"> 182 + <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null)">
180 LEFT JOIN buyer_order_goods b 183 LEFT JOIN buyer_order_goods b
181 ON( b.order_code=a.order_code) 184 ON( b.order_code=a.order_code)
182 LEFT JOIN seller_order_goods c 185 LEFT JOIN seller_order_goods c
@@ -171,7 +171,8 @@ $(function() { @@ -171,7 +171,8 @@ $(function() {
171 clientType : $("#clientType").myCombobox("getValue"), 171 clientType : $("#clientType").myCombobox("getValue"),
172 attributes : $("#attributes").myCombobox("getValue"), 172 attributes : $("#attributes").myCombobox("getValue"),
173 buyerStartTime : new Date($('#buyerStartTime').datetimebox('getValue')).getTime(), 173 buyerStartTime : new Date($('#buyerStartTime').datetimebox('getValue')).getTime(),
174 - buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime() 174 + buyerEndTime : new Date($('#buyerEndTime').datetimebox('getValue')).getTime(),
  175 + storageId: $("#sku").val()
175 }); 176 });
176 } 177 }
177 }); 178 });