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 fc93dae..4653b15 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml @@ -246,9 +246,9 @@ 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 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 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 @@ -260,8 +260,7 @@ 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 ~/) + 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} ~/