From 086d6304c0110eaf16de11451220766abbe0f95d Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Mon, 31 Mar 2025 10:22:32 +0800
Subject: [PATCH] no message

---
 .../server/service/base/pojo/DefaultImportFileManager.java   | 5 +++++
 .../service/shipping/pojo/DefaultPickTicketManager.java      | 2 +-
 .../config/origen/shipping/maintainHBNZHSPickTicketPage.xml  | 1 +
 .../config/origen/shipping/maintainHBNZHSPickTicketPage.xml  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java
index a36d875..adffd67 100644
--- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java
@@ -331,6 +331,11 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
 			            		   
 			            	   }
 			            	   
+			            	   if(info[0].indexOf("收货方")>=0){
+			            		   continue;
+			            		   
+			            	   }
+			            	   
 			            	   
 			            	   if(info[0].indexOf("备注")>=0){
 			            		   bzh=info[1];
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
index a81a1d2..3bd17f4 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
@@ -4117,7 +4117,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 			HashMap<String,String> code_map=new HashMap<String, String>();
 			HashMap<String,String> code_map_old=new HashMap<String, String>();
 			for (int i = 1; i <sheet.getRows(); i++) {
-				String kh=sheet.getCell(0,i).getContents().trim();// 单据编号
+				String kh=sheet.getCell(0,i).getContents().trim();//
 				String relatedBill1=sheet.getCell(1,i).getContents().trim();// 单据编号
 				String code=sheet.getCell(2,i).getContents().trim();//代码
 				String billtype=sheet.getCell(10,i).getContents().trim();// 单据类型
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
index 3338ead..aafd8b9 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
@@ -231,6 +231,7 @@
             <popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage">
                 <enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
             </popup>
+            <popup id="xinKanImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="xinKanImportPage"/>
            
         </buttons>
     </maintainPage>
diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
index 3338ead..aafd8b9 100644
--- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
+++ b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
@@ -231,6 +231,7 @@
             <popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage">
                 <enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
             </popup>
+            <popup id="xinKanImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="xinKanImportPage"/>
            
         </buttons>
     </maintainPage>