From dc2e3476288ca1b0694d175279eb8f895bb8ced5 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Fri, 28 Feb 2025 13:41:14 +0800
Subject: [PATCH] no message

---
 .../server/model/customs/CustomsRecord.java   | 10 ++
 .../model/customs/customsRecord.hbm.xml       |  1 +
 .../service/customs/CustomsRecordManager.java |  2 +-
 .../pojo/DefaultCustomsRecordManager.java     |  6 +-
 .../config/origen/base/editItemDetailPage.xml |  4 +-
 .../origen/count/bgDetailReportPage.xml       |  7 ++
 .../origen/count/maintainInvoiceBoxPage.xml   |  3 +-
 .../customs/editCustomsRecordImportPage.xml   |  4 +-
 .../origen/customs/editCustomsRecordPage.xml  |  2 +
 .../editNewCustomsRecordImportPage.xml        | 25 +++++
 .../customs/editNewCustomsRecordPage.xml      | 52 ++++++++++
 .../customs/maintainCustomsRecordPage.xml     |  2 +-
 .../customs/maintainNewCustomsRecordPage.xml  | 95 +++++++++++++++++++
 .../classes/config/origen/menuConfig.xml      |  1 +
 .../origen/report/queryBGOrderGWPage.xml      |  3 +-
 .../model/customs/customsRecord.hbm.xml       |  1 +
 .../config/origen/base/editItemDetailPage.xml |  4 +-
 .../origen/count/maintainInvoiceBoxPage.xml   |  3 +-
 .../customs/editCustomsRecordImportPage.xml   |  4 +-
 .../origen/customs/editCustomsRecordPage.xml  |  2 +
 .../customs/maintainCustomsRecordPage.xml     |  2 +-
 .../origen/report/queryBGOrderGWPage.xml      |  3 +-
 22 files changed, 223 insertions(+), 13 deletions(-)
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/count/bgDetailReportPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordImportPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordPage.xml
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/customs/maintainNewCustomsRecordPage.xml

