no message
							parent
							
								
									d315eb3988
								
							
						
					
					
						commit
						45aa836c86
					
				| 
						 | 
					@ -64,19 +64,16 @@
 | 
				
			||||||
 CAST(round(item.volume*inventory.quantity,3) as string),
 | 
					 CAST(round(item.volume*inventory.quantity,3) as string),
 | 
				
			||||||
 DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i')
 | 
					 DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i')
 | 
				
			||||||
 FROM Inventory inventory
 | 
					 FROM Inventory inventory
 | 
				
			||||||
 LEFT JOIN inventory.location as location
 | 
					
 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory as itemKeyInventory
 | 
					 LEFT JOIN inventory.itemKeyInventory as itemKeyInventory
 | 
				
			||||||
 LEFT JOIN itemKeyInventory.itemKey as itemKey
 | 
					 LEFT JOIN itemKeyInventory.itemKey as itemKey
 | 
				
			||||||
 LEFT JOIN itemKey.item as item
 | 
					 LEFT JOIN itemKey.item as item
 | 
				
			||||||
 LEFT JOIN item.company as company
 | 
					 LEFT JOIN item.company as company
 | 
				
			||||||
 | 
					 LEFT JOIN inventory.location as location
 | 
				
			||||||
 WHERE 1=1
 | 
					 WHERE 1=1
 | 
				
			||||||
 and item.warehouse = #{SESSION_WAREHOUSE}
 | 
					 and item.warehouse = #{SESSION_WAREHOUSE}
 | 
				
			||||||
 and inventory.quantity>0
 | 
					 and company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
 | 
				
			||||||
 
 | 
					 /~company.id: AND company.id = {company.id}~/
 | 
				
			||||||
 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 item.company.id = {company.id}~/
 | 
					 | 
				
			||||||
 /~location.id: AND location.id = {location.id}~/
 | 
					 /~location.id: AND location.id = {location.id}~/
 | 
				
			||||||
 /~item.code: AND (item.code) LIKE ({item.code})  ~/
 | 
					 /~item.code: AND (item.code) LIKE ({item.code})  ~/
 | 
				
			||||||
 /~item.strExtend2: AND upper(item.strExtend2) LIKE upper({item.strExtend2})~/
 | 
					 /~item.strExtend2: AND upper(item.strExtend2) LIKE upper({item.strExtend2})~/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,16 @@
 | 
				
			||||||
 | 
					/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
 | 
					/03B5E2CE1CBA8195FA9E9AF911F2CD72.cache.html
 | 
				
			||||||
/13804C6F9E7AD3824FEE11CC8DC1E261.cache.html
 | 
					/13804C6F9E7AD3824FEE11CC8DC1E261.cache.html
 | 
				
			||||||
/13C83C2A9EF6A4124D3E828F4577BE8B.cache.html
 | 
					/13C83C2A9EF6A4124D3E828F4577BE8B.cache.html
 | 
				
			||||||
| 
						 | 
					@ -15,11 +28,6 @@
 | 
				
			||||||
/ReportCenter.html
 | 
					/ReportCenter.html
 | 
				
			||||||
/SWMS.css
 | 
					/SWMS.css
 | 
				
			||||||
/SWMS.html
 | 
					/SWMS.html
 | 
				
			||||||
/WEB-INF/
 | 
					 | 
				
			||||||
/clear.cache.gif
 | 
					/clear.cache.gif
 | 
				
			||||||
/com.dev.swms.SWMS.nocache.js
 | 
					/com.dev.swms.SWMS.nocache.js
 | 
				
			||||||
/css/
 | 
					 | 
				
			||||||
/gwt-hosted.html
 | 
					/gwt-hosted.html
 | 
				
			||||||
/history.html
 | 
					 | 
				
			||||||
/hosted.html
 | 
					 | 
				
			||||||
/images/
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,19 +64,16 @@
 | 
				
			||||||
 CAST(round(item.volume*inventory.quantity,3) as string),
 | 
					 CAST(round(item.volume*inventory.quantity,3) as string),
 | 
				
			||||||
 DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i')
 | 
					 DATE_FORMAT(itemKey.lotInfo.propD1,'%Y-%m-%d %H:%i')
 | 
				
			||||||
 FROM Inventory inventory
 | 
					 FROM Inventory inventory
 | 
				
			||||||
 LEFT JOIN inventory.location as location
 | 
					
 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory as itemKeyInventory
 | 
					 LEFT JOIN inventory.itemKeyInventory as itemKeyInventory
 | 
				
			||||||
 LEFT JOIN itemKeyInventory.itemKey as itemKey
 | 
					 LEFT JOIN itemKeyInventory.itemKey as itemKey
 | 
				
			||||||
 LEFT JOIN itemKey.item as item
 | 
					 LEFT JOIN itemKey.item as item
 | 
				
			||||||
 LEFT JOIN item.company as company
 | 
					 LEFT JOIN item.company as company
 | 
				
			||||||
 | 
					 LEFT JOIN inventory.location as location
 | 
				
			||||||
 WHERE 1=1
 | 
					 WHERE 1=1
 | 
				
			||||||
 and item.warehouse = #{SESSION_WAREHOUSE}
 | 
					 and item.warehouse = #{SESSION_WAREHOUSE}
 | 
				
			||||||
 and inventory.quantity>0
 | 
					 and company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
 | 
				
			||||||
 
 | 
					 /~company.id: AND company.id = {company.id}~/
 | 
				
			||||||
 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 item.company.id = {company.id}~/
 | 
					 | 
				
			||||||
 /~location.id: AND location.id = {location.id}~/
 | 
					 /~location.id: AND location.id = {location.id}~/
 | 
				
			||||||
 /~item.code: AND (item.code) LIKE ({item.code})  ~/
 | 
					 /~item.code: AND (item.code) LIKE ({item.code})  ~/
 | 
				
			||||||
 /~item.strExtend2: AND upper(item.strExtend2) LIKE upper({item.strExtend2})~/
 | 
					 /~item.strExtend2: AND upper(item.strExtend2) LIKE upper({item.strExtend2})~/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue