上料接口修改

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

@@ -672,7 +672,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> LoadCraftMaterial(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
-		String oErrMessage="";
+		Object oErrMessage="";
 		String SN=object.get("iSN").toString();
 		String SC_CODE=object.get("iResCode").toString();
 		JSONArray CraftMaterial=object.getJSONArray("Barcode");
@@ -706,6 +706,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				Boolean f = false;
 				String[] pres = rs.getString("sp_prefix").split("\\|");
 				int  sp_length= rs.getInt("sp_length");
+				int  sp_id= rs.getInt("sp_id");
+				String  sp_fsoncode= rs.getString("sp_fsoncode");
 				for (int m=0;m<pres.length;m++){
 					if (CraftMaterial.getJSONObject(i).getString("code").startsWith(pres[m]))
 					{
@@ -714,8 +716,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 						break;
 					}
 				}
-				if (f)
-				{
+				if (f) {
 					//进行长度匹配
 					if (CraftMaterial.getJSONObject(i).getString("code").length() == sp_length || sp_length == 0)
 					{
@@ -727,22 +728,31 @@ public class MESHelperServiceImpl implements MESHelperService {
 						rmap.put("oErrMessage",oErrMessage);
 						return rmap;
 					}
-					}else {
+				}else {
 						oErrMessage = "前缀不匹配";
 						rmap.put("code",-1);
 						rmap.put("oErrMessage",oErrMessage);
 						return rmap;
 					}
-					i=i+1;
-				}
+				baseDao.execute("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode,"+
+						"cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid,cm_status,cm_materialtype,cm_firstsn)"+
+						"select Craftmaterial_seq.nextval, ma_code, ma_id, ma_prodcode,'"+sp_fsoncode+"',ms_code,ms_sncode,mcd_stepcode,"+
+						"mcd_stepname,sp_fsoncode,ms_craftcode,ms_craftname,'"+ CraftMaterial.getJSONObject(i).getString("code")+"',1,sysdate,'" + SC_CODE + "','" + SC_CODE + "',ma_wccode,"+
+						"'"+SC_CODE+"','"+sp_id+"',0,1,ms_firstsn from make left join makecraftdetail on mcd_macode=ma_code  left join stepproduct on sp_stepcode=mcd_stepcode "+
+						" and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code and sp_craftcode=ms_craftcode "+
+						"where ma_code='" + ms_makecode + "'and sp_id='"+sp_id+"' and mcd_stepcode = '" + stepcode+ "' and ms_sncode='" + SN + "'");
+				i=i+1;
+			}
+
+
 		}else {
 				oErrMessage = "没有需要上料的物料";
 				rmap.put("code",-1);
 				rmap.put("oErrMessage",oErrMessage);
 				return rmap;
 		}
-		oErrMessage=SetPcbaData(SN,SC_CODE,"UserName","OK").toString();
-		if(oErrMessage.equals("null")){
+		oErrMessage=SetPcbaData(SN,SC_CODE,"UserName","OK");
+		if(oErrMessage==null){
 			oErrMessage="";
 		}else{
 			rmap.put("code",-1);