|
@@ -248,10 +248,7 @@
|
248
|
248
|
WHERE A.brand_id = #{sBrandId}
|
249
|
249
|
AND A.whs_id = #{sWhsId}
|
250
|
250
|
AND A.location = #{sLocation}
|
251
|
|
- AND A.item_id = #{sItemId}
|
252
|
|
- <if test="sInoutCd != null and sInoutCd != ''">
|
253
|
|
- AND A.inout_cd = #{sInoutCd}
|
254
|
|
- </if>
|
|
251
|
+ AND A.item_id = #{sItemId}
|
255
|
252
|
<if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
|
256
|
253
|
AND A.sys_reg_dttm BETWEEN STR_TO_DATE(CONCAT(#{fromDt},'000000'),'%Y%m%d%H%i%S') AND STR_TO_DATE(CONCAT(#{toDt},'235959'),'%Y%m%d%H%i%S')
|
257
|
254
|
</if>
|
|
@@ -267,13 +264,15 @@
|
267
|
264
|
AND a.WHS_ID = #{sWhsId}
|
268
|
265
|
AND a.LOCATION = #{sLocation}
|
269
|
266
|
AND a.ITEM_ID = #{sItemId}
|
270
|
|
- <if test="sInoutCd != null and sInoutCd != ''">
|
271
|
|
- AND a.inout_cd = #{sInoutCd}
|
272
|
|
- </if>
|
|
267
|
+
|
273
|
268
|
<if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
|
274
|
269
|
AND a.BASE_YM BETWEEN STR_TO_DATE(CONCAT(#{fromDt},'000000'),'%Y%m%d%H%i%S') AND STR_TO_DATE(CONCAT(#{toDt},'235959'),'%Y%m%d%H%i%S')
|
275
|
270
|
</if>
|
276
|
271
|
) histock
|
|
272
|
+ where 1=1
|
|
273
|
+ <if test="sInoutCd != null and sInoutCd != ''">
|
|
274
|
+ AND histock.inout_cd = #{sInoutCd}
|
|
275
|
+ </if>
|
277
|
276
|
<choose>
|
278
|
277
|
<when test="gridRequest.sidx != null and gridRequest.sidx != ''">
|
279
|
278
|
<if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
|