no message
parent
b1ec4a0683
commit
bd778ed26a
|
|
@ -3574,7 +3574,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
|
||||||
billTypeMap.put(billtype, BillTypes.get(0));
|
billTypeMap.put(billtype, BillTypes.get(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Item> Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ",
|
List<Item> Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ",
|
||||||
new String[] { "code"},new Object[] {code});
|
new String[] { "code"},new Object[] {code});
|
||||||
if(Items.size()<=0){
|
if(Items.size()<=0){
|
||||||
sb1.append((i+1)+"行"+code+";");
|
sb1.append((i+1)+"行"+code+";");
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,6 @@
|
||||||
LEFT JOIN asn.dock dock
|
LEFT JOIN asn.dock dock
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
and asn.billType.name!='退货入库单'
|
and asn.billType.name!='退货入库单'
|
||||||
and company.id=7
|
|
||||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
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})
|
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,6 @@
|
||||||
left join pickTicket.company company
|
left join pickTicket.company company
|
||||||
left join pickTicket.dock dock
|
left join pickTicket.dock dock
|
||||||
where 1=1
|
where 1=1
|
||||||
and company.id=7
|
|
||||||
and company.beCompany=true
|
|
||||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
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})
|
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})
|
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,6 @@
|
||||||
LEFT JOIN asn.dock dock
|
LEFT JOIN asn.dock dock
|
||||||
WHERE 1=1
|
WHERE 1=1
|
||||||
and asn.billType.name!='退货入库单'
|
and asn.billType.name!='退货入库单'
|
||||||
and company.id=7
|
|
||||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
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})
|
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,6 @@
|
||||||
left join pickTicket.company company
|
left join pickTicket.company company
|
||||||
left join pickTicket.dock dock
|
left join pickTicket.dock dock
|
||||||
where 1=1
|
where 1=1
|
||||||
and company.id=7
|
|
||||||
and company.beCompany=true
|
|
||||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
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})
|
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})
|
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue