慧眼EIS - 调整账套名称-引入正式，调整校验岗位资源（工序)+工位组合必须存在

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

@@ -87,7 +87,15 @@ public class StepWorkServiceImpl implements StepWorkService {
      * 工单绑定，工序检测
      *
      */
-    private Map<String,Object> checkStep(String macode,String sourcecode,String sncode,String usercode ){
+    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.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 ,
@@ -101,7 +109,6 @@ public class StepWorkServiceImpl implements StepWorkService {
         list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
                 macode, sourcecode,sncode,usercode
         }, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
-        Map<String,Object> map = new HashMap<>();
         String msg = list.get(2);
         if(StringUtil.hasText(msg)){
             map.put("success",false);
@@ -258,9 +265,9 @@ public class StepWorkServiceImpl implements StepWorkService {
         }*/
         //转号：CS_SNCHANGEANDBURN
         if(StringUtil.hasText(extendSequenceNumber)){
-            snChange(macode,stepcode,sncode,extendSequenceNumber.toString(),usercode);
+            snChange(macode,sccode,sncode,extendSequenceNumber.toString(),usercode);
         }else {
-            stepPassed(macode, stepcode, sncode, usercode, "PASS".equals(isok) ? "OK" : "NG");
+            stepPassed(macode, sccode, sncode, usercode, "PASS".equals(isok) ? "OK" : "NG");
         }
     }
 
@@ -281,7 +288,6 @@ 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）不能为空！");
@@ -311,7 +317,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         }
         String usercode = String.valueOf(request.getSession().getAttribute("usercode"));
         //工序校验
-        Map<String,Object> remap =  checkStep(macode,stepcode.toString(),sncode.toString(),usercode);
+        Map<String,Object> remap =  checkStep(macode,sccode.toString(),sncode.toString(),usercode,stepcode.toString());
         if(Boolean.valueOf(remap.get("success").toString())){
             //工序保存测试数据并且过站
             //刚采集过当前工序，不允许再次采集
@@ -348,7 +354,7 @@ 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, stepcode.toString(), sncode.toString(), usercode);
+        Map<String, Object> remap = checkStep(macode, sccode.toString(), sncode.toString(), usercode,stepcode.toString());
         if (Boolean.valueOf(remap.get("success").toString())) {
             //刚采集过当前工序，不允许再次采集
             String mscode = baseDao.getJdbcTemplate().queryForObject("select  wm_concat(ms_sncode) from makeserial where ms_id=? and ms_stepcode=?",String.class,remap.get("msid"),stepcode.toString());

src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: N_MES
+        username: N_MES_ZS
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1