no message
parent
897c6437c5
commit
4958dbe68c
|
|
@ -29,7 +29,6 @@
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
and loc.type in ('TRANSIT','STORAGE')
|
||||
and (loc.mixItem=true or lv.loc_status='空')
|
||||
and (loc.id in(select l.dock.id from LocationRegistration l where l.asn.id={asn.id}) or 0=(select nvl(max(l.dock.id),0) from LocationRegistration l where l.asn.id={asn.id}))
|
||||
and (loc.id not in (select inventory.location.id from Inventory inventory where inventory.location.id=loc.id and inventory.quantity>0 ) or loc.mixItem=true )
|
||||
order by loc.code]]></hql>
|
||||
</remote>
|
||||
<remote id="asnDetail.asn.worker1.id" title="asnOneReceivePage.worker" row="20" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" manualEditable="true" displayColumn="3" percentSignPosition="both" displayedTableHead="序号,编码,名称">
|
||||
|
|
|
|||
|
|
@ -1,171 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainInventoryPage" title="maintainInventoryPage" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<remote id="company.id" title="company" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" editModel="normal" manualEditable="true" displayedTableHead="序号,编码,名称">
|
||||
<hql><![CDATA[select company.id, company.code, company.name from Structure company
|
||||
where company.beCompany = true and upper(company.code) like upper(:param) or company.name like :param
|
||||
and company.disabled=false
|
||||
/~company.name: and company.name like {company.name} ~/
|
||||
/~company.code: and company.code like {company.code} ~/
|
||||
]]></hql>
|
||||
</remote>
|
||||
<list id="location.type" title="location.type" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="LocationType">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'LocationType' order by enumerate.id]]></hql>
|
||||
|
||||
</list>
|
||||
<list id="zone.id" title="zone" row="2" col="1" span="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select zone.id, zone.name from WarehouseArea zone
|
||||
where 1=1
|
||||
and zone.warehouse = #{SESSION_WAREHOUSE}
|
||||
and zone.disabled=false]]></hql>
|
||||
</list>
|
||||
<remote id="location.id" title="location" row="2" col="2" 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="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="packageUnit.unit" title="packageUnit.unit" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="LP" title="stock.LP" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
<text id="itemKeyLot" title="maintainInventoryPage.itemKeyId" row="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<text id="inventory.SOI" title="inventory.SOI" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<!-- <date id="inventory.storageDate" title="inventory.storageDate" row="6" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/> -->
|
||||
<text id="itemKey.content" title="inventory.itemKeyInventory.itemKey.content" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
|
||||
<numberText id="minQuantity" title="maintainInventoryPage.minQuantity" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="double"/>
|
||||
<numberText id="maxQuantity" title="maintainInventoryPage.maxQuantity" row="8" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" returnType="double"/>
|
||||
<dateRanger id="inventory.storageDate" title="inventory.storageDate" row="9" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="storageDate1" toDate="storageDate2"/>
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[SELECT inventory.id,
|
||||
inventory.SOI,
|
||||
company.name,
|
||||
inventory.location.code,
|
||||
inventory.location.type,
|
||||
item.name,
|
||||
ik.lotInfo.propC1,
|
||||
item.specs,
|
||||
inventory.itemKey.lotInfo.propC3,
|
||||
round(inventory.quantity,4),
|
||||
round(inventory.quantity/ik.lotInfo.propL1,2),
|
||||
ik.lotInfo.propL1,
|
||||
ik.lotInfo.propL2,
|
||||
round(inventory.quantity/(ik.lotInfo.propL1*ik.lotInfo.propL2),2),
|
||||
ik.lotInfo.propD1,
|
||||
ik.lotInfo.propD2,
|
||||
ik.lotInfo.propC4,
|
||||
|
||||
item.bgxx.itemNumber,
|
||||
item.bgxx.hsCode,
|
||||
item.bgxx.code,
|
||||
item.customsRecord.itemNumber,
|
||||
item.code,
|
||||
round(inventory.queuedQuantity,4),
|
||||
round(inventory.quantity-inventory.queuedQuantity,4),
|
||||
|
||||
item.weight*inventory.quantity,
|
||||
inventory.status,
|
||||
inventory.temperature,
|
||||
ik.lotInfo.propC5,
|
||||
ik.lotInfo.propC6,
|
||||
inventory.storageDate,
|
||||
inventory.storageDate as stockAge,
|
||||
inventory.LP.LP,inventory.itemKey.id
|
||||
FROM Inventory inventory
|
||||
LEFT JOIN inventory.location location
|
||||
LEFT JOIN inventory.location.zone
|
||||
LEFT JOIN inventory.LP
|
||||
left join inventory.itemKey ik
|
||||
LEFT JOIN inventory.itemKey.company company
|
||||
LEFT JOIN inventory.itemKey.item item
|
||||
left join item.bgxx
|
||||
left join item.customsRecord
|
||||
WHERE 1=1 and location.type not in ('PROCESS')
|
||||
AND inventory.qtyOfMasterPack > 0
|
||||
and inventory.warehouse=#{SESSION_WAREHOUSE}
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
/~company.id: AND company.id = {company.id}~/
|
||||
/~location.id: AND inventory.location.id = {location.id}~/
|
||||
/~zone.id: AND inventory.location.zone.id = {zone.id}~/
|
||||
/~location.type: AND inventory.location.type = {location.type}~/
|
||||
/~item.code: AND item.code LIKE {item.code}~/
|
||||
/~item.name: AND item.name LIKE {item.name}~/
|
||||
/~packageUnit.unit: AND inventory.packageUnit.unit LIKE {packageUnit.unit}~/
|
||||
/~LP: AND inventory.LP.LP LIKE {LP}~/
|
||||
/~itemKeyLot: AND inventory.itemKey.lot LIKE {itemKeyLot}~/
|
||||
/~inventory.SOI: AND inventory.SOI LIKE {inventory.SOI}~/
|
||||
/~storageDate1: AND inventory.storageDate >= {storageDate1}~/
|
||||
/~storageDate1: AND inventory.storageDate <= {storageDate1}~/
|
||||
/~itemKey.content: AND inventory.itemKey.content LIKE {itemKey.content}~/
|
||||
/~minQuantity: AND inventory.quantity >= {minQuantity}~/
|
||||
/~maxQuantity: AND inventory.quantity <= {maxQuantity}~/
|
||||
order by inventory.location.code ,inventory.id desc
|
||||
]]></datasource>
|
||||
<columns>
|
||||
<column id="inventory.id" title="ID" visible="false"/>
|
||||
<column id="inventory.SOI" title="inventory.SOI" visible="true" horizonAlign="left"/>
|
||||
<column id="company.name" title="company.name" visible="true" horizonAlign="center" verticalAlign="middle" />
|
||||
<column id="inventory.location.code" width="80" title="location.code" visible="true" horizonAlign="left" />
|
||||
<column id="inventory.location.type" width="60" title="location.type" visible="true" horizonAlign="left" format="colourFormat"/>
|
||||
<column id="item.name" title="item.name" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propC1" width="80" title="lotInfo.propC1" visible="true" horizonAlign="left"/>
|
||||
<column id="item.specs" width="60" title="item.specs" visible="true" horizonAlign="left"/>
|
||||
<column id="inventory.packageUnit.unit" width="40" title="unit" visible="true" horizonAlign="left"/>
|
||||
<column id="inventory.quantity" width="60" title="invQty" visible="true" horizonAlign="right"/>
|
||||
<column id="caseQty" width="80" title="caseQty" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propL1" width="60" title="lotInfo.propL1" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propL2" width="60" title="lotInfo.propL2" visible="true" horizonAlign="left"/>
|
||||
<column id="lpQty" width="80" title="lpQty" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propD1" width="80" title="lotInfo.propD1" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propD2" width="80" title="lotInfo.propD2" visible="true" horizonAlign="left"/>
|
||||
<column id="lotInfo.propC4" width="80" title="lotInfo.propC4" visible="true" horizonAlign="left"/>
|
||||
<column id="item.bgxx.itemNumber" width="50" title="item.bgxx.itemNumber" visible="true" horizonAlign="left" />
|
||||
<column id="item.bgxx.hsCode" width="60" title="item.bgxx.hsCode" visible="true" horizonAlign="left"/>
|
||||
<column id="item.bgxx.code" width="80" title="item.bgxx.code" visible="true" horizonAlign="left"/>
|
||||
<column id="item.customsRecord.code" width="80" title="非保项号" visible="true" horizonAlign="left"/>
|
||||
<column id="item.code" width="80" title="item.code" visible="true" horizonAlign="left" sortIndex="4"/>
|
||||
<column id="inventory.queuedQuantity" width="60" title="zyQty" visible="true" horizonAlign="right"/>
|
||||
<column id="inventory.kyQuantity" width="60" title="kyQty" visible="true" horizonAlign="right"/>
|
||||
<column id="weight" width="80" title="weight" visible="true" horizonAlign="left"/>
|
||||
<column id="inventory.status" width="60" title="inventory.status" visible="true" horizonAlign="left"/>
|
||||
<column id="customsOrder.temperature" title="customsOrder.temperature" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="lotInfo.propC5" title="lotInfo.propC5" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="lotInfo.propC6" title="lotInfo.propC6" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="inventory.storageDate" title="inventory.storageDate" visible="true" horizonAlign="left"/>
|
||||
<column id="stockAge" width="60" title="lotInfo.stockAge" visible="true" horizonAlign="left" format="inventoryAgeFormat"/>
|
||||
<column id="inventory.LP.LP" title="inventory.LP" visible="true" horizonAlign="left"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<!-- <popup id="new" title="newInventory" enableType="none" invisible="false" containId="false" pageId="editInventoryPage"/> -->
|
||||
<popup id="modify" title="editInventory" enableType="single" invisible="false" containId="true" pageId="modifyInventoryPage">
|
||||
<enableExpression><![CDATA[${inventory.location.type} != 'RECEIVE' && ${inventory.location.type} != 'SHIP']]></enableExpression>
|
||||
</popup>
|
||||
<popup id="importInv" title="importInv" enableType="none" invisible="false" containId="false" pageId="importInvPage"/>
|
||||
<!-- <popup id="editLot" title="maintainInventoryPage.editLot" enableType="single" invisible="false" containId="true" pageId="editLotPage"> -->
|
||||
<!-- <enableExpression><![CDATA[ (${inventory.location.type} == 'TRANSIT' || ${inventory.location.type} == 'STORAGE' ) || (${inventory.queuedQuantity} < ${inventory.quantity}) && (${inventory.status}=="-" || ${inventory.status}=="null") ]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<popup id="move" title="moveInventory" enableType="single" invisible="false" containId="true" pageId="moveInventoryPage">
|
||||
<enableExpression><![CDATA[ ${inventory.location.type} == 'TRANSIT' || ${inventory.location.type} == 'STORAGE' && ${inventory.queuedQuantity} < ${inventory.quantity} ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="lockInventory" title="lockInventory" enableType="multi" invisible="false" containId="true" pageId="locakInventoryByCondition">
|
||||
<!-- <enableExpression><![CDATA[ && ${inventory.location.type} == 'STORAGE' || ${inventory.location.type} == 'TRANSIT' && ${inventory.queuedQuantity} < ${inventory.quantity} ]]></enableExpression> -->
|
||||
</popup>
|
||||
<popup id="unlockInventory" title="unlockInventory" enableType="multi" invisible="false" containId="true" pageId="unlockInventoryByCondition">
|
||||
<!-- <enableExpression><![CDATA[ ${inventory.location.type} == 'STORAGE' || ${inventory.location.type} == 'TRANSIT' && ${inventory.queuedQuantity} < ${inventory.quantity} && ${inventory.status}!="-" ]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <popup id="editMulti" title="editBatchInventory" enableType="none" invisible="false" containId="true" pageId="editInventoryStatus"> -->
|
||||
<!-- </popup> -->
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
Loading…
Reference in New Issue