From 4c5bec680bf4a25c54f5ef03d2b1a55ef595013f Mon Sep 17 00:00:00 2001
From: userName <userEmail>
Date: Thu, 19 Jun 2025 16:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../origen/shipping/maintainTaskPage.xml       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 fb8e07a..9104398 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
@@ -263,21 +263,21 @@ 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 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}') ~/
    ) 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 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}' )~/
   ) 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 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}') ~/
  )
  /~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}))~/
+ /~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}'~/
   /~pickTicket.logisticsCompany: AND (pt.logistics_Company) LIKE '{pickTicket.logisticsCompany}' ~/
- /~t.code: AND t.code LIKE {t.code}~/
+ /~t.code: AND t.code LIKE '{t.code}'~/
  /~pickTicket.equatedQuantity: AND (({pt.equated_Quantity}=true and pt.equated_Quantity>'A' ) or ({pt.equated_Quantity}=false and pt.equated_Quantity<'A' )) ~/
  /~billType.name: AND bt.id = {billType.name}~/
   /~pickTicketDetail.item.id: AND item.id = {pickTicketDetail.item.id}~/
@@ -287,7 +287,7 @@ left OUTER join WORKER w4 on w4.id=t.WORKER4_ID
  /~t.strBill1: AND t.strBill1 LIKE '{t.strBill1}'~/
  /~warehouseArea.id: AND z.id = {warehouseArea.id}~/
  /~pickTicket.code: AND pt.code LIKE '{pickTicket.code}'~/
- /~pickTicket.sourceType: AND pt.sourceType LIKE {pickTicket.sourceType}~/
+ /~pickTicket.sourceType: AND pt.sourceType LIKE '{pickTicket.sourceType}'~/
  /~itemCode: AND item.code  LIKE '{itemCode}'  ~/
  /~waveDoc.code: AND wd.code LIKE '{waveDoc.code}'~/
  /~dstLP.remark: AND s.remark LIKE '{dstLP.remark}'~/