diff --git a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml index 4816fef..3340aa3 100644 --- a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml @@ -64,15 +64,16 @@ CAST(round(item.volume*inventory.quantity,3) as string), DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i') FROM Inventory inventory - + LEFT JOIN inventory.location as location LEFT JOIN inventory.itemKeyInventory as itemKeyInventory LEFT JOIN itemKeyInventory.itemKey as itemKey LEFT JOIN itemKey.item as item LEFT JOIN item.company as company - LEFT JOIN inventory.location as location WHERE 1=1 - and item.warehouse = #{SESSION_WAREHOUSE} - and company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) + and item.warehouse = #{SESSION_WAREHOUSE} + 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}) + ) /~company.id: AND company.id = {company.id}~/ /~location.id: AND location.id = {location.id}~/ /~item.code: AND (item.code) LIKE ({item.code}) ~/ diff --git a/target/hrbwms/.gitignore b/target/hrbwms/.gitignore deleted file mode 100644 index ab4d914..0000000 --- a/target/hrbwms/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -/WEB-INF/ -/css/ -/fullLogin.html -/images/ -/loadReport.html -/reportError.html -/richtext/ -/scripts/ -/setupLicense.html -/setupLicenseError.html -/setupLicenseExpired.html -/history.html -/hosted.html -/03B5E2CE1CBA8195FA9E9AF911F2CD72.cache.html -/13804C6F9E7AD3824FEE11CC8DC1E261.cache.html -/13C83C2A9EF6A4124D3E828F4577BE8B.cache.html -/34C2C189E187A09161F4F48B43AFDA30.cache.html -/4F503C089191E7D1D021F89ECED37378.cache.html -/548CDF11D6FE9011F3447CA200D7FB7F.cache.png -/74440529F2A86F33126559ED3A570E56.gwt.rpc -/9DA92932034707C17CFF15F95086D53F.cache.png -/A7CD51F9E5A7DED5F85AD1D82BA67A8A.cache.png -/ApplicationWindow.css -/ApplicationWindow.html -/E9B80E93324842A33060B06B4103D915.gwt.rpc -/GwtExt.css -/ReportCenter.css -/ReportCenter.html -/SWMS.css -/SWMS.html -/clear.cache.gif -/com.dev.swms.SWMS.nocache.js -/gwt-hosted.html diff --git a/target/hrbwms/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml index 4816fef..3340aa3 100644 --- a/target/hrbwms/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml +++ b/target/hrbwms/WEB-INF/classes/config/origen/inventory/maintainInventoryPage.xml @@ -64,15 +64,16 @@ CAST(round(item.volume*inventory.quantity,3) as string), DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i') FROM Inventory inventory - + LEFT JOIN inventory.location as location LEFT JOIN inventory.itemKeyInventory as itemKeyInventory LEFT JOIN itemKeyInventory.itemKey as itemKey LEFT JOIN itemKey.item as item LEFT JOIN item.company as company - LEFT JOIN inventory.location as location WHERE 1=1 - and item.warehouse = #{SESSION_WAREHOUSE} - and company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) + and item.warehouse = #{SESSION_WAREHOUSE} + 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}) + ) /~company.id: AND company.id = {company.id}~/ /~location.id: AND location.id = {location.id}~/ /~item.code: AND (item.code) LIKE ({item.code}) ~/