diff --git a/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java b/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java
index d483445..9e38678 100644
--- a/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java
+++ b/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java
@@ -29,7 +29,17 @@ public class CustomsRecord  extends Entity{
 	
 	private Warehouse warehouse;//所属仓库
 	
+	private boolean neworold = false;//是否新旧；0旧备案；1：新备案
 	
+	
+	public boolean isNeworold() {
+		return neworold;
+	}
+
+	public void setNeworold(boolean neworold) {
+		this.neworold = neworold;
+	}
+
 	public String getCountry() {
 		return country;
 	}
diff --git a/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml b/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml
index 6aaaf63..f6ad2c8 100644
--- a/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml
@@ -18,6 +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"/>	
 		
 		<many-to-one name="declareUnit" class="com.dev.swms.server.model.base.PackageUnit" >
        		<column name="DECLARE_UNIT_ID" />
diff --git a/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java b/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java
index f43d262..c7a6543 100644
--- a/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java
+++ b/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java
@@ -33,7 +33,7 @@ public interface CustomsRecordManager extends BaseManager{
 	
 	//海关备案导入
 	@Transactional
-	public void customsRecordImport(File file);
+	public void customsRecordImport(File file,boolean neworold);
 	//非保项号导入
 		@Transactional
 		public void customsNoninsurance(File file);
diff --git a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java
index 2fc4d93..9a8150f 100644
--- a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java
+++ b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java
@@ -118,9 +118,9 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C
 	}
 
 	@Override
-	public void customsRecordImport(File file) {
+	public void customsRecordImport(File file,boolean neworold) {
 		try {
-			//项号   商品编码,HSCODE 	商品品名	申报单位	法定第一计量单位	法定第二计量单位	规格型号   作废
+			//项号   商品编码,HSCODE 	商品品名	申报单位	法定第一计量单位	法定第二计量单位	规格型号   作废 原产国
 			Workbook workbook = Workbook.getWorkbook(file);
 			Sheet sheet = workbook.getSheet(0);
 			 for (int i = 1; i <sheet.getRows(); i++) {
@@ -190,6 +190,7 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C
 					 }
 					 customsRecord.setCountry(ysc);
 					 customsRecord.setNoninsuranceTpey("保税");
+					 customsRecord.setNeworold(neworold);
 					 customsRecord.setWarehouse(WarehouseHolder.getWarehouse());
 					 commonDao.store(customsRecord);
 					 System.out.println("修改"+i+"行!");
@@ -211,6 +212,7 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C
 					 }
 					 customsRecord.setCountry(ysc);
 					 customsRecord.setNoninsuranceTpey("保税");
+					 customsRecord.setNeworold(neworold);
 					 commonDao.store(customsRecord);
 					 System.out.println("新增"+i+"行!");
 				 }
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
index 035f69a..32dca3b 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
@@ -13,7 +13,9 @@ 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)			
+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>		
diff --git a/src/webapp/WEB-INF/classes/config/origen/count/bgDetailReportPage.xml b/src/webapp/WEB-INF/classes/config/origen/count/bgDetailReportPage.xml
new file mode 100644
index 0000000..e757ba8
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/count/bgDetailReportPage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <reportPopupPage id="bgDetailReportPage" title="报关单明细导出" reportFile="jj_bg_detail_report.raq" parameter="id=?" width="850" height="600">
+
+    </reportPopupPage>
+</pages>
\ No newline at end of file
diff --git a/src/webapp/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml b/src/webapp/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
index deb51dd..073b90f 100644
--- a/src/webapp/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
@@ -175,7 +175,8 @@
                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
                 </forwards>
             </commit>
-             <popup id="printBatchPackingList" title="箱单打印(进口)" enableType="single" invisible="false" containId="true" pageId="printBatchPackingList2XPage"/>
+            <popup id="bgDetailReport" title="报关单明细导出" enableType="single" invisible="false" containId="true" pageId="bgDetailReportPage"/>
+            <popup id="printBatchPackingList" title="箱单打印(进口)" enableType="single" invisible="false" containId="true" pageId="printBatchPackingList2XPage"/>
             <popup id="printNoBatchPackingList" title="发票打印(进口)" enableType="single" invisible="false" containId="true" pageId="printNoBatchPackingListPage"/>
             <popup id="outCheckListRegister" title="outCheckListRegister" enableType="single" invisible="false" containId="true" pageId="modifyOutCheckListRegisterPage">
             <enableExpression><![CDATA[(${invoiceBox.extendDate8}!='-')]]></enableExpression>
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
index b6e19da..4e1a92f 100644
--- a/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
@@ -4,14 +4,16 @@
     <editPage id="editCustomsRecordImportPage" title="editCustomsRecordImportPage" 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"/>
         </inputUIs>
         <buttons>
             <commit id="import" title="import" enableType="none" invisible="false">
                 <mappings>
                     <mapping id="importLocation.filePath" className="file"/>
+                    <mapping id="neworold" className="boolean"/>
                 </mappings>
                 <actions>
-                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath"/>
+                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
                 </actions>
                 <forwards>
                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
index 05e1c80..5088656 100644
--- a/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
@@ -30,6 +30,8 @@
             </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"/>
+          
         </inputUIs>
         <buttons>
             <commit id="save" title="save" enableType="none" invisible="false">
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordImportPage.xml
new file mode 100644
index 0000000..ea0f7f8
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordImportPage.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <editPage id="editNewCustomsRecordImportPage" title="海关备案导入(新)" 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"/>
+        </inputUIs>
+        <buttons>
+            <commit id="import" title="import" enableType="none" invisible="false">
+                <mappings>
+                    <mapping id="importLocation.filePath" className="file"/>
+                    <mapping id="neworold" className="boolean"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
+                </actions>
+                <forwards>
+                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
+                    <forward name="closeWindow" newEnabled="true" editEnabled="true"/>
+                </forwards>
+            </commit>
+        </buttons>
+    </editPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordPage.xml
new file mode 100644
index 0000000..37f459a
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/editNewCustomsRecordPage.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <editPage id="editNewCustomsRecordPage" title="海关备案编辑(新)" 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"/>
+            <text id="customsRecord.hsCode" title="customsRecord.hsCode" row="0" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+           <text id="customsRecord.country" title="customsRecord.country" row="0" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+            <text id="customsRecord.code" title="customsRecord.code" row="1" col="1" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+            <text id="customsRecord.name" title="customsRecord.name" row="1" col="2" span="1" readOnly="false" required="true" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+            <text id="customsRecord.specs" title="customsRecord.specs" row="1" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
+            <list id="customsRecord.declareUnit.id" title="customsRecord.declareUnit.unit" row="2" col="1" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true">
+                <hql><![CDATA[SELECT
+ pu.id,
+ pu.unit 
+ FROM PackageUnit pu ]]></hql>
+            </list>
+            <list id="customsRecord.legalFirstUint.id" title="customsRecord.legalFirstUint.unit" row="2" col="2" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true">
+                <hql><![CDATA[SELECT
+ pu.id,
+ pu.unit 
+ FROM PackageUnit pu ]]></hql>
+            </list>
+            <list id="customsRecord.legalSecondUint.id" title="customsRecord.legalSecondUint.unit" row="2" col="3" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true">
+                <hql><![CDATA[SELECT
+ pu.id,
+ pu.unit 
+ FROM PackageUnit pu ]]></hql>
+            </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"/>
+          
+        </inputUIs>
+        <buttons>
+            <commit id="save" title="save" enableType="none" invisible="false">
+                <mappings>
+                    <mapping id="customsRecord" className="com.dev.swms.server.model.customs.CustomsRecord"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsRecordManager" methodName="storeCustomsRecord" parameter="customsRecord"/>
+                </actions>
+                <forwards>
+                    <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
+                    <forward name="resetWindow" newEnabled="true" editEnabled="false"/>
+                    <forward name="closeWindow" newEnabled="false" editEnabled="true"/>
+                </forwards>
+            </commit>
+        </buttons>
+    </editPage>
+</pages>
\ No newline at end of file
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
index 8c94571..725a72b 100644
--- a/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
@@ -30,7 +30,7 @@
  left join customsRecord.legalFirstUint
  left join customsRecord.legalSecondUint
  where 1=1   
- and  customsRecord.noninsuranceTpey='保税'
+ and customsRecord.noninsuranceTpey='保税'
  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})~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/maintainNewCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/maintainNewCustomsRecordPage.xml
new file mode 100644
index 0000000..c8d2632
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/customs/maintainNewCustomsRecordPage.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <maintainPage id="maintainNewCustomsRecordPage" title="海关备案管理(新)" 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"/>
+                <text id="customsRecord.name" title="customsRecord.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+                <text id="customsRecord.hsCode" title="customsRecord.hsCode" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+                <numberText id="customsRecord.itemNumber" title="customsRecord.itemNumber" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" returnType="Integer" inVisible="false" trimSpace="true"/>
+                <text id="customsRecord.country" title="customsRecord.country" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+                <checkbox id="customsRecord.disabled" title="customsRecord.disabled" row="3" col="1" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+            </inputUIs>
+        </search>
+        <datasource type="hql"><![CDATA[SELECT 
+ customsRecord.id,
+ customsRecord.itemNumber,
+ customsRecord.hsCode,
+ customsRecord.code,
+ customsRecord.name,
+ customsRecord.declareUnit.unit,
+ customsRecord.legalFirstUint.unit,
+ customsRecord.legalSecondUint.unit,
+ customsRecord.specs,
+ customsRecord.country,
+ customsRecord.description,
+ customsRecord.disabled
+ from CustomsRecord customsRecord
+ left join customsRecord.declareUnit
+ left join customsRecord.legalFirstUint
+ left join customsRecord.legalSecondUint
+ where 1=1   
+ and customsRecord.noninsuranceTpey='保税'
+ and customsRecord.neworold=1
+ 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})~/
+ /~customsRecord.hsCode: and upper(customsRecord.hsCode) like upper({customsRecord.hsCode})~/
+ /~customsRecord.itemNumber: and customsRecord.itemNumber = {customsRecord.itemNumber} ~/
+ /~customsRecord.country: and upper(customsRecord.country) like upper({customsRecord.country})~/
+ /~customsRecord.disabled: and customsRecord.disabled = {customsRecord.disabled}~/
+	order by customsRecord.itemNumber asc
+		]]></datasource>
+        <columns>
+            <column id="customsRecord.id" title="customsRecord.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.itemNumber" title="customsRecord.itemNumber" visible="true" horizonAlign="center" verticalAlign="middle" format="itemColourFormatter"/>
+            <column id="customsRecord.hsCode" title="customsRecord.hsCode" visible="true" horizonAlign="center" verticalAlign="middle" format="itemColourFormatter"/>
+            <column id="customsRecord.code" title="customsRecord.code" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.name" title="customsRecord.name" visible="true" horizonAlign="center" verticalAlign="middle" format="itemColourFormatter"/>
+            <column id="customsRecord.declareUnit.unit" title="customsRecord.declareUnit.unit" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.legalFirstUint.unit" title="customsRecord.legalFirstUint.unit" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.legalSecondUint.unit" title="customsRecord.legalSecondUint.unit" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.specs" title="customsRecord.specs" visible="true" horizonAlign="center" verticalAlign="middle"/>
+             <column id="customsRecord.country" title="customsRecord.country" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="customsRecord.description" title="customsRecord.description" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"/>
+            <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="editNewCustomsRecordPage"/>
+            <popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editNewCustomsRecordPage"/>
+            <commit id="invalid" title="invalid" enableType="multi" invisible="false" confirmMessage="确认是否失效?">
+                <enableExpression><![CDATA[(${customsRecord.disabled}=='false')]]></enableExpression>
+                <mappings>
+                    <mapping id="ids" className="list"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsRecordManager" methodName="invalidCustomsRecord" parameter="ids"/>
+                </actions>
+                <forwards>
+                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
+                </forwards>
+            </commit>
+            <commit id="recovery" title="recovery" enableType="multi" invisible="false" confirmMessage="确认是否恢复?">
+                <enableExpression><![CDATA[(${customsRecord.disabled}=='true')]]></enableExpression>
+                <mappings>
+                    <mapping id="ids" className="list"/>
+                </mappings>
+                <actions>
+                    <action managerName="customsRecordManager" methodName="recoveryCustomsRecord" parameter="ids"/>
+                </actions>
+                <forwards>
+                    <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
+                </forwards>
+            </commit>
+            <popup id="customsRecordImport" title="海关备案导入(新)" enableType="none" invisible="false" containId="false" pageId="editNewCustomsRecordImportPage"/>
+        
+<!--             <popup id="customerModify" title="customerModify" enableType="single" invisible="false" containId="true" pageId="dowithCompanyTocustomerPage"> -->
+<!--                 <enableExpression><![CDATA[${organization.beCompany} == "true"]]></enableExpression> -->
+<!--             </popup> -->
+<!-- 			<popup id="customerSupplierModify" title="customerSupplierModify" enableType="single" invisible="false" containId="true" pageId="dowithCompanyToSupplierPage"> -->
+<!--                 <enableExpression><![CDATA[${organization.beCompany} == "true"]]></enableExpression> -->
+<!--             </popup> -->
+        </buttons>
+    </maintainPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 3d8564f..059943d 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -188,6 +188,7 @@
     <menuItem title="baseMenu" dir="base">
 <!--      <menuItem title="maintainCusPage" pageId="maintainOrganizationPage"/> -->
      <menuItem title="menu_cuctoms">
+     		<menuItem title="海关备案管理(新)" pageId="maintainNewCustomsRecordPage"/>
      		<menuItem title="maintainCustomsRecordPage" pageId="maintainCustomsRecordPage"/>
             <menuItem title="maintainNoninsurancePage" pageId="maintainNoninsurancePage"/>
      		<menuItem title="maintainJckSfhPage" pageId="maintainJckSfhPage"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml b/src/webapp/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
index d76e686..61bdcfb 100644
--- a/src/webapp/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-    <reportPage id="queryBGOrderGWPage" title="海关订单查询" reportFile="jj_gwxbh.raq" parameter="code,contractNo,itemName,itemNumber,rk1,rk2,warehouse=#{SESSION_WAREHOUSE}">
+    <reportPage id="queryBGOrderGWPage" title="海关订单查询" reportFile="jj_gwxbh.raq" parameter="code,contractNo,itemCode,itemName,itemNumber,rk1,rk2,warehouse=#{SESSION_WAREHOUSE}">
         <inputUIs>
 				<text id="code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 <!--                 <text id="client_name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> -->
@@ -13,6 +13,7 @@
  WHERE c.disabled=0 and c.codeType='业务类型' and c.name in('进口','出口')
  ]]></hql>
                 </list>
+                <text id="itemCode" title="商品料号" row="0" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="itemName" title="中文品名" row="0" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="itemNumber" title="商品备案序号" row="0" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 				<dateRanger id="rk" title="日期" row="0" span="5" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="rk1" toDate="rk2"/>
diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/customs/customsRecord.hbm.xml b/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/customs/customsRecord.hbm.xml
index 6aaaf63..f6ad2c8 100644
--- a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/customs/customsRecord.hbm.xml
+++ b/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/customs/customsRecord.hbm.xml
@@ -18,6 +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"/>	
 		
 		<many-to-one name="declareUnit" class="com.dev.swms.server.model.base.PackageUnit" >
        		<column name="DECLARE_UNIT_ID" />
