diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
index ed0c7cc..1fa35bb 100644
--- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
+++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
@@ -40,6 +40,7 @@ import com.dev.swms.server.model.base.Store;
 import com.dev.swms.server.model.base.Structure;
 import com.dev.swms.server.model.base.TransSite;
 import com.dev.swms.server.model.base.Worker;
+import com.dev.swms.server.model.count.CommonCode;
 import com.dev.swms.server.model.inventory.Inventory;
 import com.dev.swms.server.model.inventory.InventoryLog;
 import com.dev.swms.server.model.inventory.InventoryLogType;
@@ -1094,7 +1095,15 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				 String loc_Code=sheet.getCell(6,i).getContents().trim();//
 				 String relatedBill1=sheet.getCell(7,i).getContents().trim();//入库通知单编号
 				 String PO=sheet.getCell(8,i).getContents().trim();//到货日期
+				 String qualityStatus=sheet.getCell(9,i).getContents().trim();//质量状态
 				 
+			
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {qualityStatus});
+				 if(CommonCodes.isEmpty()){
+					 throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				
 				 Structure company=null;
 				 List<Structure> Structures =  commonDao.findByQuery(" from Structure s where upper(s.name)=upper(:name) and s.warehouse.id="+WarehouseHolder.getWarehouse().getId()+"  ",
 				 new String[] { "name"},new Object[] {hz});
@@ -2055,6 +2064,13 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				String propC1=sheet.getCell(5,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(6,i).getContents().trim();//库位
 				String store=sheet.getCell(7,i).getContents().trim();//门店地址
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
+				
 				
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ",
 				 new String[] { "code"},new Object[] {code});
@@ -2315,6 +2331,12 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				String propC1=sheet.getCell(5,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(6,i).getContents().trim();//库位
 				String store=sheet.getCell(7,i).getContents().trim();//门店地址
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
 				
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=13 ",
 				 new String[] { "code"},new Object[] {code});
@@ -2574,6 +2596,12 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				String propC1=sheet.getCell(5,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(6,i).getContents().trim();//库位
 				String store=sheet.getCell(7,i).getContents().trim();//门店地址
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
 				
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=5 ",
 				 new String[] { "code"},new Object[] {code});
@@ -2840,6 +2868,12 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				String propC1=sheet.getCell(6,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(7,i).getContents().trim();//库位
 				String store=sheet.getCell(8,i).getContents().trim();//门店地址
+				String zldj=sheet.getCell(5,i).getContents().trim();//质量等级
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
 				
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ",
 				 new String[] { "code"},new Object[] {code});
@@ -3125,6 +3159,12 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				}
 				String propC1=sheet.getCell(5,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(6,i).getContents().trim();//库位
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
 				
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=2 ",
 				 new String[] { "code"},new Object[] {code});
@@ -3335,6 +3375,14 @@ public class DefaultASNManager extends DefaultBaseManager implements
 				String propC1=sheet.getCell(6,i).getContents().trim();//到货日期
 				String loc_Code=sheet.getCell(7,i).getContents().trim();//库位
 				
+				String zldj=sheet.getCell(5,i).getContents().trim();//质量等级
+				
+				List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				new String[] { "name"},new Object[] {zldj});
+				if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
+				
 				//客户
 				Structure structure=null;
 				List<Structure> Structures =  commonDao.findByQuery(" from Structure s where s.code='"+kh+"' ");
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 edb0943..563e62d 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
@@ -57,6 +57,7 @@ import com.dev.swms.server.model.base.PackageUnit;
 import com.dev.swms.server.model.base.TransSite;
 import com.dev.swms.server.model.base.Warehouse;
 import com.dev.swms.server.model.base.Worker;
+import com.dev.swms.server.model.count.CommonCode;
 import com.dev.swms.server.model.inventory.Inventory;
 import com.dev.swms.server.model.inventory.ItemKeyInventory;
 import com.dev.swms.server.model.inventory.Stock;
@@ -2596,7 +2597,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 			 }
 			 String oldCode="";
 			 PickTicket pt =null;
