From bd778ed26ae2491990bc78ad065958f177df46b6 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Thu, 4 Dec 2025 17:06:17 +0800 Subject: [PATCH] no message --- .../server/service/shipping/pojo/DefaultPickTicketManager.java | 2 +- .../classes/config/origen/receiving/maintainMLILYASNPage.xml | 1 - .../config/origen/shipping/maintainMLILYPickTicketPage.xml | 2 -- .../classes/config/origen/receiving/maintainMLILYASNPage.xml | 1 - .../config/origen/shipping/maintainMLILYPickTicketPage.xml | 2 -- 5 files changed, 1 insertion(+), 7 deletions(-) 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 dff2e5d..e9f99d9 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 @@ -3574,7 +3574,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements billTypeMap.put(billtype, BillTypes.get(0)); } - List 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 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}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); 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 f670812..cb81f8e 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,6 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' - and company.id=7 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 02ce2e8..d4bdc9c 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,8 +66,6 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id=7 - and company.beCompany=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}) 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 f670812..cb81f8e 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,6 @@ LEFT JOIN asn.dock dock WHERE 1=1 and asn.billType.name!='退货入库单' - and company.id=7 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 02ce2e8..d4bdc9c 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainMLILYPickTicketPage.xml @@ -66,8 +66,6 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id=7 - and company.beCompany=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}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})