diff --git a/target/jjwms/WEB-INF/classes/config/origen/base/editItemDetailPage.xml b/target/jjwms/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
index 035f69a..32dca3b 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/base/editItemDetailPage.xml
@@ -13,7 +13,9 @@ 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)			
+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>		
diff --git a/target/jjwms/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml b/target/jjwms/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
index deb51dd..073b90f 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/count/maintainInvoiceBoxPage.xml
@@ -175,7 +175,8 @@
                     <forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
                 </forwards>
             </commit>
-             <popup id="printBatchPackingList" title="箱单打印(进口)" enableType="single" invisible="false" containId="true" pageId="printBatchPackingList2XPage"/>
+            <popup id="bgDetailReport" title="报关单明细导出" enableType="single" invisible="false" containId="true" pageId="bgDetailReportPage"/>
+            <popup id="printBatchPackingList" title="箱单打印(进口)" enableType="single" invisible="false" containId="true" pageId="printBatchPackingList2XPage"/>
             <popup id="printNoBatchPackingList" title="发票打印(进口)" enableType="single" invisible="false" containId="true" pageId="printNoBatchPackingListPage"/>
             <popup id="outCheckListRegister" title="outCheckListRegister" enableType="single" invisible="false" containId="true" pageId="modifyOutCheckListRegisterPage">
             <enableExpression><![CDATA[(${invoiceBox.extendDate8}!='-')]]></enableExpression>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml b/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
index b6e19da..4e1a92f 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml
@@ -4,14 +4,16 @@
     <editPage id="editCustomsRecordImportPage" title="editCustomsRecordImportPage" 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"/>
         </inputUIs>
         <buttons>
             <commit id="import" title="import" enableType="none" invisible="false">
                 <mappings>
                     <mapping id="importLocation.filePath" className="file"/>
+                    <mapping id="neworold" className="boolean"/>
                 </mappings>
                 <actions>
-                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath"/>
+                    <action managerName="customsRecordManager" methodName="customsRecordImport" parameter="importLocation.filePath,neworold"/>
                 </actions>
                 <forwards>
                     <forward name="refreshParent" newEnabled="true" editEnabled="true"/>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml b/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
index 05e1c80..5088656 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml
@@ -30,6 +30,8 @@
             </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"/>
+          
         </inputUIs>
         <buttons>
             <commit id="save" title="save" enableType="none" invisible="false">
diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml b/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
index 8c94571..725a72b 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml
@@ -30,7 +30,7 @@
  left join customsRecord.legalFirstUint
  left join customsRecord.legalSecondUint
  where 1=1   
- and  customsRecord.noninsuranceTpey='保税'
+ and customsRecord.noninsuranceTpey='保税'
  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})~/
diff --git a/target/jjwms/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml b/target/jjwms/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
index d76e686..61bdcfb 100644
--- a/target/jjwms/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
+++ b/target/jjwms/WEB-INF/classes/config/origen/report/queryBGOrderGWPage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <pages>
-    <reportPage id="queryBGOrderGWPage" title="海关订单查询" reportFile="jj_gwxbh.raq" parameter="code,contractNo,itemName,itemNumber,rk1,rk2,warehouse=#{SESSION_WAREHOUSE}">
+    <reportPage id="queryBGOrderGWPage" title="海关订单查询" reportFile="jj_gwxbh.raq" parameter="code,contractNo,itemCode,itemName,itemNumber,rk1,rk2,warehouse=#{SESSION_WAREHOUSE}">
         <inputUIs>
 				<text id="code" title="customsOrder.code" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 <!--                 <text id="client_name" title="customsOrder.client.name" row="0" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> -->
@@ -13,6 +13,7 @@
  WHERE c.disabled=0 and c.codeType='业务类型' and c.name in('进口','出口')
  ]]></hql>
                 </list>
+                <text id="itemCode" title="商品料号" row="0" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="itemName" title="中文品名" row="0" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
                 <text id="itemNumber" title="商品备案序号" row="0" col="4" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
 				<dateRanger id="rk" title="日期" row="0" span="5" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="rk1" toDate="rk2"/>