From 9dc23bd13a5bae0dd2e17e832b29d98d6efe11b2 Mon Sep 17 00:00:00 2001
From: userName <userEmail>
Date: Thu, 19 Jun 2025 15:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../origen/shipping/maintainTaskPage.xml      | 110 +++++++++---------
 1 file changed, 55 insertions(+), 55 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 9ce5bc4..6004920 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml
@@ -153,32 +153,32 @@
 			</remote>		
 			</inputUIs>
 		</search>
-		<datasource type="hql"><![CDATA[ select  t.id,
- pt.code,
- pt.order_Date,
- t.end_Region,
- sw.name,
- agv.robotJobId,
- agv.status,
- agv.createTime,
- agv.createTime,
+		<datasource type="sql"><![CDATA[ select  t.id,
+ pt.code as pt_code,
+ pt.order_Date as pt_order_date,
+ t.end_Region as t_end_Region,
+ sw.name as sw_name,
+ agv.robotJobId ,
+ agv.status as agv_status,
+ agv.createTime as agv_createTime_1,
+ agv.createTime as agv_createTime_2,
  agv.dateTime2,
  agv.dateTime3,
  agv.jobPriorityType,
  t.old_Gzz,
  t.old_Zrw,
- z.name,
+ z.name as z_name,
  pt.sourceType,
- bt.name,
+ bt.name as bt_name,
  t.billCode,
- item.code,
- item.name,
+ item.code as item_code,
+ item.name as item_name,
  item.unit,
  item.ship_Rules,
- loc.code,
+ loc.code as loc_code,
  s.remark,
- zlc.name,
- lc.code,
+ zlc.name as zlc_name,
+ lc.code as lc_code,
  t.strBill4,
  t.yc_qty,
  t.PLAN_QUANTITY,
@@ -197,39 +197,39 @@
   t.ncr_Code,
  ptd.line_Number,
  t.small_Unit,
- pt.update_Time,
- pt.update_Time,
+ pt.update_Time as pt_update_Time_1,
+ pt.update_Time as pt_update_Time_2,
  t.strBill1,
- t.dateBill1,
- t.dateBill1,
- t.dateBill4,
- t.dateBill4,
- w1.name,
- w4.name,
- t.operate_Time,
- t.operate_Time,
+ t.dateBill1 as t_dateBill1_1,
+ t.dateBill1 as t_dateBill1_2,
+ t.dateBill4 as t_dateBill4_1,
+ t.dateBill4 as t_dateBill4_2,
+ w1.name as w1_name,
+ w4.name as w4_name,
+ t.operate_Time as t_operate_Time_1,
+ t.operate_Time  as t_operate_Time_2,
  t.operator,
  wd.code,
- t.create_Time,
- t.create_Time,
+ t.create_Time as t_create_Time1,
+ t.create_Time as t_create_Time2,
  w2.name,
- t.arrival_Time,
- t.arrival_Time,
-  t.dateBill5,
-  t.dateBill5,
+ t.arrival_Time as t_arrival_Time1,
+ t.arrival_Time as t_arrival_Time2,
+  t.dateBill5 as t_dateBill5,
+  t.dateBill5 as t_dateBill5_1,
  t.strBill5,
- t.dateBill3,
- t.dateBill3,
-  case when t.positionStatus='1' then t.operator when t.positionStatus='0' then '' end,
-  case when t.positionStatus='1' then t.dateline when t.positionStatus='0' then '' end,
-  case when t.positionStatus='1' then  t.dateline when t.positionStatus='0' then '' end,
-  DATEDIFF(second, pt.update_Time,t.dateBill1 )/60 ,
-  DATEDIFF(second, t.dateBill1,t.operate_Time )/60 ,
-  DATEDIFF(second, t.operate_Time,t.dateBill3)/60 ,
-  DATEDIFF(second, t.dateBill3,t.dateline )/60 ,
-  DATEDIFF(second, t.operate_Time,t.arrival_Time )/60 ,
-  DATEDIFF(second, t.arrival_Time,t.dateBill3 )/60 ,
-    DATEDIFF(second, t.operate_Time,t.dateline )/60  ,
+ t.dateBill3 as t_dateBill3_1,
+ t.dateBill3 as t_dateBill3_2,
+  case when t.positionStatus='1' then t.operator when t.positionStatus='0' then '' end as bb,
+  case when t.positionStatus='1' then t.dateline when t.positionStatus='0' then '' end as cc,
+  case when t.positionStatus='1' then  t.dateline when t.positionStatus='0' then '' end as dd,
+  DATEDIFF(second, pt.update_Time,t.dateBill1 )/60  as ee,
+  DATEDIFF(second, t.dateBill1,t.operate_Time )/60 as ff,
+  DATEDIFF(second, t.operate_Time,t.dateBill3)/60 as gg,
+  DATEDIFF(second, t.dateBill3,t.dateline )/60 as hh,
+  DATEDIFF(second, t.operate_Time,t.arrival_Time )/60 as ii,
+  DATEDIFF(second, t.arrival_Time,t.dateBill3 )/60 as kk,
+    DATEDIFF(second, t.operate_Time,t.dateline )/60  as mm,
  t.statusCode,
  t.agv_Status,
  t.popular,
@@ -272,25 +272,25 @@ left OUTER join WORKER w4 on w1.id=t.WORKER4_ID
  /~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}~/
+ /~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}~/
-  /~pickTicket.logisticsCompany: AND (pt.logistics_Company) LIKE ({pickTicket.logisticsCompany}) ~/
+  /~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}~/
  /~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}~/
- /~pickTicketDetail.strBill12: AND ptd.strBill12 LIKE {pickTicketDetail.strBill12}~/
+ /~pickTicketDetail.strBill12: AND ptd.strBill12 LIKE '{pickTicketDetail.strBill12}'~/
  /~agv.status: AND   agv.status ={agv.status} ~/ 
-  /~billCode: AND t.billCode LIKE {billCode}~/
- /~t.strBill1: AND t.strBill1 LIKE {t.strBill1}~/
+  /~billCode: AND t.billCode LIKE '{billCode}'~/
+ /~t.strBill1: AND t.strBill1 LIKE '{t.strBill1}'~/
  /~warehouseArea.id: AND z.id = {warehouseArea.id}~/
- /~pickTicket.code: AND pt.code LIKE {pickTicket.code}~/
+ /~pickTicket.code: AND pt.code LIKE '{pickTicket.code}'~/
  /~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}~/
+ /~itemCode: AND item.code  LIKE '{itemCode}'  ~/
+ /~waveDoc.code: AND wd.code LIKE '{waveDoc.code}'~/
+ /~dstLP.remark: AND s.remark LIKE '{dstLP.remark}'~/
  order by t.id desc
  ]]></datasource>
 		<columns>