优化

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java

@@ -434,7 +434,7 @@ public class ApiServiceImpl implements IApiService {
     @Override
     public AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param) {
         RequestLog requestLog = requestLogService.getRequestLog(REQUEST_MYDO_JOB_URL, "入库请求补码作业", JSONUtil.toJsonStr(param));
-        if ("0".equals(requestLog.getIsSuccessful())) {
+        if ("1".equals(requestLog.getIsSuccessful())) {
             InterfaceReceive bean = JSONUtil.toBean(requestLog.getResponseBody(), InterfaceReceive.class);
             return AjaxResult.success(bean.getData());
         } else {

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java

@@ -131,7 +131,7 @@ public class RequestLogServiceImpl implements IRequestLogService
             String resStr = HttpUtil.post(url, param);
             requestLog.setResponseBody(resStr);
             InterfaceReceive bean = JSONUtil.toBean(resStr, InterfaceReceive.class);
-            if (bean.getCode() == 0) {
+            if (bean.getCode() == 200) {
                 requestLog.setResponseTime(DateUtil.format(responseTime, "yyyy-MM-dd HH:mm:ss"));
                 requestLog.setResponseStatus("1");
                 requestLog.setDuration(Convert.toStr(DateUtil.between(requestTime, responseTime, DateUnit.MS)));

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java

@@ -166,7 +166,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
                         //根据托盘码请求入库作业
                         HashMap<String, Object> paramMap = new HashMap<>();
                         paramMap.put("trayCode", ssj.getTrayCode());
-                        //paramMap.put("size", ssj.getTraySize());
                         paramMap.put("floor", "1");
                         paramMap.put("entranceId",ssj.getDeviceCode());
                         AjaxResult result = apiService.selectMydoJobByTrayCodeAndEntranceId(paramMap);
@@ -225,7 +224,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
                     }else {
                         //不存在扫不到托盘码的任务
                         HashMap<String, Object> paramMap = new HashMap<>();
-//                        paramMap.put("size", ssj.getTraySize());
                         paramMap.put("entranceId",ssj.getDeviceCode());
                         AjaxResult ajaxResult = apiService.selectMydoJobByNoTrayCode(paramMap);
                         if (ajaxResult.isSuccess()) {

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java

@@ -227,7 +227,6 @@ public class Floor2InOutSsjThread implements Runnable {
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("trayCode",ssjDevice.getTrayCode());
                 map.put("entranceId",ssjDevice.getDeviceCode());
-//                map.put("size", ssjDevice.getTraySize());
                 map.put("floor", "2");
                 AjaxResult ajaxResult = apiService.selectMydoJobByTrayCodeAndEntranceId(map);
                 if(ajaxResult.isSuccess()){
@@ -251,10 +250,7 @@ public class Floor2InOutSsjThread implements Runnable {
                         log.info(ssjDevice.getDeviceCode()+"输送机没取到作业下发输送线" );
                     }
                 }
-
             }
-
-
         }
 
         if(StrUtil.isBlank(ssjDevice.getTrayCode()) && ssjDevice.getRkqq()==1 && ssjDevice.getTaskNo()<1000){
@@ -263,7 +259,6 @@ public class Floor2InOutSsjThread implements Runnable {
             mydoJob1.setInOrOut("1");
             mydoJob1.setEntranceId(ssjDevice.getDeviceCode());
 //            mydoJob1.setStatus("1");
-
             List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob1);
             if(!mydoJobs.isEmpty()){
                 MydoJob mydoJob2 = mydoJobs.get(0);

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2RoadWaySsjThread.java

@@ -77,7 +77,6 @@ public class Floor2RoadWaySsjThread implements Runnable {
                             } catch (RuntimeException e) {
                                 log.error(e.getMessage(),e);
                             }
-
                         }
                         break;
                 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java

@@ -94,7 +94,7 @@ public class LineSsjThread implements Runnable {
         //如果到位，扫到条码，托盘大小，执行阶段卡控一下（下发输送机后改执行阶段）
         if (SsjDevice.getRkqq() == 1 && StrUtil.isNotBlank(SsjDevice.getTrayCode())
                 && SsjDevice.getTraySize() != 0 && SsjDevice.getTaskNo() < 1000) {
-            log.info("设备：{}  位置：{}  条码：{}  托盘大小：{}", SsjDevice.getDeviceCode(), "产线到位", SsjDevice.getTrayCode(), SsjDevice.getTraySize());
+            //log.info("设备：{}  位置：{}  条码：{}  托盘大小：{}", SsjDevice.getDeviceCode(), "产线到位", SsjDevice.getTrayCode(), SsjDevice.getTraySize());
 
             //查作业，入如果已经有了，直接下发输送线
             MydoJob mydoJob = new MydoJob();
@@ -173,7 +173,7 @@ public class LineSsjThread implements Runnable {
         if (SsjDevice.getRkqq() == 1 && StrUtil.isBlank(SsjDevice.getTrayCode()) &&
                 SsjDevice.getTraySize() != 0 && SsjDevice.getTaskNo() < 1000) {
 
-            log.info("设备：{}  位置：{}  条码：{}  托盘大小：{}", SsjDevice.getDeviceCode(), "产线", SsjDevice.getTrayCode(), SsjDevice.getTraySize());
+            //log.info("设备：{}  位置：{}  条码：{}  托盘大小：{}", SsjDevice.getDeviceCode(), "产线", SsjDevice.getTrayCode(), SsjDevice.getTraySize());
             //查wcs有没作业，有下发给输送机任务号，覆盖任务号
             MydoJob mydoJob = new MydoJob();
             mydoJob.setInOrOut("1");