添加装箱和不良品的限制

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -790,7 +790,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 
 		//取该SN最新一条记录,校验是否允许回流
-		SqlRowList rs=baseDao.queryForRowSet("select ms_id,ms_makecode,ms_craftcode,ms_prodcode,ms_status,ms_paststep," +
+		SqlRowList rs=baseDao.queryForRowSet("select ms_id,ms_makecode,ms_craftcode,ms_prodcode,ms_status,ms_paststep,ms_outboxcode," +
 				"nvl(ms_isactive,0)ms_isactive,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck," +
 				"nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck " +
 				"from "+Master+".makeserial left join "+Master+".product on pr_code=ms_prodcode " +
@@ -802,6 +802,19 @@ public class MESHelperServiceImpl implements MESHelperService {
 			ms_id=rs.getString("ms_id");
 			ms_makecode=rs.getString("ms_makecode");
 			ms_paststep=rs.getString("ms_paststep")==null?"":rs.getString("ms_paststep");
+			//不良品不允许回流
+			if("3".equals(rs.getString("ms_status"))){
+				oErrMessage = "SN：" + iSN + "为不良品，不允许采集";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
+			//已装箱不允许回流
+			String ms_outboxcode=rs.getString("ms_outboxcode")==null?"":rs.getString("ms_outboxcode");
+			if(!"".equals(ms_outboxcode)){
+				oErrMessage = "SN：" + iSN + "已装箱" + ms_outboxcode + "，不允许采集";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
 			//已执行的工序才允许回流
 			if(!ms_paststep.contains(iStepCode)){
 				oErrMessage = "序列号" + iSN + "不允许回流到未执行工序";