更新海关备案、增加140
							parent
							
								
									dbede726f4
								
							
						
					
					
						commit
						ae82eb7356
					
				| 
						 | 
				
			
			@ -108,7 +108,7 @@ public class Item extends Entity {
 | 
			
		|||
    
 | 
			
		||||
    private Double multipleOrder;//倍数订购
 | 
			
		||||
    
 | 
			
		||||
    private int codePat ;//码拍标准
 | 
			
		||||
    private int codePat ;//备案分类
 | 
			
		||||
    /**  */
 | 
			
		||||
	private String sourceId;
 | 
			
		||||
	/**  */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,14 +29,14 @@ public class CustomsRecord  extends Entity{
 | 
			
		|||
	
 | 
			
		||||
	private Warehouse warehouse;//所属仓库
 | 
			
		||||
	
 | 
			
		||||
	private boolean neworold = false;//是否新旧;0旧备案;1:新备案
 | 
			
		||||
	private Integer neworold;//备案分类;77;127;140
 | 
			
		||||
	
 | 
			
		||||
	
 | 
			
		||||
	public boolean isNeworold() {
 | 
			
		||||
 | 
			
		||||
	public Integer getNeworold() {
 | 
			
		||||
		return neworold;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	public void setNeworold(boolean neworold) {
 | 
			
		||||
	public void setNeworold(Integer neworold) {
 | 
			
		||||
		this.neworold = neworold;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
        <property name="description" column="DESCRIPTION" type="string" length="500"/>
 | 
			
		||||
        
 | 
			
		||||
		<property name="disabled" column="DISABLED" type="boolean"/>	
 | 
			
		||||
		<property name="neworold" column="neworold" type="boolean"/>	
 | 
			
		||||
		<property name="neworold" column="neworold" type="int" />	
 | 
			
		||||
		
 | 
			
		||||
		<many-to-one name="declareUnit" class="com.dev.swms.server.model.base.PackageUnit" >
 | 
			
		||||
       		<column name="DECLARE_UNIT_ID" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1160,8 +1160,9 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 | 
			
		|||
					throw new BusinessException("该模版列数不正确,不能小于8");
 | 
			
		||||
				}
 | 
			
		||||
		    for (int i = 1; i <sheet.getRows(); i++) {
 | 
			
		||||
		    	//所属项号	极进货物编号	客户货/料号	中文名	规格	仓库单位	单位净重	非保项号
 | 
			
		||||
		    	//备案分类   所属项号	极进货物编号	客户货/料号	中文名	规格	仓库单位	单位净重	非保项号
 | 
			
		||||
			    int j=0;
 | 
			
		||||
			    	String neworold=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	String xh=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	String jjCode=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	String cusCode=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
| 
						 | 
				
			
			@ -1169,7 +1170,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 | 
			
		|||
			    	String gg=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	String unit=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	
 | 
			
		||||
			    	if(null==xh||xh.equals("")){
 | 
			
		||||
			    	if(null==neworold||neworold.equals("")){
 | 
			
		||||
			    		return;
 | 
			
		||||
			    	}
 | 
			
		||||
			    	double weight=0;
 | 
			
		||||
| 
						 | 
				
			
			@ -1195,21 +1196,21 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 | 
			
		|||
					}
 | 
			
		||||
			    	String fbxh=sheet.getCell(j++,i).getContents().trim();
 | 
			
		||||
			    	
 | 
			
		||||
			    	
 | 
			
		||||
		        	List<CustomsRecord> ss=this.commonDao.findByQuery("from CustomsRecord s where (s.itemNumber=:itemNumber )",
 | 
			
		||||
		        			new String[]{"itemNumber"},new Object[]{Integer.parseInt(xh)});
 | 
			
		||||
		        	if(ss.size()<=0){
 | 
			
		||||
		        		throw new BusinessException(i+1+"行项号"+xh+"不存在!");
 | 
			
		||||
		        	}
 | 
			
		||||
		        	CustomsRecord fb=null;
 | 
			
		||||
		        	if(fbxh!=null&&!fbxh.equals("")){
 | 
			
		||||
			        	List<CustomsRecord> fs=this.commonDao.findByQuery("from CustomsRecord s where (s.itemNumber=:itemNumber )",
 | 
			
		||||
			        			new String[]{"itemNumber"},new Object[]{Integer.parseInt(fbxh)});
 | 
			
		||||
			        	if(ss.size()<=0){
 | 
			
		||||
			        	List<CustomsRecord> fs=this.commonDao.findByQuery("from CustomsRecord s where s.itemNumber=:itemNumber and s.noninsuranceTpey='非保' ",
 | 
			
		||||
			        			new String[]{"itemNumber"},new Object[]{Integer.parseInt(xh)});
 | 
			
		||||
			        	if(fs.size()<=0){
 | 
			
		||||
			        		throw new BusinessException(i+1+"行非保项号"+fbxh+"不存在!");
 | 
			
		||||
			        	}
 | 
			
		||||
			        	fb=fs.get(0);
 | 
			
		||||
		        	}
 | 
			
		||||
		        	List<CustomsRecord> ss=this.commonDao.findByQuery("from CustomsRecord s where s.itemNumber=:itemNumber and s.neworold=:neworold and s.noninsuranceTpey='保税' ",
 | 
			
		||||
			        new String[]{"itemNumber","neworold"},new Object[]{Integer.parseInt(xh),Integer.parseInt(neworold)});
 | 
			
		||||
			        if(ss.size()<=0){
 | 
			
		||||
			        	throw new BusinessException(i+1+"行项号"+xh+"不存在!");
 | 
			
		||||
			        }
 | 
			
		||||
		        	
 | 
			
		||||
		        	
 | 
			
		||||
		        	List<Item> items=commonDao.findByQuery("from Item t where t.code=:code ",
 | 
			
		||||
	    					new String[]{"code"},new Object[]{jjCode});
 | 
			
		||||
| 
						 | 
				
			
			@ -1218,7 +1219,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 | 
			
		|||
			    		item=items.get(0);
 | 
			
		||||
			    	}else{
 | 
			
		||||
			    		item=EntityFactory.getEntity(Item.class);
 | 
			
		||||
			    	
 | 
			
		||||
			    	}
 | 
			
		||||
			    	item.setCode(jjCode);
 | 
			
		||||
	        		item.setBgxx(ss.get(0));
 | 
			
		||||
	        		item.setItemCode(cusCode);
 | 
			
		||||
| 
						 | 
				
			
			@ -1229,8 +1230,9 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 | 
			
		|||
		    		item.setCustomsRecord(fb);
 | 
			
		||||
		    		item.setLargeClass("恒温食品原料");
 | 
			
		||||
		    		item.setWarehouse(WarehouseHolder.getWarehouse());
 | 
			
		||||
		    		item.setCodePat(Integer.parseInt(neworold));//备案分类
 | 
			
		||||
			    	commonDao.store(item);
 | 
			
		||||
			    	}
 | 
			
		||||
			    	
 | 
			
		||||
		    }
 | 
			
		||||
		} catch (BiffException e) {
 | 
			
		||||
			// TODO Auto-generated catch block
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ public interface CustomsRecordManager extends BaseManager{
 | 
			
		|||
	
 | 
			
		||||
	//海关备案导入
 | 
			
		||||
	@Transactional
 | 
			
		||||
	public void customsRecordImport(File file,boolean neworold);
 | 
			
		||||
	public void customsRecordImport(File file,int neworold);
 | 
			
		||||
	//非保项号导入
 | 
			
		||||
		@Transactional
 | 
			
		||||
		public void customsNoninsurance(File file);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -118,7 +118,7 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	@Override
 | 
			
		||||
	public void customsRecordImport(File file,boolean neworold) {
 | 
			
		||||
	public void customsRecordImport(File file,int neworold) {
 | 
			
		||||
		try {
 | 
			
		||||
			//项号   商品编码,HSCODE 	商品品名	申报单位	法定第一计量单位	法定第二计量单位	规格型号   作废 原产国
 | 
			
		||||
			Workbook workbook = Workbook.getWorkbook(file);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,15 @@
 | 
			
		|||
<pages>
 | 
			
		||||
    <editPage id="editItemDetailPage" title="editItemDetailPage" entityClass="com.dev.swms.server.model.base.Item" onClose="refreshParent" width="880" height="210">
 | 
			
		||||
         <inputUIs>				
 | 
			
		||||
                <hidden id="item.id" reserve="true"/>				
 | 
			
		||||
                <hidden id="item.id" reserve="true"/>		
 | 
			
		||||
                <list id="item.codePat" title="备案分类"  row="0" col="1" span="1"  width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
 | 
			
		||||
                    <hql><![CDATA[ SELECT 
 | 
			
		||||
 c.name,
 | 
			
		||||
 c.name
 | 
			
		||||
 FROM CommonCode c 
 | 
			
		||||
 WHERE c.disabled=0 and c.codeType='备案分类' 
 | 
			
		||||
 ]]></hql>
 | 
			
		||||
                </list>		
 | 
			
		||||
                <remote id="item.bgxx.id" title="item.bgxx" row="1" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" displayColumn="2" displayedTableHead="序号,货号,货品名称,单位">				
 | 
			
		||||
                    <hql><![CDATA[select 
 | 
			
		||||
bgxx.id, 
 | 
			
		||||
| 
						 | 
				
			
			@ -15,9 +23,7 @@ from CustomsRecord bgxx
 | 
			
		|||
left join bgxx.legalFirstUint unit		
 | 
			
		||||
where  
 | 
			
		||||
(upper(bgxx.hsCode) like upper(:param) or upper(bgxx.name) like upper(:param) or bgxx.itemNumber like :param)		
 | 
			
		||||
and bgxx.neworold=1	
 | 
			
		||||
 /~bgxx.name: and bgxx.name like {bgxx.name} ~/				
 | 
			
		||||
 /~bgxx.code: and bgxx.code like {bgxx.code} ~/				
 | 
			
		||||
and bgxx.neworold=cast({item.codePat} as int)	
 | 
			
		||||
 ]]></hql>		
 | 
			
		||||
 					<eventListeners>
 | 
			
		||||
<!--                   		<eventListener id="item.name" index="3" refreshUI="false"/> -->
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,16 +1,16 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<pages>
 | 
			
		||||
    <editPage id="editCustomsRecordImportPage" title="海关备案导入(77)" onClose="refreshParent">
 | 
			
		||||
    <editPage id="edit140CustomsRecordImportPage" title="海关备案导入(140)" onClose="refreshParent">
 | 
			
		||||
        <inputUIs>
 | 
			
		||||
            <file id="importLocation.filePath" title="Filepath" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="TEMP_FILE_DIR"/>
 | 
			
		||||
            <checkbox id="neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="false" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
            <numberText id="neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="140" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
            <commit id="import" title="import" enableType="none" invisible="false">
 | 
			
		||||
                <mappings>
 | 
			
		||||
                    <mapping id="importLocation.filePath" className="file"/>
 | 
			
		||||
                    <mapping id="neworold" className="boolean"/>
 | 
			
		||||
                    <mapping id="neworold" className="int"/>
 | 
			
		||||
                </mappings>
 | 
			
		||||
                <actions>
 | 
			
		||||
                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
 | 
			
		||||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<pages>
 | 
			
		||||
    <editPage id="editCustomsRecordPage" title="海关备案编辑(77)" entityClass="com.dev.swms.server.model.customs.CustomsRecord" onClose="refreshParent" width="800" height="210">
 | 
			
		||||
    <editPage id="edit140CustomsRecordPage" title="海关备案编辑(140)" entityClass="com.dev.swms.server.model.customs.CustomsRecord" onClose="refreshParent" width="800" height="210">
 | 
			
		||||
        <inputUIs>
 | 
			
		||||
            <hidden id="customsRecord.id" reserve="false"/>
 | 
			
		||||
            <text id="customsRecord.itemNumber" title="customsRecord.itemNumber" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
 | 
			
		||||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
            </list>
 | 
			
		||||
			<textArea id="customsRecord.description" title="customsRecord.description" row="3" col="1" span="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="4" cols="93"/>
 | 
			
		||||
          <text id="customsRecord.noninsuranceTpey" title="是否非保" defaultValue="保税" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="true"/>
 | 
			
		||||
          <checkbox id="customsRecord.neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="false" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          <numberText id="customsRecord.neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="140" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
| 
						 | 
				
			
			@ -4,13 +4,13 @@
 | 
			
		|||
    <editPage id="editCustomsRecordImportPage" title="海关备案导入(77)" onClose="refreshParent">
 | 
			
		||||
        <inputUIs>
 | 
			
		||||
            <file id="importLocation.filePath" title="Filepath" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="TEMP_FILE_DIR"/>
 | 
			
		||||
            <checkbox id="neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="false" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
            <numberText id="neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="77" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
            <commit id="import" title="import" enableType="none" invisible="false">
 | 
			
		||||
                <mappings>
 | 
			
		||||
                    <mapping id="importLocation.filePath" className="file"/>
 | 
			
		||||
                    <mapping id="neworold" className="boolean"/>
 | 
			
		||||
                    <mapping id="neworold" className="int"/>
 | 
			
		||||
                </mappings>
 | 
			
		||||
                <actions>
 | 
			
		||||
                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
            </list>
 | 
			
		||||
			<textArea id="customsRecord.description" title="customsRecord.description" row="3" col="1" span="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="4" cols="93"/>
 | 
			
		||||
          <text id="customsRecord.noninsuranceTpey" title="是否非保" defaultValue="保税" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="true"/>
 | 
			
		||||
          <checkbox id="customsRecord.neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="false" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          <numberText id="customsRecord.neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="77" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,13 +4,13 @@
 | 
			
		|||
    <editPage id="editNewCustomsRecordImportPage" title="海关备案导入(127)" onClose="refreshParent">
 | 
			
		||||
        <inputUIs>
 | 
			
		||||
            <file id="importLocation.filePath" title="Filepath" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="TEMP_FILE_DIR"/>
 | 
			
		||||
            <checkbox id="neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="true" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
            <numberText id="neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="127" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
            <commit id="import" title="import" enableType="none" invisible="false">
 | 
			
		||||
                <mappings>
 | 
			
		||||
                    <mapping id="importLocation.filePath" className="file"/>
 | 
			
		||||
                    <mapping id="neworold" className="boolean"/>
 | 
			
		||||
                    <mapping id="neworold" className="int"/>
 | 
			
		||||
                </mappings>
 | 
			
		||||
                <actions>
 | 
			
		||||
                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
            </list>
 | 
			
		||||
			<textArea id="customsRecord.description" title="customsRecord.description" row="3" col="1" span="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="4" cols="93"/>
 | 
			
		||||
          <text id="customsRecord.noninsuranceTpey" title="是否非保" defaultValue="保税" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" trimSpace="true" isPrecision="true"/>
 | 
			
		||||
          <checkbox id="customsRecord.neworold" title="是否新旧" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="true" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          <numberText id="customsRecord.neworold" title="备案分类" row="1" col="5" span="1"  width="40"  readOnly="false" required="false" defaultValue="127" reserve="false" forceOverride="true" inVisible="true"/>
 | 
			
		||||
          
 | 
			
		||||
        </inputUIs>
 | 
			
		||||
        <buttons>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<pages>
 | 
			
		||||
    <maintainPage id="maintainCustomsRecordPage" title="海关备案管理(77)" autoQuery="false">
 | 
			
		||||
    <maintainPage id="maintain140CustomsRecordPage" title="海关备案管理(140)" autoQuery="false">
 | 
			
		||||
        <search>
 | 
			
		||||
            <inputUIs>
 | 
			
		||||
                <text id="customsRecord.code" title="customsRecord.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 | 
			
		||||
| 
						 | 
				
			
			@ -31,7 +31,7 @@
 | 
			
		|||
 left join customsRecord.legalSecondUint
 | 
			
		||||
 where 1=1   
 | 
			
		||||
 and customsRecord.noninsuranceTpey='保税'
 | 
			
		||||
 and customsRecord.neworold=0
 | 
			
		||||
 and customsRecord.neworold=140
 | 
			
		||||
 and customsRecord.warehouse = #{SESSION_WAREHOUSE} 
 | 
			
		||||
 /~customsRecord.code: and upper(customsRecord.code) like upper({customsRecord.code})~/
 | 
			
		||||
 /~customsRecord.name: and upper(customsRecord.name) like upper({customsRecord.name})~/
 | 
			
		||||
| 
						 | 
				
			
			@ -56,8 +56,8 @@
 | 
			
		|||
            <column id="customsRecord.disabled" title="customsRecord.disabled" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
 | 
			
		||||
        </columns>
 | 
			
		||||
        <buttons>
 | 
			
		||||
            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editCustomsRecordPage"/>
 | 
			
		||||
            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editCustomsRecordPage"/>
 | 
			
		||||
            <popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="edit140CustomsRecordPage"/>
 | 
			
		||||
            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="edit140CustomsRecordPage"/>
 | 
			
		||||
            <commit id="invalid" title="invalid" enableType="multi" invisible="false" confirmMessage="确认是否失效?">
 | 
			
		||||
                <enableExpression><![CDATA[(${customsRecord.disabled}=='false')]]></enableExpression>
 | 
			
		||||
                <mappings>
 | 
			
		||||
| 
						 | 
				
			
			@ -82,7 +82,7 @@
 | 
			
		|||
                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
 | 
			
		||||
                </forwards>
 | 
			
		||||
            </commit>
 | 
			
		||||
            <popup id="customsRecordImport" title="customsRecordImport" enableType="none" invisible="false" containId="false" pageId="editCustomsRecordImportPage"/>
 | 
			
		||||
            <popup id="customsRecordImport" title="海关备案导入(新)" enableType="none" invisible="false" containId="false" pageId="edit140CustomsRecordImportPage"/>
 | 
			
		||||
        
 | 
			
		||||
<!--             <popup id="customerModify" title="customerModify" enableType="single" invisible="false" containId="true" pageId="dowithCompanyTocustomerPage"> -->
 | 
			
		||||
<!--                 <enableExpression><![CDATA[${organization.beCompany} == "true"]]></enableExpression> -->
 | 
			
		||||
| 
						 | 
				
			
			@ -31,7 +31,7 @@
 | 
			
		|||
 left join customsRecord.legalSecondUint
 | 
			
		||||
 where 1=1   
 | 
			
		||||
 and customsRecord.noninsuranceTpey='保税'
 | 
			
		||||
 and customsRecord.neworold=0
 | 
			
		||||
 and customsRecord.neworold=77
 | 
			
		||||
 and customsRecord.warehouse = #{SESSION_WAREHOUSE} 
 | 
			
		||||
 /~customsRecord.code: and upper(customsRecord.code) like upper({customsRecord.code})~/
 | 
			
		||||
 /~customsRecord.name: and upper(customsRecord.name) like upper({customsRecord.name})~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,7 +31,7 @@
 | 
			
		|||
 left join customsRecord.legalSecondUint
 | 
			
		||||
 where 1=1   
 | 
			
		||||
 and customsRecord.noninsuranceTpey='保税'
 | 
			
		||||
 and customsRecord.neworold=1
 | 
			
		||||
 and customsRecord.neworold=127
 | 
			
		||||
 and customsRecord.warehouse = #{SESSION_WAREHOUSE} 
 | 
			
		||||
 /~customsRecord.code: and upper(customsRecord.code) like upper({customsRecord.code})~/
 | 
			
		||||
 /~customsRecord.name: and upper(customsRecord.name) like upper({customsRecord.name})~/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -188,6 +188,7 @@
 | 
			
		|||
    <menuItem title="baseMenu" dir="base">
 | 
			
		||||
<!--      <menuItem title="maintainCusPage" pageId="maintainOrganizationPage"/> -->
 | 
			
		||||
     <menuItem title="menu_cuctoms">
 | 
			
		||||
     		<menuItem title="海关备案管理(140)" pageId="maintain140CustomsRecordPage"/>
 | 
			
		||||
     		<menuItem title="海关备案管理(127)" pageId="maintainNewCustomsRecordPage"/>
 | 
			
		||||
     		<menuItem title="海关备案管理(77)" pageId="maintainCustomsRecordPage"/>
 | 
			
		||||
            <menuItem title="maintainNoninsurancePage" pageId="maintainNoninsurancePage"/>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,47 +0,0 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<!DOCTYPE hibernate-mapping PUBLIC 
 | 
			
		||||
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 | 
			
		||||
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 | 
			
		||||
<hibernate-mapping>
 | 
			
		||||
    <class name="com.dev.swms.server.model.customs.CustomsRecord" table="CUSTOMS_RECORD">
 | 
			
		||||
        <id name="id" column="ID" type="long">
 | 
			
		||||
            <generator class="native">
 | 
			
		||||
                <param name="sequence">wms_seq_customs_record</param>
 | 
			
		||||
                <param name="parameters">START WITH 1000</param>
 | 
			
		||||
            </generator>
 | 
			
		||||
        </id>
 | 
			
		||||
        <property name="itemNumber" column="ITEM_NUMBER" type="int" />
 | 
			
		||||
        <property name="hsCode" column="HS_CODE" type="string" length="500"/>
 | 
			
		||||
        <property name="code" column="CODE" type="string" length="50"/>
 | 
			
		||||
        <property name="name" column="NAME" type="string" length="50"/>
 | 
			
		||||
        <property name="specs" column="SPECS" type="string" length="150"/>
 | 
			
		||||
        <property name="description" column="DESCRIPTION" type="string" length="500"/>
 | 
			
		||||
        
 | 
			
		||||
		<property name="disabled" column="DISABLED" type="boolean"/>	
 | 
			
		||||
		<property name="neworold" column="neworold" type="boolean"/>	
 | 
			
		||||
		
 | 
			
		||||
		<many-to-one name="declareUnit" class="com.dev.swms.server.model.base.PackageUnit" >
 | 
			
		||||
       		<column name="DECLARE_UNIT_ID" />
 | 
			
		||||
       	</many-to-one>
 | 
			
		||||
       	
 | 
			
		||||
       	<many-to-one name="legalFirstUint" class="com.dev.swms.server.model.base.PackageUnit" >
 | 
			
		||||
       		<column name="LEGAL_FIRST_UINT_ID" />
 | 
			
		||||
       	</many-to-one>
 | 
			
		||||
       	
 | 
			
		||||
       	<many-to-one name="legalSecondUint" class="com.dev.swms.server.model.base.PackageUnit" >
 | 
			
		||||
       		<column name="LEGAL_SECOND_UINT_ID" />
 | 
			
		||||
       	</many-to-one>
 | 
			
		||||
       	
 | 
			
		||||
       	<many-to-one name="warehouse" class="com.dev.swms.server.model.base.Warehouse" >
 | 
			
		||||
       		<column name="WAREHOUSE_ID" />
 | 
			
		||||
       	</many-to-one>
 | 
			
		||||
       	
 | 
			
		||||
		<component name="updateInfo" class="com.dev.swms.server.model.base.UpdateInfo">
 | 
			
		||||
			<property name="operatorId" column="OPERATOR_ID" type="long" />
 | 
			
		||||
			<property name="operatorName" column="OPERATOR_NAME" type="string" length="20"/>
 | 
			
		||||
			<property name="updateTime" column="UPDATE_TIME" type="timestamp" />
 | 
			
		||||
		</component>
 | 
			
		||||
		<property name="country" column="country" type="string" length="100"/>
 | 
			
		||||
		<property name="noninsuranceTpey" column="noninsurance_Tpey" type="string" length="150"/>
 | 
			
		||||
	</class>
 | 
			
		||||
</hibernate-mapping>
 | 
			
		||||
| 
						 | 
				
			
			@ -1,95 +0,0 @@
 | 
			
		|||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<pages>
 | 
			
		||||
    <editPage id="editItemDetailPage" title="editItemDetailPage" entityClass="com.dev.swms.server.model.base.Item" onClose="refreshParent" width="880" height="210">
 | 
			
		||||
         <inputUIs>				
 | 
			
		||||
                <hidden id="item.id" reserve="true"/>				
 | 
			
		||||
                <remote id="item.bgxx.id" title="item.bgxx" row="1" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" displayColumn="2" displayedTableHead="序号,货号,货品名称,单位">				
 | 
			
		||||
                    <hql><![CDATA[select 
 | 
			
		||||
bgxx.id, 
 | 
			
		||||
bgxx.itemNumber, 
 | 
			
		||||
bgxx.name,
 | 
			
		||||
bgxx.hsCode,
 | 
			
		||||
unit.unit
 | 
			
		||||
from CustomsRecord bgxx	
 | 
			
		||||
left join bgxx.legalFirstUint unit		
 | 
			
		||||
where  
 | 
			
		||||
(upper(bgxx.hsCode) like upper(:param) or upper(bgxx.name) like upper(:param) or bgxx.itemNumber like :param)		
 | 
			
		||||
and bgxx.neworold=1	
 | 
			
		||||
 /~bgxx.name: and bgxx.name like {bgxx.name} ~/				
 | 
			
		||||
 /~bgxx.code: and bgxx.code like {bgxx.code} ~/				
 | 
			
		||||
 ]]></hql>		
 | 
			
		||||
 					<eventListeners>
 | 
			
		||||
<!--                   		<eventListener id="item.name" index="3" refreshUI="false"/> -->
 | 
			
		||||
                  		<eventListener id="item.unit" index="5" refreshUI="false"/>
 | 
			
		||||
                    </eventListeners>		
 | 
			
		||||
               </remote>
 | 
			
		||||
               <text id="item.code" title="item.code" row="1" col="2" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" length="20" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <text id="item.name" title="item.name" row="1" col="3" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <text id="item.specs" title="item.specs" row="1" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <text id="item.itemCode" title="item.itemCode" row="2" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
<!--                <numberText id="item.validPeriod" title="item.validPeriod" defaultValue="0" row="2" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Integer" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <numberText id="item.bearTime" title="item.bearTime" defaultValue="0" row="2" col="3" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100"  returnType="Integer"  trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <numberText id="item.saleTime" title="item.saleTime" defaultValue="0" row="2" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100"  returnType="Integer"   trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
               <numberText id="item.length" title="item.length" row="2" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <numberText id="item.width" title="item.width" row="2" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <numberText id="item.height" title="item.height" row="2" col="4" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <numberText id="item.weight" title="item.weight" row="3" col="1" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <numberText id="item.grossWeight" title="item.grossWeight" row="3" col="2" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
               <numberText id="item.volume" title="item.volume" row="3" col="3" defaultValue="0" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" vreturnType="Double" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
<!--                <text id="item.barcode" title="item.barcode" row="4" col="3" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" length="20" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <text id="packageUnit.unit" title="item.masterUnit" row="4" col="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" length="10" trimSpace="true" isPrecision="true"/> 				 -->
 | 
			
		||||
               <text id="item.unit" title="item.masterUnit" row="3" col="4" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" length="10" trimSpace="true" isPrecision="true"/> 				
 | 
			
		||||
<!--                <text id="item.brand" title="item.brand" row="4" col="4" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
               <text id="item.largeClass" title="item.largeClass" row="4" col="1" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
<!--                <numberText id="item.alertLeadingDays" title="item.alertLeadingDays" defaultValue="0" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" returnType="Integer" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <text id="item.barcode" title="item.barcode" row="5" col="3" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <text id="item.strExtend3" title="item.strExtend3" row="5" col="3" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <text id="item.goodType" title="item.goodType" row="5" col="4" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
<!--                <list id="item.lotRule.id" title="item.lotRule" row="6" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false">			 -->
 | 
			
		||||
<!--                     <hql><![CDATA[SELECT rule.id, rule.name, rule.lotRuleComponent.trackPropD1				 -->
 | 
			
		||||
<!--  FROM LotRule rule ]]></hql>				 -->
 | 
			
		||||
<!--                 </list>				 -->
 | 
			
		||||
<!--                 <list id="item.storageType" title="item.storageType" row="6" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" enumType="StorageType" >				 -->
 | 
			
		||||
<!-- 				<hql><![CDATA[ SELECT t.enumValue, t.enumValue  -->
 | 
			
		||||
<!--  FROM Enumerate t 				 -->
 | 
			
		||||
<!--  WHERE t.enumType = 'StorageType']]></hql>				 -->
 | 
			
		||||
<!-- 				</list>	 -->
 | 
			
		||||
                <text id="item.temperature" title="item.temperature" row="4" col="2" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>		
 | 
			
		||||
                <text id="item.humidity" title="item.humidity" row="4" col="3" span="1"  readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="100" trimSpace="true" isPrecision="true"/>			
 | 
			
		||||
<!--                 <numberText id="item.balanceNumber" title="item.balanceNumber" defaultValue="0" row="6" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false"  returnType="Integer"   trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
                <remote id="item.customsRecord.id" title="非保项号" row="4" col="4" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" displayColumn="2" displayedTableHead="序号,货号,货品名称,单位">				
 | 
			
		||||
                    <hql><![CDATA[select 
 | 
			
		||||
bgxx.id, 
 | 
			
		||||
bgxx.itemNumber, 
 | 
			
		||||
bgxx.name,
 | 
			
		||||
bgxx.hsCode,
 | 
			
		||||
unit.unit
 | 
			
		||||
from CustomsRecord bgxx	
 | 
			
		||||
left join   bgxx.legalFirstUint unit		
 | 
			
		||||
 where  bgxx.noninsuranceTpey='非保' and (upper(bgxx.hsCode) like upper(:param) or upper(bgxx.name) like upper(:param) or bgxx.itemNumber like :param)			
 | 
			
		||||
 /~bgxx.name: and bgxx.name like {bgxx.name} ~/				
 | 
			
		||||
 /~bgxx.code: and bgxx.code like {bgxx.code} ~/				
 | 
			
		||||
 ]]></hql>		
 | 
			
		||||
 						
 | 
			
		||||
               </remote>
 | 
			
		||||
               <text id="item.strExtend1" title="非保编号" row="5" col="1" span="2" width="340" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="255" trimSpace="true" isPrecision="true"/>	
 | 
			
		||||
<!--                 <text id="item.suggest" title="item.suggest" row="5" col="2" span="2" width="340" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="255" trimSpace="true" isPrecision="true"/>				 -->
 | 
			
		||||
                <text id="item.description" title="item.description" row="5" col="2" span="2" width="315" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" length="255" trimSpace="true" isPrecision="true"/>				
 | 
			
		||||
            </inputUIs>		
 | 
			
		||||
        	<buttons>				
 | 
			
		||||
                <commit id="save" title="save" enableType="none">				
 | 
			
		||||
                    <mappings>				
 | 
			
		||||
                        <mapping id="item" className="com.dev.swms.server.model.base.Item"/>				
 | 
			
		||||
                </mappings>				
 | 
			
		||||
                <actions>				
 | 
			
		||||
                	<action managerName="itemManager" methodName="storeItem" parameter="item"/>				
 | 
			
		||||
                </actions>				
 | 
			
		||||
                <forwards>				
 | 
			
		||||
                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>				
 | 
			
		||||
                	<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>				
 | 
			
		||||
            	</forwards>				
 | 
			
		||||
            </commit>				
 | 
			
		||||
    	</buttons>	
 | 
			
		||||
    </editPage>
 | 
			
		||||
</pages>
 | 
			
		||||
		Loading…
	
		Reference in New Issue