From a789a31a0e00583987ac5c4ac3cbb783ee5f6c4b Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 29 Dec 2025 18:04:22 +0800 Subject: [PATCH] no message --- src/webapp/WEB-INF/classes/config/origen/menuConfig.xml | 4 ++-- .../classes/config/origen/receiving/maintainZhizhuASNPage.xml | 2 +- .../classes/config/origen/receiving/package_zh.properties | 2 +- .../config/origen/shipping/maintainZhizhuPickTicketPage.xml | 4 ++-- target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml | 4 ++-- .../classes/config/origen/receiving/maintainZhizhuASNPage.xml | 2 +- .../classes/config/origen/receiving/package_zh.properties | 2 +- .../config/origen/shipping/maintainZhizhuPickTicketPage.xml | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml index 175c69c..73598c4 100644 --- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml +++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml @@ -53,7 +53,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml index 9ea78db..342e2a7 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml @@ -47,7 +47,7 @@ WHERE 1=1 and asn.beLine=0 and asn.billType.name!='退货入库单' - and company.id=5 + and company.id=19 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/package_zh.properties b/src/webapp/WEB-INF/classes/config/origen/receiving/package_zh.properties index 2b79d0c..86d761a 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/package_zh.properties +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/package_zh.properties @@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355 editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165 maintainSealyASNPage=\u4e1d\u6d9f editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355 -maintainZhizhuASNPage=\u667a\u7b51 +maintainZhizhuASNPage=\u6155\u601D editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355 maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546 editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355 diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml index 8f792dd..1c8da0b 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml @@ -1,7 +1,7 @@ - + @@ -66,7 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id=5 + and company.id=19 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}) diff --git a/target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml b/target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml index 175c69c..73598c4 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml @@ -53,7 +53,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml index 9ea78db..342e2a7 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml @@ -47,7 +47,7 @@ WHERE 1=1 and asn.beLine=0 and asn.billType.name!='退货入库单' - and company.id=5 + and company.id=19 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/package_zh.properties b/target/hrbwms/WEB-INF/classes/config/origen/receiving/package_zh.properties index 2b79d0c..86d761a 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/package_zh.properties +++ b/target/hrbwms/WEB-INF/classes/config/origen/receiving/package_zh.properties @@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355 editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165 maintainSealyASNPage=\u4e1d\u6d9f editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355 -maintainZhizhuASNPage=\u667a\u7b51 +maintainZhizhuASNPage=\u6155\u601D editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355 maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546 editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355 diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml index 8f792dd..1c8da0b 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml @@ -1,7 +1,7 @@ - + @@ -66,7 +66,7 @@ left join pickTicket.company company left join pickTicket.dock dock where 1=1 - and company.id=5 + and company.id=19 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})