diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml index cb81f8e..2e1139d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml @@ -48,6 +48,7 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' + and company.id in (7,40) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml index 1e206d0..0fd52a4 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml @@ -48,6 +48,7 @@ WHERE 1=1 and asn.beLine=1 and asn.billType.name!='退货入库单' + and company.id in (1,39) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml index 2f632ce..3a6d27e 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml @@ -48,6 +48,7 @@ WHERE 1=1 and asn.beLine=0 and asn.billType.name!='退货入库单' + and company.id in (1,39) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml index d4bdc9c..4de7a9d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,6 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 + and company.id in (7,40) and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml index 18a9128..391e243 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml @@ -67,6 +67,7 @@ left join pickTicket.dock dock where 1=1 and pickTicket.beLine=1 + and company.id in (1,39) and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml index 7ad56b9..8a11f23 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml @@ -68,6 +68,7 @@ left join pickTicket.dock dock where 1=1 and pickTicket.beLine=0 + and company.id in (1,39) and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml index cb81f8e..2e1139d 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml @@ -48,6 +48,7 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' + and company.id in (7,40) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml index d4bdc9c..4de7a9d 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,6 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 + and company.id in (7,40) and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})