diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java index 770bf0c..33412e1 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java @@ -2169,6 +2169,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements // Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 for(int s=0;s code_map_old=new HashMap(); HashMap code_map=new HashMap(); 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 2e1139d..1b5ca54 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml @@ -48,7 +48,7 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' - and company.id in (7,40) + and company.id in (7,40,41) 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 4de7a9d..771a90b 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,7 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id in (7,40) + and company.id in (7,40,41) 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 2e1139d..1b5ca54 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainMLILYASNPage.xml @@ -48,7 +48,7 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' - and company.id in (7,40) + and company.id in (7,40,41) 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 4de7a9d..771a90b 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,7 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id in (7,40) + and company.id in (7,40,41) 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})