no message
							parent
							
								
									fe566acead
								
							
						
					
					
						commit
						f18ecf463c
					
				| 
						 | 
					@ -47,9 +47,9 @@
 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory.itemKey.item item
 | 
					 LEFT JOIN inventory.itemKeyInventory.itemKey.item item
 | 
				
			||||||
 left join item.location  
 | 
					 left join item.location  
 | 
				
			||||||
 WHERE 1=1
 | 
					 WHERE 1=1
 | 
				
			||||||
 AND inventory.location.type <> 'COUNT' 
 | 
					 and inventory.location.type <> 'COUNT' 
 | 
				
			||||||
 and inventory.quantity!=0
 | 
					 and inventory.quantity!=0
 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propC3!='ZLWX'
 | 
					 and inventory.itemKeyInventory.itemKey.lotInfo.propC3!='ZLWX'
 | 
				
			||||||
 /~location.id: AND inventory.location.id = {location.id}~/
 | 
					 /~location.id: AND inventory.location.id = {location.id}~/
 | 
				
			||||||
 /~item.code: AND upper(item.code) LIKE upper({item.code})~/
 | 
					 /~item.code: AND upper(item.code) LIKE upper({item.code})~/
 | 
				
			||||||
 /~item.name: AND item.name LIKE {item.name}~/
 | 
					 /~item.name: AND item.name LIKE {item.name}~/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,86 +0,0 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<pages>
 | 
					 | 
				
			||||||
    <maintainPage id="maintainZCInventoryPage" title="maintainZCInventoryPage" width="950" height="550" autoQuery="true">
 | 
					 | 
				
			||||||
        <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.warehouse = #{SESSION_WAREHOUSE}
 | 
					 | 
				
			||||||
 and location.type <> 'COUNT' and location.disabled=false
 | 
					 | 
				
			||||||
 ]]></hql>
 | 
					 | 
				
			||||||
                </remote>
 | 
					 | 
				
			||||||
                <text id="inventory.propC1" title="inventory.propC1" row="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 | 
					 | 
				
			||||||
                <text id="item.code" title="item.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
 | 
					 | 
				
			||||||
                <text id="item.name" title="item.name" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
 | 
					 | 
				
			||||||
                <date id="inventory.storageDate" title="inventory.storageDate" row="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
 | 
					 | 
				
			||||||
                <text id="inventory.barCode" title="inventory.barCode" row="3" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 | 
					 | 
				
			||||||
            	<numberText id="minQuantity" title="maintainInventoryPage.minQuantity" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="double"/>
 | 
					 | 
				
			||||||
            	<numberText id="maxQuantity" title="maintainInventoryPage.maxQuantity" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="double"/>
 | 
					 | 
				
			||||||
            </inputUIs>
 | 
					 | 
				
			||||||
        </search>
 | 
					 | 
				
			||||||
        <datasource type="hql"><![CDATA[SELECT 
 | 
					 | 
				
			||||||
 inventory.id,
 | 
					 | 
				
			||||||
 inventory.SOI,
 | 
					 | 
				
			||||||
 inventory.location.code, 
 | 
					 | 
				
			||||||
 inventory.location.type,
 | 
					 | 
				
			||||||
 item.code,
 | 
					 | 
				
			||||||
 item.name, 
 | 
					 | 
				
			||||||
 item.unit,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propC1,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propC9,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propC3,
 | 
					 | 
				
			||||||
 CAST(inventory.quantity as integer),
 | 
					 | 
				
			||||||
 CAST(inventory.queuedQuantity as integer),
 | 
					 | 
				
			||||||
 CAST(inventory.quantity -inventory.queuedQuantity as integer),
 | 
					 | 
				
			||||||
 inventory.status,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.storageDate,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.id as itemKeyID,
 | 
					 | 
				
			||||||
 item.id as itemID
 | 
					 | 
				
			||||||
 FROM Inventory inventory
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.location location
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.location.zone 
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.LP 
 | 
					 | 
				
			||||||
 left join inventory.itemKeyInventory.itemKey itemkey
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory.itemKey.item item
 | 
					 | 
				
			||||||
 left join item.location  
 | 
					 | 
				
			||||||
 WHERE 1=1
 | 
					 | 
				
			||||||
 AND inventory.location.type <> 'COUNT' 
 | 
					 | 
				
			||||||
 and inventory.quantity!=0
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propC3!='ZLWX'
 | 
					 | 
				
			||||||
 /~location.id: AND inventory.location.id = {location.id}~/
 | 
					 | 
				
			||||||
 /~item.code: AND upper(item.code) LIKE upper({item.code})~/
 | 
					 | 
				
			||||||
 /~item.name: AND item.name LIKE {item.name}~/
 | 
					 | 
				
			||||||
 /~inventory.propC1: AND inventory.itemKeyInventory.itemKey.lotInfo.propC1 LIKE {inventory.propC1}~/
 | 
					 | 
				
			||||||
 /~inventory.storageDate: AND inventory.itemKeyInventory.itemKey.storageDate = {inventory.storageDate}~/
 | 
					 | 
				
			||||||
 /~minQuantity: AND inventory.quantity >= {minQuantity}~/
 | 
					 | 
				
			||||||
 /~maxQuantity: AND inventory.quantity <= {maxQuantity}~/
 | 
					 | 
				
			||||||
 /~inventory.barCode: AND upper(inventory.itemKeyInventory.itemKey.lotInfo.propC9) LIKE upper({inventory.barCode})~/
 | 
					 | 
				
			||||||
 ]]></datasource>
 | 
					 | 
				
			||||||
        <columns>
 | 
					 | 
				
			||||||
            <column id="inventory.id" title="ID" visible="false"/>
 | 
					 | 
				
			||||||
            <column id="inventory.SOI" width="80" title="ad.lotInfo.propC6" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.location.code" width="80" title="location.code" visible="true" horizonAlign="center" />
 | 
					 | 
				
			||||||
            <column id="inventory.location.type" width="80" title="inventory.location.type" visible="true" horizonAlign="center" format="enumFormat" formatParam="LocationType"/>
 | 
					 | 
				
			||||||
            <column id="item.code" width="100" title="item.code" visible="true" horizonAlign="center" sortIndex="4"/>
 | 
					 | 
				
			||||||
            <column id="item.name" width="180" title="item.name" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.packageUnit.unit" width="40" title="unit" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.itemKeyInventory.itemKey.lotInfo.propC1" width="80"  title="inventory.propC1" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.itemKeyInventory.itemKey.lotInfo.propC9" title="inventory.barCode" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.itemKeyInventory.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/> 
 | 
					 | 
				
			||||||
            <column id="inventory.quantity" width="60" title="invQty" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.queuedQuantity" width="60" title="zyQty" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.kyQuantity" width="60" title="kyQty" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.status" width="60" title="inventory.status" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.storageDate" title="inventory.storageDate" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="itemKeyID" title="itemKey" visible="false" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="itemID" title="item" visible="false" horizonAlign="center"/>
 | 
					 | 
				
			||||||
        </columns>
 | 
					 | 
				
			||||||
        <buttons>
 | 
					 | 
				
			||||||
            <popup id="modify" title="杂项出库" enableType="single" invisible="false" containId="true" pageId="editZCInventoryPage">
 | 
					 | 
				
			||||||
            </popup>
 | 
					 | 
				
			||||||
		</buttons>
 | 
					 | 
				
			||||||
    </maintainPage>
 | 
					 | 
				
			||||||
</pages>
 | 
					 | 
				
			||||||
		Loading…
	
		Reference in New Issue