导入

mmpac/mmpac/src/private/u8c/bs/mmpac/bp/SpecialDataRule.java

@@ -73,7 +73,9 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
 					orderInVO.setBdef6(result.toString());
 				}else {
 					if(orderInVO.getNastnum() != null) {
-						throw new BusinessException("存货:"+orderInVO.getCmaterialcode()+"没有辅计量单位，辅数量不能输入");
+						//存货不管启没启动辅单位，辅数量都会填,没有启动的就不读取辅数量
+						orderInVO.setNastnum(null);
+						//throw new BusinessException("存货:"+orderInVO.getCmaterialcode()+"没有辅计量单位，辅数量不能输入");
 					}
 				}
 				disposeDefdoc("YS（颜色）", orderInVO.getColor());

xc/cg/src/private/u8c/bs/mytest/bp/SpecialDataRule.java

@@ -65,7 +65,9 @@ public class SpecialDataRule implements IRule<AggDemandVO> {
 					demandBVO.setVdef13(result.toString());
 				}else {
 					if(demandBVO.getNastnum() != null) {
-						throw new BusinessException("存货:"+demandBVO.getCmaterialcode()+"没有辅计量单位，辅数量不能输入");
+						//存货不管启没启动辅单位，辅数量都会填,没有启动的就不读取辅数量
+						demandBVO.setNastnum(null);
+						//throw new BusinessException("存货:"+demandBVO.getCmaterialcode()+"没有辅计量单位，辅数量不能输入");
 					}
 				}
 				disposeDefdoc("YS（颜色）", demandBVO.getColor());

xc/stock/src/private/u8c/bs/stock/bp/ValidateRule.java

@@ -69,6 +69,8 @@ public class ValidateRule implements IRule<SafetystockVO> {
 					throw new BusinessException("存货档案：" + safetystockVO.getCmaterialcode() + "启用了标准,标准不允许为空");
 				}
 			}
+			
+			getSafetystock(safetystockVO.getCmaterialcode(), safetystockVO.getColor(), safetystockVO.getSizing(), safetystockVO.getAlloy(), safetystockVO.getStandard());
 		}
 	}
 
@@ -78,5 +80,37 @@ public class ValidateRule implements IRule<SafetystockVO> {
 		String sql = "select free1,free2,free3,free4 from bd_invbasdoc where pk_invbasdoc  = (select pk_invbasdoc from bd_invmandoc where pk_invmandoc='"+cmaterialcode+"') and dr = 0";
 		return (Map<String, String>) iuap.executeQuery(sql.toString(), new MapProcessor());
 	}
+	
+	//判断是否重复导入
+	public void getSafetystock(String cmaterialcode,String color,String sizing,String alloy,String standard) throws BusinessException {
+		StringBuffer sql = new StringBuffer();
+		sql.append(" select pk_safetystock from ic_safetystock");
+		sql.append(" where");
+		sql.append(" cmaterialcode = '"+cmaterialcode+"'");
+		if(color != null) {
+			sql.append(" and color = '"+color+"'");
+		}else {
+			sql.append(" and color is null");
+		}
+		if(sizing != null) {
+			sql.append(" and sizing = '"+sizing+"'");
+		}else {
+			sql.append(" and sizing is null");
+		}
+		if(alloy != null) {
+			sql.append(" and alloy = '"+alloy+"'");
+		}else {
+			sql.append(" and alloy is null");
+		}
+		if(standard != null) {
+			sql.append(" and standard = '"+standard+"'");
+		}else {
+			sql.append(" and standard is null");
+		}
+		String pk_safetystock = (String) iuap.executeQuery(sql.toString(), new ColumnProcessor());
+ 		if(pk_safetystock != null) {
+			throw new BusinessException("重复导入!");
+		}
+	}
 
 }