慧眼EIS - 调整工序作业接口，使用工序编号做岗位资源编号传参（即工序编号和岗位资源编码值是一样的）

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

@@ -131,7 +131,7 @@ public class StepWorkServiceImpl implements StepWorkService {
     /**
      * 保存测试数据并且过站
      * @param macode
-     * @param sccode
+     * @param sccode //工位编号
      * @param sncode
      * @param isok
      * @param failureCode
@@ -219,8 +219,8 @@ public class StepWorkServiceImpl implements StepWorkService {
          * insert into STEPTESTDETAIL(SD_ID,SD_SMID,SD_SN,SD_MAKECODE,SD_MACHINECODE,SD_INDATE,SD_CLASS,SD_StandardVALUE,SD_ACTVALUE)
          */
         //插入数据
-        baseDao.execute("insert into STEPTESTMAIN(SM_ID,SM_SN,SM_TSN,SM_MAKECODE,SM_STEPCODE,SM_SCCODE,SM_RESULT,SM_BADCODE,SM_ISINPUT,SM_INDATE，sm_machineCode)" +
-                "select ?,?,?,?,?,?,?,?,?,sysdate,? from dual ",mainid,sncode,extendSequenceNumber,macode,stepcode,sccode,isok,failureCode,isinput,machinecode);
+        baseDao.execute("insert into STEPTESTMAIN(SM_ID,SM_SN,SM_TSN,SM_MAKECODE,SM_STEPCODE,SM_SCCODE,SM_RESULT,SM_BADCODE,SM_ISINPUT,SM_INDATE,sm_machineCode,SM_SOURCETYPE)" +
+                "select ?,?,?,?,?,?,?,?,?,sysdate,?,'EIS' from dual ",mainid,sncode,extendSequenceNumber,macode,stepcode,sccode,isok,failureCode,isinput,machinecode);
         if(sqldata.size()>0){
             baseDao.execute(SqlUtil.getInsertSqlbyList(sqldata,"STEPTESTDETAIL","SD_ID"));
         }
@@ -239,7 +239,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         }else if("PASS".equals(isok) && StringUtil.hasText(failureCode)){ //强制良品也有不良代码的
             baseDao.execute("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status)" +
                     " select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'EIS对接',sysdate,?,?,?,'',?,sp_soncode,-1 from make left join makeserial on ms_makecode=ma_code left join " +
-                    " stepproduct on  sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode=? and ms_makecode=?",stepcode,sccode,failureCode,BgCode,sncode,macode);
+                    " stepproduct on sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode=? and ms_makecode=?",stepcode,sccode,failureCode,BgCode,sncode,macode);
         }
         //不良采集为良品是更新
         if (msstepcode!=null && msstepcode.toString().equals(stepcode) && isok == "PASS") {
@@ -257,9 +257,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");
         }
     }
 
@@ -280,6 +280,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         if(!StringUtil.hasText(sccode)){
             return StepWorkApiResponse.failRsp(400,"工位编码（stationCode）不能为空！");
         }
+        //工序编号做岗位资源使用
         Object stepcode = map.get("routeCode");
         if(!StringUtil.hasText(stepcode)){
             return StepWorkApiResponse.failRsp(400,"工序编号（routeCode）不能为空！");
@@ -309,7 +310,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         }
         String usercode = String.valueOf(request.getSession().getAttribute("usercode"));
         //工序校验
-        Map<String,Object> remap =  checkStep(macode,sccode.toString(),sncode.toString(),usercode);
+        Map<String,Object> remap =  checkStep(macode,stepcode.toString(),sncode.toString(),usercode);
         if(Boolean.valueOf(remap.get("success").toString())){
             //工序保存测试数据并且过站
             saveTestDataAndPassed(remap.get("macode").toString(),stepcode.toString(),sccode.toString(),sncode.toString(),
@@ -341,9 +342,9 @@ public class StepWorkServiceImpl implements StepWorkService {
             return StepWorkApiResponse.failRsp(400, "产品SN（sequenceNumber）不能为空！");
         }
         String usercode = String.valueOf(request.getSession().getAttribute("usercode"));
-        Map<String, Object> remap = checkStep(macode, sccode.toString(), sncode.toString(), usercode);
+        Map<String, Object> remap = checkStep(macode, stepcode.toString(), sncode.toString(), usercode);
         if (Boolean.valueOf(remap.get("success").toString())) {
-            stepPassed(remap.get("macode").toString(), sccode.toString(), sncode.toString(), usercode, "OK");
+            stepPassed(remap.get("macode").toString(), stepcode.toString(), sncode.toString(), usercode, "OK");
             return StepWorkApiResponse.successRsp(200, "【" + sncode + "】产品序列号过站成功!");
         } else {
             return StepWorkApiResponse.failRsp(400, remap.get("msg").toString());