调整记录信息，添加过站处理

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

@@ -121,8 +121,8 @@ public class StepWorkServiceImpl implements StepWorkService {
                         String duration = Objects.toString(testDataMap.get("duration"),"");
                         String description = Objects.toString(testDataMap.get("description"),"");
 
-                        if(!baseDao.checkIf("prodtestparam,make","pp_prodcode=ma_prodcode AND ma_code='"+WO+"' AND pp_stepname='"+testName+"' AND pp_testitem='"+testItem+"'")){
-                            return new StepWorkApiResult(false,500,"工单:"+WO+"测试参数列表,测试项目中参数名称无"+ testItem);
+                        if(!baseDao.checkIf("prodtestparam,make","pp_prodcode=ma_prodcode AND ma_code='"+WO+"' AND pp_stepcode='"+routeCode+"' AND pp_paramname='"+paramName+"'")){
+                            return new StepWorkApiResult(false,500,"工单:"+WO+"测试参数列表,测试项目中参数名称无"+ paramName);
                         }
 
                         String sql = "INSERT INTO steptestdatadet( sdd_id, sdd_detno, sdd_sdid, sdd_sncode, sdd_makecode, " +
@@ -132,18 +132,27 @@ public class StepWorkServiceImpl implements StepWorkService {
                                 "'"+description+"', pp_testitem, pp_menxdesc, '"+result+"', pp_paramname, " +
                                 "pp_testtimes, '"+actualValue+"', pp_okmin, pp_okmax " +
                                 "FROM prodtestparam, make WHERE pp_prodcode = ma_prodcode " +
-                                "AND ma_code = '"+WO+"' AND pp_stepname = '吞吐量测试' AND pp_testitem = '"+testItem+"'";
+                                "AND ma_code = '"+WO+"' AND pp_stepcode = '"+routeCode+"' AND pp_paramname = '"+paramName+"'";
                         baseDao.execute(sql);
                     }
                 }
 
-                baseDao.execute("INSERT INTO steptestdata(sd_id, sd_sn, sd_makecode, sd_stepcode, " +
-                        "sd_sccode, sd_result, sd_indate, sd_recorddate) " +
+                baseDao.execute("INSERT INTO steptestdata(sd_id, sd_sn, sd_makecode, sd_sccode, " +
+                        "sd_stepcode, sd_result, sd_indate, sd_recorddate) " +
                         "SELECT "+sdId+", '"+SN+"', '"+WO+"', sc_stepcode, " +
                         "'"+routeCode+"', '"+eventResult+"', sysdate, sysdate FROM source WHERE sc_code = '"+stationCode+"'");
+            }
 
-
+            List<String> list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+                    WO, stationCode,SN,""
+            }, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
+            String msg = list.get(2);
+            if(!msg.isEmpty()){
+                return new StepWorkApiResult(false,500,"过站前核对失败:"+msg);
             }
+
+            stepPassed(WO, stationCode, SN, "", "OK");
+
         }catch (Exception ex){
             return new StepWorkApiResult(false,500,"记录失败:" + ex.getMessage());
         }