添加数据接口

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

@@ -1793,6 +1793,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	@Override
 	public Map<Object,Object> getMESSnCode(String data) {
+		String oErrMessage="";
 		Map<String, Object> map=null;
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		try{
@@ -1804,42 +1805,29 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String macode = map.get("moid") == null ? "" : String.valueOf(map.get("moid"));
-		if("".equals(macode)){
-			rmap.put("code",-1);
-			rmap.put("message","工单不能为空");
-			return rmap;
-		}
-		if (!baseDao.checkIf("make","ma_code='"+macode+"'")){
-			rmap.put("code",-1);
-			rmap.put("message","工单【"+macode+"】不存在");
-			return rmap;
-		}
-		if (baseDao.checkIf("make","nvl(ma_statuscode,' ')<>'STARTED' and ma_code='"+macode+"'")){
-			rmap.put("code",-1);
-			rmap.put("message","工单不是已下放状态");
-			return rmap;
-		}
-		if (!baseDao.checkIf("MakeSnList","msl_makecode='"+macode+"'")){
+		String detno = map.get("detno") == null ? "" : String.valueOf(map.get("detno"));
+		String count = map.get("count") == null ? "" : String.valueOf(map.get("count"));
+		if("".equals(macode)||"".equals(detno)){
 			rmap.put("code",-1);
-			rmap.put("message","工单未维护SN");
+			rmap.put("message","单号和序号不能为空");
 			return rmap;
 		}
-		double sncount = map.get("count") == null ? 0 : Double.parseDouble(map.get("count").toString());
-		if(sncount<=0){
-			rmap.put("code",-1);
-			rmap.put("message","SN数量必须大于0");
-			return rmap;
-		}
-		int count = baseDao.getCountByCondition("MakeSnList", "msl_makecode='" + macode + "' and nvl(msl_status,0)=0");
-		if (count<sncount){
+		List<String> list = new ArrayList<String>();
+		list = baseDao.callProcedureWithOut("SP_VERGETBARCODE", new Object[]{
+				String.valueOf(macode),
+				String.valueOf(detno),
+				String.valueOf(count),
+		}, new Integer[]{1, 2, 3}, new Integer[]{4});
+		oErrMessage=list.get(0);
+		if(oErrMessage!=null){
 			rmap.put("code",-1);
-			rmap.put("message","SN不足！");
+			rmap.put("message",oErrMessage);
 			return rmap;
 		}
 		List<String> sqls = new ArrayList<>();
 		List<Map<String, Object>> maps = new ArrayList<>();
 		Map<String, Object> snmap=null;
-		SqlRowList rs = baseDao.queryForRowSet("select msl_sncode,msl_id from (select msl_sncode,msl_id from MakeSnList where msl_makecode='" + macode + "' and nvl(msl_status,0)=0 order by msl_sncode) where rownum<="+sncount +"  order by msl_sncode ");
+		SqlRowList rs = baseDao.queryForRowSet("select msl_sncode,msl_id from (select msl_sncode,msl_id from MakeSnList where msl_makecode='" + macode + "' and msl_detno='"+detno+"' and nvl(msl_status,0)=0 order by msl_sncode) where rownum<="+count +"  order by msl_sncode ");
 		String mainbarcode="";
 		String msl_id="";
 		while (rs.next()){
@@ -1847,18 +1835,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 			snmap.put("serialNo",rs.getGeneralString("msl_sncode"));
 			mainbarcode=rs.getGeneralString("msl_sncode");
 			maps.add(snmap);
-			sqls.add("update MakeSnList set msl_signtime=sysdate,msl_status=-1 where msl_id="+rs.getGeneralInt("msl_id"));
+			baseDao.execute("update MakeSnList set msl_signtime=sysdate,msl_status=-1 where msl_id="+rs.getGeneralInt("msl_id"));
 			msl_id+=rs.getGeneralInt("msl_id")+",";
 		}
-		msl_id+="0";
-		baseDao.execute("update MakeSnList set msl_mainbarcode='"+mainbarcode+"' where msl_id in ("+msl_id+")");
-
-		if (sqls!=null&&sqls.size()>0){
-			baseDao.execute(sqls);
-		}
 		rmap.put("code",0);
 		rmap.put("data",maps);
 		return rmap;
 	}
-
 }