diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
index 9104398..b8991ae 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
@@ -263,16 +263,16 @@ left OUTER join WORKER w4 on w4.id=t.WORKER4_ID
  and  ((pt.sourceType <>'411') /~ordersAll: or 1=1 ~/)
  /~t.worker4.name: AND w4.id = {t.worker4.name}~/
   and (1=1
- /~beginDate: AND CONVERT(varchar(100), pt.order_Date, 23) = '{beginDate}' ~/
- /~endDate: or (CONVERT(varchar(100), pt.order_Date, 23)  >= '{beginDate}' and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), pt.order_Date, 23) <= '{endDate}') ~/
+  /~beginDate: AND pt.order_Date >= '{beginDate}' AND  pt.order_Date <= '{beginDate} 23:59:59'~/
+ /~endDate: or  pt.order_Date >= '{beginDate}' and t.type in('MV_PICKTICKET') and  pt.order_Date <= '{endDate} 23:59:59'~/
    ) and (1=1
-  /~beginDate1: AND CONVERT(varchar(100), t.create_Time, 23) = '{beginDate1}' ~/
- /~endDate1: or (CONVERT(varchar(100), t.create_Time, 23) >= '{beginDate1}' and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), t.create_Time, 23)<= '{endDate1}' )~/
+    /~beginDate1: AND t.create_Time >= '{beginDate1}' AND  t.create_Time <= '{beginDate1} 23:59:59'~/
+ /~endDate1: or  t.create_Time >= '{beginDate1}' and t.type in('MV_PICKTICKET') and t.create_Time<= '{endDate1}  23:59:59'~/
   ) and  (1=1
- /~beginDate2: AND CONVERT(varchar(100), t.operate_Time, 23) = '{beginDate2}' ~/
- /~endDate2: or (CONVERT(varchar(100), t.operate_Time, 23) >= '{beginDate2}' and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), t.operate_Time, 23)<= '{endDate2}') ~/
+ /~beginDate2: AND t.operate_Time >= '{beginDate2}' AND  t.operate_Time <= '{beginDate2} 23:59:59'~/
+ /~endDate2: or t.operate_Time >= '{beginDate2}' and t.type in('MV_PICKTICKET') and t.operate_Time<= '{endDate2}  23:59:59'~/
  )
- /~t.agvTask.targetArea: AND (t.end_Region) LIKE '{t.agvTask.targetArea}'~/
+ /~t.agvTask.targetArea: AND t.end_Region LIKE '{t.agvTask.targetArea}'~/
  /~code: AND ((t.PLAN_QUANTITY>t.MOVED_QUANTITY_MU and 'open'  = '{code}' ) or ( t.PLAN_QUANTITY<=t.MOVED_QUANTITY_MU and 'finish'  = '{code}'))~/
   /~srcLoc.code: AND loc.code LIKE '{srcLoc.code}'~/
   /~dstLoc.code: AND lc.code LIKE '{dstLoc.code}'~/