huojin
/
hrbwms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-12-29 18:04:22 +08:00
parent e3ecb6aff4
commit a789a31a0e
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
View File

@ -53,7 +53,7 @@
<menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/> <menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/>
<menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/> <menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/>
<menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/> <menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/>
<menuItem title="maintainZhizhuASNPage" pageId="maintainZhizhuASNPage"/> <menuItem title="慕思" pageId="maintainZhizhuASNPage"/>
<menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/> <menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/>
<menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/> <menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/>
<menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/> <menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/>
@ -97,7 +97,7 @@
<menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/> <menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/>
<menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/> <menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/>
<menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/> <menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/>
<menuItem title="智筑建材" pageId="maintainZhizhuPickTicketPage"/> <menuItem title="慕思" pageId="maintainZhizhuPickTicketPage"/>
<menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/> <menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/>
<menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/> <menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/>
<menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/> <menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/>

2
src/webapp/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml
View File

@ -47,7 +47,7 @@
WHERE 1=1 WHERE 1=1
and asn.beLine=0 and asn.beLine=0
and asn.billType.name!='退货入库单' 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}) 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})
) )

2
src/webapp/WEB-INF/classes/config/origen/receiving/package_zh.properties
View File

@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355
editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165 editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165
maintainSealyASNPage=\u4e1d\u6d9f maintainSealyASNPage=\u4e1d\u6d9f
editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355 editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355
maintainZhizhuASNPage=\u667a\u7b51 maintainZhizhuASNPage=\u6155\u601D
editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355 editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355
maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546 maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546
editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355 editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355

4
src/webapp/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<pages> <pages>
<maintainPage id="maintainZhizhuPickTicketPage" title="智筑建材" autoQuery="false"> <maintainPage id="maintainZhizhuPickTicketPage" title="慕思" autoQuery="false">
<search> <search>
<inputUIs> <inputUIs>
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true"> <list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
@ -66,7 +66,7 @@
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=5 and company.id=19
and company.beCompany=true 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})

4
target/hrbwms/WEB-INF/classes/config/origen/menuConfig.xml
View File

@ -53,7 +53,7 @@
<menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/> <menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/>
<menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/> <menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/>
<menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/> <menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/>
<menuItem title="maintainZhizhuASNPage" pageId="maintainZhizhuASNPage"/> <menuItem title="慕思" pageId="maintainZhizhuASNPage"/>
<menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/> <menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/>
<menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/> <menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/>
<menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/> <menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/>
@ -97,7 +97,7 @@
<menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/> <menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/>
<menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/> <menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/>
<menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/> <menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/>
<menuItem title="智筑建材" pageId="maintainZhizhuPickTicketPage"/> <menuItem title="慕思" pageId="maintainZhizhuPickTicketPage"/>
<menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/> <menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/>
<menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/> <menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/>
<menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/> <menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/>

2
target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainZhizhuASNPage.xml
View File

@ -47,7 +47,7 @@
WHERE 1=1 WHERE 1=1
and asn.beLine=0 and asn.beLine=0
and asn.billType.name!='退货入库单' 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}) 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})
) )

2
target/hrbwms/WEB-INF/classes/config/origen/receiving/package_zh.properties
View File

@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355
editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165 editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165
maintainSealyASNPage=\u4e1d\u6d9f maintainSealyASNPage=\u4e1d\u6d9f
editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355 editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355
maintainZhizhuASNPage=\u667a\u7b51 maintainZhizhuASNPage=\u6155\u601D
editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355 editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355
maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546 maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546
editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355 editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355

4
target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainZhizhuPickTicketPage.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<pages> <pages>
<maintainPage id="maintainZhizhuPickTicketPage" title="智筑建材" autoQuery="false"> <maintainPage id="maintainZhizhuPickTicketPage" title="慕思" autoQuery="false">
<search> <search>
<inputUIs> <inputUIs>
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true"> <list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
@ -66,7 +66,7 @@
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=5 and company.id=19
and company.beCompany=true 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})