提交波次，查询优化

src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryLogPage.xml

@@ -80,10 +80,25 @@
 			 from WarehouseArea warehouseArea where 1=1 and warehouseArea.disabled=false
 			  order by warehouseArea.name]]></hql>
 				</list>	
-				<dateRanger id="occurTime" title="发生时间" row="5" col="1"  span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true" fromDate="beginDate" toDate="endDate"/>
+				<dateRanger id="occurTime" title="发生时间" row="5" col="1"  span="2" readOnly="false" required="false" reserve="false" 
+				forceOverride="false" inVisible="false" showTime="false" manualEditable="true" 
+				defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/>
 <!--                 <date id="inventoryLog.occurTime" title="发生时间" row="4" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="true" showTime="false" manualEditable="false" defaultCurrentDate="true"/> -->
 <!-- 				<checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="false" -->
 <!-- 					span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" />			 -->
+				<remote id="inv.item.id" title="精确料号"
+				row="18" col="3" readOnly="false" required="false" reserve="false"
+				forceOverride="false" inVisible="false" manualEditable="true"
+				headerNumber="4" displayColumn="2" displayedTableHead="序号,编码">
+				<hql><![CDATA[SELECT
+ lc.id, 
+ lc.code
+ FROM Item lc 
+ WHERE 1=1
+ and lc.code like :param  ) 
+ AND lc.disabled = false
+ ]]></hql>
+			</remote>		
 			</inputUIs>
 		</search>
 		<datasource type="hql"><![CDATA[SELECT 
@@ -91,7 +106,6 @@
  inventoryLog.relatedBill,
  inventoryLog.logType,
  inventoryLog.billType.name,
- 
  inventoryLog.srcLoc.code,
  inventoryLog.location.code,
  inventoryLog.itemKey.item.code,
@@ -125,6 +139,7 @@
  /~inventoryLog.location.code: AND inventoryLog.location.code like {inventoryLog.location.code}~/
  /~inventoryLog.strbill1: AND inventoryLog.strbill1 = {inventoryLog.strbill1}~/
  /~logType: AND inventoryLog.logType = {logType}~/
+ /~inv.item.id: AND inventoryLog.itemKey.item.id = {inv.item.id}~/
  /~inventory.kqName: AND inventoryLog.srcLoc.zone.id = {inventory.kqName}~/
  /~billType.name: AND inventoryLog.billType.name = {billType.name}~/
  /~relatedBill: AND inventoryLog.relatedBill LIKE {relatedBill}~/
@@ -132,10 +147,8 @@
  /~inventoryLog.itemKey.item.code: AND (inventoryLog.itemKey.item.code) LIKE ({inventoryLog.itemKey.item.code})~/
  /~LOC: AND inventoryLog.itemKey.lotInfo.propC2 LIKE {LOC}~/
  /~operator: AND inventoryLog.operator LIKE {operator}~/
- and (1=1
+ /~beginDate: AND inventoryLog.occurTime >= {beginDate} ~/
- /~beginDate: AND CONVERT(varchar(100), inventoryLog.occurTime, 23) >= {beginDate} ~/
+ /~endDate: AND   inventoryLog.occurTime <= {endDate} ~/
- /~endDate: AND CONVERT(varchar(100), inventoryLog.occurTime, 23)>= {beginDate} and CONVERT(varchar(100), inventoryLog.occurTime, 23)<= {endDate} ~/
- )
  ORDER BY inventoryLog.id DESC]]></datasource>
 		<columns>
 			<column id="inventoryLog.id" width="60" title="inventoryLog.id"

src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryQueryViewPage.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pages>
 	<maintainPage id="maintainInventoryQueryViewPage" title="库存汇总2"
-		autoQuery="true">
+		autoQuery="false">
 		<search>
 			<inputUIs>
 <!-- 				<remote id="location.id" title="库位" row="1" col="1" -->