From 235402c0aa1b64a3c4da7b2f8afb47f6c40562c4 Mon Sep 17 00:00:00 2001 From: userName Date: Thu, 19 Jun 2025 14:41:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8B=A3=E8=B4=A7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../origen/shipping/maintainTaskPage.xml | 204 +++++++++--------- 1 file changed, 99 insertions(+), 105 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 8f6dda5..fc93dae 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml @@ -153,12 +153,11 @@ - 0 - and ( (t.inventoryStatus not in ('交单完成')) /~ordersAll: or 1=1 ~/) - and ( (zone.id <> 1787 or zone.name is null) /~ordersAll: or 1=1 ~/) - and ( ((pickTicket.sourceType <>'411' and t.planQuantity<=t.movedQuantityMU) or - ( t.planQuantity>t.movedQuantityMU) ) /~ordersAll: or 1=1 ~/) - /~t.worker4.name: AND (t.worker4.id) = {t.worker4.name}~/ + pt.related_Bill3, + pt.logistics_Company + + +from task t +left OUTER join PICK_TICKET_DETAIL ptd on ptd.id=t.PICK_TICKET_DETAIL_ID +left OUTER join PICK_TICKET pt on pt.id=ptd.PICK_TICKET_ID +left OUTER join BILL_TYPE bt on bt.id=pt.BILL_TYPE_ID +left OUTER join ITEM_KEY ik on ik.id=t.ITEM_KEY_ID +left OUTER join item item on item.id=ik.ITEM_ID +left OUTER join LOCATION lc on lc.id= t.DST_LOC_ID +left OUTER join [ZONE] zlc on zlc.id=lc.ZONE_ID +left OUTER join LOCATION loc on loc.id=t.SRC_LOC_ID +left OUTER join [ZONE] z on z.id=loc.ZONE_ID +left OUTER join Seed_Wall sw on sw.id=t.Seed_Wall_ID +left OUTER join WAVE_DOC wd on wd.id=t.WAVE_DOC_ID +left OUTER join STOCK s on s.id=t.DST_LP +left OUTER join agvtask agv on agv.id=t.agvTask_ID +left OUTER join WORKER w1 on w1.id=t.WORKER1_ID +left OUTER join WORKER w2 on w1.id=t.WORKER2_ID +left OUTER join WORKER w4 on w1.id=t.WORKER4_ID + + where 1=1 and t.type ='MV_PICKTICKET' AND t.PLAN_QUANTITY> 0 + and ( (t.INVENTORY_STATUS not in ('交单完成')) /~ordersAll: or 1=1 ~/) + and ( (zlc.id <> 1787 or zlc.name is null) /~ordersAll: or 1=1 ~/) + and ( ((pt.sourceType <>'411' and t.PLAN_QUANTITY<=t.MOVED_QUANTITY_MU) or + ( t.PLAN_QUANTITY>t.MOVED_QUANTITY_MU) ) /~ordersAll: or 1=1 ~/) + /~t.worker4.name: AND w4.id = {t.worker4.name}~/ and (1=1 - /~beginDate: AND CONVERT(varchar(100), pickTicket.orderDate, 23) = {beginDate} ~/ - /~endDate: or (CONVERT(varchar(100), pickTicket.orderDate, 23) >= {beginDate} and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), pickTicket.orderDate, 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.createTime, 23) = {beginDate1} ~/ - /~endDate1: or (CONVERT(varchar(100), t.createTime, 23) >= {beginDate1} and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), t.createTime, 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.operateTime, 23) = {beginDate2} ~/ - /~endDate2: or (CONVERT(varchar(100), t.operateTime, 23) >= {beginDate2} and t.type in('MV_PICKTICKET') and CONVERT(varchar(100), t.operateTime, 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.endRegion) LIKE {t.agvTask.targetArea}~/ - /~code: AND ((t.planQuantity>t.movedQuantityMU and 'open' = {code} ) or ( t.planQuantity<=t.movedQuantityMU and 'finish' = {code}))~/ - /~srcLoc.code: AND (srcLoc.code) LIKE ({srcLoc.code})~/ - /~dstLoc.code: AND ( dstLoc.code) LIKE ({dstLoc.code})~/ - /~billCode: AND (t.billCode) LIKE ({billCode})~/ - /~pickTicket.logisticsCompany: AND (pickTicket.logisticsCompany) LIKE ({pickTicket.logisticsCompany}) ~/ - /~t.code: AND (t.code) LIKE ({t.code})~/ - /~pickTicket.equatedQuantity: AND (({pickTicket.equatedQuantity}=true and pickTicket.equatedQuantity>'A' ) or ({pickTicket.equatedQuantity}=false and pickTicket.equatedQuantity<'A' )) ~/ - /~billType.name: AND billType.id = {billType.name}~/ - /~pickTicketDetail.item.id: AND t.pickTicketDetail.item.id = {pickTicketDetail.item.id}~/ - /~dLzone.name: AND dLzone.name = {dLzone.name}~/ - /~pickTicketDetail.strBill12: AND (pickTicketDetail.strBill12) LIKE ({pickTicketDetail.strBill12})~/ + /~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}) ~/ + /~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}~/ /~agv.status: AND agv.status ={agv.status} ~/ - - /~billCode: AND (t.billCode) LIKE ({billCode})~/ + /~billCode: AND t.billCode LIKE {billCode}~/ /~t.strBill1: AND t.strBill1 LIKE {t.strBill1}~/ - /~warehouseArea.id: AND szone.id = {warehouseArea.id}~/ - /~locCode: AND (location.code) LIKE ({locCode})~/ - /~pickTicket.code: AND (pickTicket.code) LIKE ({pickTicket.code})~/ - /~pickTicket.sourceType: AND (pickTicket.sourceType) LIKE ({pickTicket.sourceType})~/ - /~warehouseArea: AND warehouseArea.name = {warehouseArea}~/ - /~locCode: AND (location.code) LIKE ({locCode})~/ + /~warehouseArea.id: AND z.id = {warehouseArea.id}~/ + /~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 (waveDoc.code) LIKE ({waveDoc.code})~/ - /~dstLP.remark: AND (dstLP.remark) LIKE ({dstLP.remark})~/ + /~waveDoc.code: AND wd.code LIKE {waveDoc.code}~/ + /~dstLP.remark: AND s.remark LIKE {dstLP.remark}~/ order by t.id desc ]]>