文本优化，部分接口地址修正

2026-04-29 13:32:49 +08:00
parent af7b65f6dd
commit 671a83b493
8 changed files with 29 additions and 24 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
@@ -23,6 +23,7 @@ import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionReceive;
 import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionRequest;
 import com.ruoyi.api.domain.wcs2wms.stockout.StockoutReceive;
 import com.ruoyi.api.service.IApiService;
+import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.port.domain.WcsPort;
 import com.ruoyi.bas.port.service.IWcsPortService;
 import com.ruoyi.common.GoodsType;
@@ -65,7 +66,8 @@ public class ApiServiceImpl implements IApiService {
    private IMydoJobService mydoJobService;
    @Autowired
    private IWcsPortService wcsPortService;
-
+    @Autowired
+    private IBasCargoSpaceService basCargoSpaceService;


    /**
@@ -507,6 +509,9 @@ public class ApiServiceImpl implements IApiService {
        mydoJob.setTaskNo(mydoJobService.getTaskNo("3"));
        mydoJob.setWmsTaskNo(stockoutReceive.getTaskCode());
        mydoJob.setCargoSpaceId(stockoutReceive.getSiteCode());
+        mydoJob.setRoadwayId(
+                basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(stockoutReceive.getSiteCode()).getRoadwayId()
+        );
        mydoJob.setTraySize(GoodsType.TYPE_DEFAULT);//默认
        mydoJob.setExitId(CONV_STOCKOUT);
        mydoJob.setInOrOut("2");
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdj1Read.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdj1Read.java
@@ -72,9 +72,9 @@ public class PlcDdj1Read extends Thread {
            msgDdj.setYxxf(ParseUtil.optInt(24, ddsx));
            msgDdj.setXtxh(ParseUtil.optInt(26, ddsx));

-            msgDdj.setCurrentRow(ParseUtil.optInt(18, ddsx));
-            msgDdj.setCurrentColumn(ParseUtil.optInt(18, ddsx));
-            msgDdj.setCurrentFloor(ParseUtil.optInt(18, ddsx));
+            msgDdj.setCurrentRow(ParseUtil.optInt(12, ddsx));
+            msgDdj.setCurrentColumn(ParseUtil.optInt(14, ddsx));
+            msgDdj.setCurrentFloor(ParseUtil.optInt(16, ddsx));
        }
    }

--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
@@ -110,7 +110,7 @@ public class PlcSsjRead implements Runnable {
            ssjDevice.setRkqq(ParseUtil.optInt(10, ddsx1));
            ssjDevice.setHeight(ParseUtil.optInt(12, ddsx1));
            ssjDevice.setTraySize(ParseUtil.optInt(12, ddsx1)); //此处不修改device_ssj表，把托盘尺寸值当作高度使用
-            ssjDevice.setTrayCode(ParseUtil.optString(14, ddsx1));
+            ssjDevice.setTrayCode(ParseUtil.optString(14, ddsx1).replaceAll("\\s", ""));
            ssjDevice.setMode(ParseUtil.optInt(24, ddsx1));//todo 输送机操作模式
            ssjDevice.setException(ParseUtil.optInt(28, ddsx1));
        }
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/ParseUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/ParseUtil.java
@@ -46,7 +46,7 @@ public class ParseUtil {
     */

    public static String optString(int start, String data) {
-        byte[] bytes = SoftBasic.HexStringToBytes(data.substring(start * 2, (start + 10) * 2));
+        byte[] bytes = SoftBasic.HexStringToBytes(data.substring(start * 2, (start + 7) * 2));
        return Tools.bytetostringtool(bytes);
    }

--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java
@@ -123,7 +123,7 @@ public class DdjThread implements Runnable {
                mydoJobService.updateMydoJob(mydoJob);
                //回传完成信号 - 方法在存储过程【proc_mydojob_finish】中
                ddjTaskFinish(rwh, ddj.getId());
-                log.info("【堆垛机入库】堆垛机："+ddj.getId()+"任务完成，任务号："+ddj.getRwh());
+                log.info("【堆垛机入库】堆垛机编号：" + ddj.getId() + " 执行完成，任务结束，任务号："+ddj.getRwh());
            }
        }

@@ -318,9 +318,9 @@ public class DdjThread implements Runnable {
                    ddjDeviceExecutionQueue.setXfsj(DateUtil.formatDateTime(DateUtil.date()));
                    ddjDeviceExecutionQueue.setDdjxf("1");
                    ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
-                    log.info("【执行成功】堆垛机下发任务成功 rwh:{}", ddjDeviceExecutionQueue.getRwh());
+                    log.info("【堆垛机入库】下发任务成功，任务执行中, 任务号:{}", ddjDeviceExecutionQueue.getRwh());
                } else {
-                    log.error("【执行异常】堆垛机下发任务失败！！！！！！！");
+                    log.error("【堆垛机入库】执行异常, 堆垛机下发任务失败！");
                }
            }
        }
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
@@ -155,10 +155,10 @@ public class PortConvThread implements Runnable {
    private void requestMydoJob(DeviceSsj inSsjDevice){

        //请求成功已经生成该任务则不继续执行
-        boolean isEmpty = mydoJobService.selectInOrOutMydoJobList(
+        int count = mydoJobService.selectInOrOutMydoJobList(
                new MydoJob().builder().trayCode(inSsjDevice.getTrayCode()).build()
-        ).isEmpty();
-        if (!isEmpty) return;
+        ).size();
+        if (count > 0) return;

        String errorMessage = "";

@@ -168,7 +168,7 @@ public class PortConvThread implements Runnable {
        HashMap<String, Object> paramMap = new HashMap<>();
        paramMap.put("taskTypeCode", WMS_TASK_TYPE_STOCKIN);//wms自定义的任务类型编号
        paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
-        paramMap.put("cntCode", inSsjDevice.getTrayCode());//容器编号
+        paramMap.put("cntCode", inSsjDevice.getTrayCode().trim());//容器编号
        int height = inSsjDevice.getHeight();
 //        String weight = inSsjDevice.getWeight();//不需要直读重量或从plc读值，wms不需要该参数
 //        paramMap.put("weight", getWeightByMoxa(MOXA_IP, MOXA_PORT, SO_TIMEOUT_MS));//重量
@@ -262,7 +262,7 @@ public class PortConvThread implements Runnable {
                mydoJobStockin.setStatus(TASK_STATUS_RUNNING);
                mydoJobStockin.setExecutionPhase(TASK_EP_SSJ);
                mydoJobService.updateMydoJob(mydoJobStockin);
-                log.info("【更新状态】G1004入口输送机下发任务号成功:{}", mydoJobStockin.getTaskNo());
+                log.info("【更新状态】G1004入口输送机下发成功,任务号:{},入库执行中", mydoJobStockin.getTaskNo());
            }
        }

--- a/ruoyi-ui/src/api/device/ddj.js
+++ b/ruoyi-ui/src/api/device/ddj.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询堆垛机监控列表
 export function listDdj(query) {
  return request({
-    url: '/device/ddj/list',
+    url: '/device/stacker/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listDdj(query) {
 // 查询堆垛机监控详细
 export function getDdj(id) {
  return request({
-    url: '/device/ddj/' + id,
+    url: '/device/stacker/' + id,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getDdj(id) {
 // 新增堆垛机监控
 export function addDdj(data) {
  return request({
-    url: '/device/ddj',
+    url: '/device/stacker',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addDdj(data) {
 // 修改堆垛机监控
 export function updateDdj(data) {
  return request({
-    url: '/device/ddj',
+    url: '/device/stacker',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateDdj(data) {
 // 删除堆垛机监控
 export function delDdj(id) {
  return request({
-    url: '/device/ddj/' + id,
+    url: '/device/stacker/' + id,
    method: 'delete'
  })
 }
--- a/ruoyi-ui/src/api/device/ssj.js
+++ b/ruoyi-ui/src/api/device/ssj.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询输送机列表
 export function listSsj(query) {
  return request({
-    url: '/device/ssj/list',
+    url: '/device/conv/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listSsj(query) {
 // 查询输送机详细
 export function getSsj(id) {
  return request({
-    url: '/device/ssj/' + id,
+    url: '/device/conv/' + id,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getSsj(id) {
 // 新增输送机
 export function addSsj(data) {
  return request({
-    url: '/device/ssj',
+    url: '/device/conv',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addSsj(data) {
 // 修改输送机
 export function updateSsj(data) {
  return request({
-    url: '/device/ssj',
+    url: '/device/conv',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@ export function updateSsj(data) {
 // 删除输送机
 export function delSsj(id) {
  return request({
-    url: '/device/ssj/' + id,
+    url: '/device/conv/' + id,
    method: 'delete'
  })
 }