no message
parent
90eb01caed
commit
e3ecb6aff4
|
|
@ -2169,6 +2169,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
|
|||
// Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容
|
||||
for(int s=0;s<workbook.getNumberOfSheets();s++) {
|
||||
Sheet sheet = workbook.getSheet(s);// 得到excel
|
||||
System.out.println("处理第"+(s+1)+"个sheet目录");
|
||||
StringBuffer sb1=new StringBuffer();
|
||||
HashMap<String,String> code_map_old=new HashMap<String, String>();
|
||||
HashMap<String,String> code_map=new HashMap<String, String>();
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
|
|
|||
Loading…
Reference in New Issue