no message
							parent
							
								
									d5a0ae21e5
								
							
						
					
					
						commit
						81ceb4bd40
					
				| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					target/
 | 
				
			||||||
| 
						 | 
					@ -71,6 +71,7 @@
 | 
				
			||||||
 WHERE 1=1 
 | 
					 WHERE 1=1 
 | 
				
			||||||
 and inventory.quantity>0
 | 
					 and inventory.quantity>0
 | 
				
			||||||
 and inventory.itemKeyInventory.warehouse=#{SESSION_WAREHOUSE}
 | 
					 and inventory.itemKeyInventory.warehouse=#{SESSION_WAREHOUSE}
 | 
				
			||||||
 | 
					 and location.type='STORAGE'
 | 
				
			||||||
 /~company.id: AND company.id = {company.id}~/
 | 
					 /~company.id: AND company.id = {company.id}~/
 | 
				
			||||||
 /~location.id: AND inventory.location.id = {location.id}~/
 | 
					 /~location.id: AND inventory.location.id = {location.id}~/
 | 
				
			||||||
 /~item.code: AND item.code LIKE {item.code}~/
 | 
					 /~item.code: AND item.code LIKE {item.code}~/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,122 +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} ~/
 | 
					 | 
				
			||||||
  /~SESSION_WAREHOUSE: and company.warehouse = #{SESSION_WAREHOUSE} ~/
 | 
					 | 
				
			||||||
 ]]></hql>
 | 
					 | 
				
			||||||
                </remote>
 | 
					 | 
				
			||||||
                <remote id="location.id" title="location" row="1" 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="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"/>
 | 
					 | 
				
			||||||
                <text id="item.barcode" title="item.barcode" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
 | 
					 | 
				
			||||||
            
 | 
					 | 
				
			||||||
            </inputUIs>
 | 
					 | 
				
			||||||
        </search>
 | 
					 | 
				
			||||||
        <datasource type="hql"><![CDATA[SELECT inventory.id,
 | 
					 | 
				
			||||||
 item.code,
 | 
					 | 
				
			||||||
 item.name, 
 | 
					 | 
				
			||||||
 item.specs,
 | 
					 | 
				
			||||||
 item.barcode,
 | 
					 | 
				
			||||||
 item.strExtend3,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propD1,
 | 
					 | 
				
			||||||
 inventory.itemKeyInventory.itemKey.lotInfo.propD2,
 | 
					 | 
				
			||||||
 case when company.id!=1003 then 
 | 
					 | 
				
			||||||
 	case when inventory.quantity=0 then ' '
 | 
					 | 
				
			||||||
      when item.CAcoefficient=0 then (mod(inventory.quantity,item.CAcoefficient)||pu.unit)
 | 
					 | 
				
			||||||
      when inventory.quantity<item.CAcoefficient then 0
 | 
					 | 
				
			||||||
      when mod(inventory.quantity,item.CAcoefficient)=0 then (floor(inventory.quantity/item.CAcoefficient))
 | 
					 | 
				
			||||||
      when mod(inventory.quantity,item.CAcoefficient)>0 then  (floor(inventory.quantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(inventory.quantity,item.CAcoefficient)||pu.unit) end
 | 
					 | 
				
			||||||
      
 | 
					 | 
				
			||||||
 	else 
 | 
					 | 
				
			||||||
  	 case when inventory.quantity=0 then ' '
 | 
					 | 
				
			||||||
      when item.CAcoefficient=0 then (mod(inventory.quantity,item.CAcoefficient))
 | 
					 | 
				
			||||||
      when inventory.quantity<item.CAcoefficient then 0
 | 
					 | 
				
			||||||
      when mod(inventory.quantity,item.CAcoefficient)=0 then (floor(inventory.quantity/item.CAcoefficient))
 | 
					 | 
				
			||||||
      when mod(inventory.quantity,item.CAcoefficient)>0 then  (floor(inventory.quantity/item.CAcoefficient)) end
 | 
					 | 
				
			||||||
      end,
 | 
					 | 
				
			||||||
 item.CAname,
 | 
					 | 
				
			||||||
 CAST(inventory.quantity as integer),
 | 
					 | 
				
			||||||
 inventory.packageUnit.unit as bzkcdw,
 | 
					 | 
				
			||||||
 inventory.location.code, 
 | 
					 | 
				
			||||||
 CAST(inventory.queuedQuantity as integer),
 | 
					 | 
				
			||||||
 CAST(inventory.quantity -inventory.queuedQuantity as integer),
 | 
					 | 
				
			||||||
 inventory.SOI,
 | 
					 | 
				
			||||||
 company.name,
 | 
					 | 
				
			||||||
 inventory.location.type, 
 | 
					 | 
				
			||||||
 inventory.packageUnit.unit,
 | 
					 | 
				
			||||||
 item.CAname as xsdw,
 | 
					 | 
				
			||||||
 CAST(item.CAcoefficient as integer)
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 FROM Inventory inventory
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.location location
 | 
					 | 
				
			||||||
 left join inventory.itemKeyInventory.itemKey itemkey
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory.itemKey.item.company company	
 | 
					 | 
				
			||||||
 LEFT JOIN inventory.itemKeyInventory.itemKey.item item
 | 
					 | 
				
			||||||
 left join inventory.packageUnit pu
 | 
					 | 
				
			||||||
 WHERE 1=1 
 | 
					 | 
				
			||||||
 and inventory.quantity>0
 | 
					 | 
				
			||||||
 and inventory.itemKeyInventory.warehouse=#{SESSION_WAREHOUSE}
 | 
					 | 
				
			||||||
 /~company.id: AND company.id = {company.id}~/
 | 
					 | 
				
			||||||
 /~location.id: AND inventory.location.id = {location.id}~/
 | 
					 | 
				
			||||||
 /~item.code: AND item.code LIKE {item.code}~/
 | 
					 | 
				
			||||||
 /~item.name: AND item.name LIKE {item.name}~/
 | 
					 | 
				
			||||||
 /~item.barcode: AND item.barcode LIKE {item.barcode}~/
 | 
					 | 
				
			||||||
 order by item.code,inventory.location.code
 | 
					 | 
				
			||||||
 ]]></datasource>
 | 
					 | 
				
			||||||
        <columns>
 | 
					 | 
				
			||||||
            <column id="inventory.id" title="ID" visible="false"/>
 | 
					 | 
				
			||||||
            <column id="item.code" width="120" title="item.code" visible="true" horizonAlign="center" />
 | 
					 | 
				
			||||||
        	<column id="item.name" title="item.name" width="200" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
        	<column id="item.specs" title="货品规格" width="200" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
        	<column id="item.barcode" title="item.barcode" width="120" visible="true" horizonAlign="center" format="colourFormat"  />
 | 
					 | 
				
			||||||
        	<column id="item.strExtend3" title="外条码" width="120" visible="true" horizonAlign="center" />
 | 
					 | 
				
			||||||
            <column id="inventory.itemKeyInventory.itemKey.lotInfo.propD1" width="80"  title="itemKey.lotInfo.propD1" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.itemKeyInventory.itemKey.lotInfo.propD2" width="80"  title="到期日期" visible="true" horizonAlign="center" />
 | 
					 | 
				
			||||||
            <column id="ca.quantity" width="120" title="销售单位库存数" visible="true" horizonAlign="center" format="countInventoryLotFormat" />
 | 
					 | 
				
			||||||
            <column id="item.CAname" width="120" title="库存单位" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.quantity" width="90" title="包装库存数" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="bzkcdw" width="120" title="包装库存单位" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="inventory.location.code" width="80" title="location.code" 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.SOI" title="inventory.SOI" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="company.name" title="company.name" width="200" visible="true" horizonAlign="center" verticalAlign="middle" />
 | 
					 | 
				
			||||||
            <column id="inventory.location.type" width="60" title="location.type" visible="true" horizonAlign="center" />
 | 
					 | 
				
			||||||
            <column id="inventory.packageUnit.unit" width="80" title="包装单位" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
            <column id="xsdw" title="销售单位" width="80"  visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
			<column id="item.CAcoefficient" width="90" title="包装规格系数" visible="true" horizonAlign="center"/>
 | 
					 | 
				
			||||||
        </columns>
 | 
					 | 
				
			||||||
        <buttons>
 | 
					 | 
				
			||||||
        	<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="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">
 | 
					 | 
				
			||||||
            </popup>
 | 
					 | 
				
			||||||
<!--             <popup id="editMultiMove" title="editMultiMove" enableType="multi" invisible="false" containId="true" pageId="editMultiMovePage"> -->
 | 
					 | 
				
			||||||
<!-- 			</popup>批量移位 -->
 | 
					 | 
				
			||||||
            <popup id="goodTransfer" title="货品转移" enableType="single" invisible="false" containId="true" pageId="editGoodTransferPage">
 | 
					 | 
				
			||||||
            </popup> 
 | 
					 | 
				
			||||||
            
 | 
					 | 
				
			||||||
            <popup id="multiMove" title="批量移位" enableType="none" invisible="false" containId="true" pageId="importMultiMovePage"/>
 | 
					 | 
				
			||||||
   
 | 
					 | 
				
			||||||
		</buttons>
 | 
					 | 
				
			||||||
    </maintainPage>
 | 
					 | 
				
			||||||
</pages>
 | 
					 | 
				
			||||||
		Loading…
	
		Reference in New Issue