【慧眼EIS - 调整用工序编号做岗位资源编号】

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

@@ -89,13 +89,13 @@ public class StepWorkServiceImpl implements StepWorkService {
      */
     private Map<String,Object> checkStep(String macode,String sourcecode,String sncode,String usercode,String stepcode ){
         Map<String,Object> map = new HashMap<>();
-        String code = baseDao.getJdbcTemplate().queryForObject("select max(sc_code) from source where sc_code=? and sc_stepcode=?",
+       /* String code = baseDao.getJdbcTemplate().queryForObject("select max(sc_code) from source where sc_code=? and sc_stepcode=?",
                 String.class,sourcecode,stepcode);
         if(!StringUtil.hasText(code)){
             map.put("success",false);
             map.put("msg","工位："+sourcecode+"+工序："+stepcode+",在系统岗位资源中不存在！");
             return map;
-        }
+        }*/
         List<String> list = new ArrayList<String>();
         /**
          *     v_i_macode  in varchar2 ,
@@ -107,7 +107,7 @@ public class StepWorkServiceImpl implements StepWorkService {
          *     v_o_errmsg out varchar2
          */
         list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
-                macode, sourcecode,sncode,usercode
+                macode, stepcode,sncode,usercode
         }, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
         String msg = list.get(2);
         if(StringUtil.hasText(msg)){
@@ -265,9 +265,9 @@ public class StepWorkServiceImpl implements StepWorkService {
         }*/
         //转号：CS_SNCHANGEANDBURN
         if(StringUtil.hasText(extendSequenceNumber)){
-            snChange(macode,sccode,sncode,extendSequenceNumber.toString(),usercode);
+            snChange(macode,stepcode,sncode,extendSequenceNumber.toString(),usercode);
         }else {
-            stepPassed(macode, sccode, sncode, usercode, "PASS".equals(isok) ? "OK" : "NG");
+            stepPassed(macode, stepcode, sncode, usercode, "PASS".equals(isok) ? "OK" : "NG");
         }
     }