-			 for (int i = 1; i <sheet.getRows(); i++) {
+			 for (int i = 269; i <sheet.getRows(); i++) {
 				 int j=0;
 				    // 客户编号 发货单编号	来源单号	合同编号	单据类型	门店编号	门店名称	导购	仓库	出库日期	约定发货日期	收货人姓名	收货人联系方式	
 					//省	市	区	详细地址	质量状态	物料编号	物料描述	物料类型	规格	特殊工艺编号	特殊工艺描述	订单数量	零售单价	折扣	成交单价	
@@ -2644,6 +2645,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				String tbz=sheet.getCell(j++,i).getContents().trim();//头备注
 				String billtype=sheet.getCell(j++,i).getContents().trim();// 单据类型
 				
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zlstatus});
+				 if(CommonCodes.isEmpty()){
+						throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				
 				Structure company=null;
 				List<Structure> sts =  commonDao.findByQuery(" from Structure s where s.code=:cus_code and s.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						new String[] { "cus_code"},new Object[] {cus_code});
@@ -2841,6 +2848,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				if(BillTypes.size()>0){
 					billType=BillTypes.get(0);
 				}
+				
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zlstatus});
+				 if(CommonCodes.isEmpty()){
+					 throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
 				List<PickTicket> pts=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ",
 						new String[]{"relatedBill1"},new Object[]{relatedBill1});
 				if(pts.size()>0){
@@ -3026,6 +3039,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				if(BillTypes.size()>0){
 					billType=BillTypes.get(0);
 				}
+				
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zlstatus});
+				 if(CommonCodes.isEmpty()){
+					 throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
 				List<PickTicket> pts=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ",
 						new String[]{"relatedBill1"},new Object[]{relatedBill1});
 				if(pts.size()>0){
@@ -3509,6 +3528,14 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 					 }
 				 }
 				 
+				 String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
+				 
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zldj});
+				 if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				}
+				 
 				 if(!code_map_old.containsKey(relatedBill1)){
 						List<PickTicket> PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ",
 						new String[]{"relatedBill1"},new Object[]{relatedBill1});
@@ -3681,6 +3708,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				String relatedBill1=sheet.getCell(0,i).getContents().trim();// 单据编号
 				String code=sheet.getCell(1,i).getContents().trim();//代码
 				String billtype=sheet.getCell(9,i).getContents().trim();// 单据类型
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
 				if(code==null||code.equals("")){
 					break;
 				}
@@ -3705,6 +3733,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 					 }
 				 }
 				 
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zldj});
+				 if(CommonCodes.isEmpty()){
+					 throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				 
 				 if(!code_map_old.containsKey(relatedBill1)){
 						List<PickTicket> PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ",
 						new String[]{"relatedBill1"},new Object[]{relatedBill1});
@@ -3877,6 +3911,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				String relatedBill1=sheet.getCell(0,i).getContents().trim();// 单据编号
 				String code=sheet.getCell(1,i).getContents().trim();//代码
 				String billtype=sheet.getCell(9,i).getContents().trim();// 单据类型
+				String zldj=sheet.getCell(4,i).getContents().trim();//质量等级
 				if(code==null||code.equals("")){
 					break;
 				}
@@ -3902,6 +3937,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 					 }
 				 }
 				 
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zldj});
+				 if(CommonCodes.isEmpty()){
+						throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				 
 				 if(!code_map_old.containsKey(relatedBill1)){
 						List<PickTicket> PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ",
 						new String[]{"relatedBill1"},new Object[]{relatedBill1});
@@ -4075,6 +4116,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				String relatedBill1=sheet.getCell(1,i).getContents().trim();// 单据编号
 				String code=sheet.getCell(2,i).getContents().trim();//代码
 				String billtype=sheet.getCell(10,i).getContents().trim();// 单据类型
+				String zldj=sheet.getCell(5,i).getContents().trim();//质量等级
 				if(kh==null||kh.equals("")){
 					break;
 				}
@@ -4092,6 +4134,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 					 throw new BusinessException(billtype+"单据类型不存在!");
 				}
 				
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zldj});
+				 if(CommonCodes.isEmpty()){
+					 throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				
 				String store=sheet.getCell(8,i).getContents().trim();//门店
 				 List<Item> Items =  commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ",
 				 new String[] { "code"},new Object[] {code});
@@ -4152,6 +4200,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 				 		continue;//如果已存在的单号，不需要读取了
 				 }
 				 
+				 List<CommonCode> CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ",
+				 new String[] { "name"},new Object[] {zldj});
+				 if(CommonCodes.isEmpty()){
+					throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!");
+				 }
+				 
 				//单据类型
 				BillType billType=null;
 				List<BillType> BillTypes =  commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' ");
diff --git a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.class b/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.class
deleted file mode 100644
index b8b3ec4..0000000
Binary files a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.class and /dev/null differ
diff --git a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.class b/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.class
deleted file mode 100644
index a9939a4..0000000
Binary files a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.class and /dev/null differ