库存日志单号查询bug修复
huojin\hj
parent
1fd4d0c0b1
commit
f6295e055a
|
|
@ -66,7 +66,7 @@
|
||||||
/~item.code: AND inventoryLog.itemKey.item.code LIKE upper({item.code})~/
|
/~item.code: AND inventoryLog.itemKey.item.code LIKE upper({item.code})~/
|
||||||
/~barCode: AND inventoryLog.itemKey.lotInfo.propC9 LIKE {barCode}~/
|
/~barCode: AND inventoryLog.itemKey.lotInfo.propC9 LIKE {barCode}~/
|
||||||
/~item.name: AND inventoryLog.itemKey.item.name LIKE {item.name}~/
|
/~item.name: AND inventoryLog.itemKey.item.name LIKE {item.name}~/
|
||||||
/~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/
|
/~relatedBill: AND inventoryLog.relatedBill LIKE {relatedBill}~/
|
||||||
/~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/
|
/~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/
|
||||||
/~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/
|
/~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/
|
||||||
/~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/
|
/~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/
|
||||||
|
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<pages>
|
|
||||||
<maintainPage id="maintainInventoryLogPage" title="maintainInventoryLogPage" autoQuery="false">
|
|
||||||
<search>
|
|
||||||
<inputUIs>
|
|
||||||
<remote id="location.id" title="location" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" editModel="normal" manualEditable="true" displayColumn="2" displayedTableHead="序号,库位编码,库位名称">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
location.id,
|
|
||||||
location.code, location.name
|
|
||||||
FROM Location location
|
|
||||||
WHERE upper(location.code) LIKE upper(:param)
|
|
||||||
AND location.disabled = false
|
|
||||||
AND location.warehouse = #{SESSION_WAREHOUSE}]]></hql>
|
|
||||||
</remote>
|
|
||||||
<text id="barCode" title="inventory.barCode" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
|
|
||||||
<list id="logType" title="inventoryLog.logType" row="2" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="InventoryLogType">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
enumerate.enumValue, enumerate.enumValue
|
|
||||||
FROM Enumerate enumerate
|
|
||||||
WHERE enumerate.enumType = 'InventoryLogType']]></hql>
|
|
||||||
</list>
|
|
||||||
<text id="relatedBill" title="inventoryLog.relatedBill" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
|
|
||||||
<text id="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
|
|
||||||
<text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
|
|
||||||
<text id="inventoryLog.operator" title="inventoryLog.operator" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
|
|
||||||
<list id="propC3" title="子库" row="4" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="Sublibrary">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
enumerate.enumValue, enumerate.enumValue
|
|
||||||
FROM Enumerate enumerate
|
|
||||||
WHERE enumerate.enumType = 'Sublibrary']]></hql>
|
|
||||||
</list>
|
|
||||||
|
|
||||||
<list id="incOrDec" title="增减类型" row="5" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="IncDec">
|
|
||||||
<hql><![CDATA[ SELECT
|
|
||||||
enumerate.enumValue, enumerate.enumValue
|
|
||||||
FROM Enumerate enumerate
|
|
||||||
WHERE enumerate.enumType = 'INCDEC']]></hql>
|
|
||||||
</list>
|
|
||||||
|
|
||||||
<dateRanger id="occurTime" title="inventoryLog.occurTime" row="6" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="occurTime.beginDate" toDate="occurTime.endDate"/>
|
|
||||||
</inputUIs>
|
|
||||||
</search>
|
|
||||||
<datasource type="hql"><![CDATA[SELECT
|
|
||||||
inventoryLog.id,
|
|
||||||
inventoryLog.relatedBill,
|
|
||||||
inventoryLog.logType,
|
|
||||||
inventoryLog.location.code,
|
|
||||||
inventoryLog.itemKey.item.code,
|
|
||||||
inventoryLog.itemKey.item.name,
|
|
||||||
inventoryLog.itemKey.lotInfo.propC1,
|
|
||||||
inventoryLog.itemKey.lotInfo.propC9,
|
|
||||||
inventoryLog.itemKey.lotInfo.propC8,
|
|
||||||
inventoryLog.itemKey.lotInfo.propC3,
|
|
||||||
inventoryLog.incOrDec,
|
|
||||||
CAST(inventoryLog.occurQuantity as integer),
|
|
||||||
inventoryLog.description,
|
|
||||||
inventoryLog.operator,
|
|
||||||
inventoryLog.occurTime
|
|
||||||
FROM InventoryLog inventoryLog
|
|
||||||
WHERE 1=1
|
|
||||||
/~SESSION_WAREHOUSE: AND inventoryLog.warehouse = #{SESSION_WAREHOUSE}~/
|
|
||||||
/~location.id: AND inventoryLog.location.id = {location.id}~/
|
|
||||||
/~logType: AND inventoryLog.logType = {logType}~/
|
|
||||||
/~soi: AND inventoryLog.SOI LIKE {soi}~/
|
|
||||||
/~item.code: AND inventoryLog.itemKey.item.code LIKE upper({item.code})~/
|
|
||||||
/~barCode: AND inventoryLog.itemKey.lotInfo.propC9 LIKE {barCode}~/
|
|
||||||
/~item.name: AND inventoryLog.itemKey.item.name LIKE {item.name}~/
|
|
||||||
/~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/
|
|
||||||
/~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/
|
|
||||||
/~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/
|
|
||||||
/~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/
|
|
||||||
/~propC3: AND inventoryLog.itemKey.lotInfo.propC3 LIKE {propC3}~/
|
|
||||||
/~incOrDec: AND inventoryLog.incOrDec = cast({incOrDec} as int)~/
|
|
||||||
ORDER BY inventoryLog.occurTime DESC]]></datasource>
|
|
||||||
<columns>
|
|
||||||
<column id="inventoryLog.id" width="60" title="inventoryLog.id" visible="true" sortIndex="1" sortType="DESC"/>
|
|
||||||
<column id="inventoryLog.relatedBill" width="120" title="inventoryLog.relatedBill" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.logType" width="80" title="inventoryLog.logType" visible="true" horizonAlign="center" format="enumFormat" formatParam="InventoryLogType"/>
|
|
||||||
<column id="inventoryLog.location.code" title="location.code" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.item.code" title="item.code" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.item.name" width="180" title="item.name" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.lotInfo.propC1" width="80" title="itemKey.lot" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.lotInfo.propC9" width="120" title="inventory.barCode" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.lotInfo.propC8" width="120" title="颜色" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.incOrDec" title="inventoryLog.incOrDec" width="80" visible="true" horizonAlign="center" format="incDecFormat" />
|
|
||||||
<column id="inventoryLog.occurQuantity" title="inventoryLog.occurQuantity" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.description" title="备注" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.operator" title="inventoryLog.operator" visible="true" horizonAlign="center"/>
|
|
||||||
<column id="inventoryLog.occurTime" title="inventoryLog.occurTime" width="150" visible="true" horizonAlign="center"/>
|
|
||||||
</columns>
|
|
||||||
</maintainPage>
|
|
||||||
</pages>
|
|
||||||
Loading…
Reference in New Issue