运行调整

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

@@ -505,7 +505,8 @@ public class ApiWcsService implements IApiWcsService {
                 /*-----------------推送wcs移库任务----------------- */
                 HashMap<String, Object> paramMap = new HashMap<>();
                 paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
-                paramMap.put("jobId", moveJob.getJobId());//容器编号
+                paramMap.put("jobId", moveJob.getJobId());//作业号
+                paramMap.put("taskNo", moveJob.getTaskNo());//任务号
                 paramMap.put("trayCode", moveJob.getTrayCode().trim());//容器编号
                 paramMap.put("cargoSpaceId", moveJob.getCargoSpaceId());//货位
                 paramMap.put("targetCargoSpaceId", moveJob.getTargetCargoSpaceId());//目标货位

ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java

@@ -509,7 +509,8 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                     /*-----------------推送wcs移库任务----------------- */
                     HashMap<String, Object> paramMap = new HashMap<>();
                     paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
-                    paramMap.put("jobId", moveJob.getJobId());//容器编号
+                    paramMap.put("jobId", moveJob.getJobId());//作业号
+                    paramMap.put("taskNo", moveJob.getTaskNo());//任务号
                     paramMap.put("trayCode", moveJob.getTrayCode().trim());//容器编号
                     paramMap.put("cargoSpaceId", moveJob.getCargoSpaceId());//货位
                     paramMap.put("targetCargoSpaceId", moveJob.getTargetCargoSpaceId());//目标货位

ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java

@@ -551,6 +551,13 @@ public class PdaServiceImpl implements IPdaService {
     @Override
     public AjaxResult addEmptyTrayJob(AddInJobRequest request) {
 
+        String trayCode = request.getTrayCode();
+
+        if (StrUtil.isBlank(trayCode)){
+            log.warn("【空托入库】绑定失败，条码不能为空，执行绑定的托盘号:{}", request.getTrayCode());
+            return AjaxResult.error("条码不能为空，执行绑定的托盘号:" + request.getTrayCode());
+        }
+
         //查托盘是否已经执行绑定操作 - 扫码处再次校验后入库
         List<InTrayMsg> msg = inTrayMsgService.selectInTrayMsgList(
                 new InTrayMsg().builder().trayCode(request.getTrayCode()).build()
@@ -560,6 +567,21 @@ public class PdaServiceImpl implements IPdaService {
             return AjaxResult.error("该空托盘已经执行过绑定操作，托盘号:" + request.getTrayCode());
         }
 
+        //检查入库绑定时该托盘是否有未完成的任务
+        MydoJob mydoJobExist = mydoJobService.selectMydoJobByTrayCode(trayCode);
+        if (ObjUtil.isNotNull(mydoJobExist)){
+            log.warn("【入库绑定失败】当前条码有未结束的任务，无法执行绑定操作，请检查该托盘的任务状态，条码:{}", trayCode);
+            return AjaxResult.error("【入库绑定失败】当前条码有未结束的任务，无法执行绑定操作，请检查该托盘的任务状态，当前条码:" + trayCode);
+        }
+
+        List<BasCargoSpace> cargoExist = basCargoSpaceService.selectBasCargoSpaceList(
+                new BasCargoSpace().builder().trayCode(trayCode).build()
+        );
+        if (!cargoExist.isEmpty()){
+            log.warn("【入库绑定失败】存在当前条码的货位信息，无法执行绑定操作，请检查该托盘的任务状态，条码:{}", trayCode);
+            return AjaxResult.error("【入库绑定失败】存在当前条码的货位信息，无法执行绑定操作，请检查该托盘的任务状态，当前条码:" + trayCode);
+        }
+
         int trayType = mydoJobService.getTrayTypeByTrayCode(request.getTrayCode());
 
         inTrayMsgService.insertInTrayMsg(
@@ -576,6 +598,8 @@ public class PdaServiceImpl implements IPdaService {
                         .build()
         );
 
+        log.info("【绑定信息】<空托入库>操作成功，生成绑定信息，托盘号:{}，物料名称:{}", request.getTrayCode(), "空托盘");
+
         return AjaxResult.success();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/RequestWcsHandler.java

@@ -154,16 +154,17 @@ public class RequestWcsHandler {
 
         if (mydoJobs.isEmpty()) return;
 
-        List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
-                new MydoJob().builder()
-                        .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
-                        .build()
-        );
-
-        if (!moveJobs.isEmpty()) return;
-
         for (MydoJob mydoJob : mydoJobs) {
 
+            List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
+                    new MydoJob().builder()
+                            .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
+                            .roadwayId(mydoJob.getRoadwayId())
+                            .build()
+            );
+
+            if (!moveJobs.isEmpty()) return;
+
             //初始化参数
             HashMap<String, Object> paramMap = new HashMap<>();
             paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
@@ -212,16 +213,17 @@ public class RequestWcsHandler {
 
         if (mydoJobs.isEmpty()) return;
 
-        List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
-                new MydoJob().builder()
-                        .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
-                        .build()
-        );
-
-        if (!moveJobs.isEmpty()) return;
-
         for (MydoJob mydoJob : mydoJobs) {
 
+            List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
+                    new MydoJob().builder()
+                            .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
+                            .roadwayId(mydoJob.getRoadwayId())
+                            .build()
+            );
+
+            if (!moveJobs.isEmpty()) return;
+
             //初始化参数
             HashMap<String, Object> paramMap = new HashMap<>();
             paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
@@ -270,15 +272,17 @@ public class RequestWcsHandler {
 
         if (mydoJobs.isEmpty()) return;
 
-        List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
-                new MydoJob().builder()
-                        .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
-                        .build()
-        );
-
-        if (!moveJobs.isEmpty()) return;
-
         for (MydoJob mydoJob : mydoJobs){
+
+            List<MydoJob> moveJobs = mydoJobService.selectMydoJobList(
+                    new MydoJob().builder()
+                            .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
+                            .roadwayId(mydoJob.getRoadwayId())
+                            .build()
+            );
+
+            if (!moveJobs.isEmpty()) return;
+
 //初始化参数
             HashMap<String, Object> paramMap = new HashMap<>();
             paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
@@ -392,8 +396,9 @@ public class RequestWcsHandler {
             paramMap.put("jobId", mydoJob.getJobId());
             paramMap.put("inOrOut", mydoJob.getInOrOut());
             paramMap.put("cargoSpaceId", mydoJob.getCargoSpaceId());
+            paramMap.put("targetCargoSpaceId", mydoJob.getTargetCargoSpaceId());
 
-            AjaxResult ajaxResult = apiWcsService.sendBackMydoJob(paramMap);
+            AjaxResult ajaxResult = apiWcsService.sendMoveMydoJob(paramMap);
 
             if (ajaxResult.isSuccess()){
                 log.info("【推送移库】推送移库作业，更新货位和库存预占用状态，wms作业号:{}，货位:{}，托盘号:{}", mydoJob.getJobId(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode());

ruoyi-admin/src/main/resources/mapper/bas/BasCargoSpaceMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="theFloor != null "> and the_floor = #{theFloor}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
             <if test="issDouble != null  and issDouble != ''"> and iss_double = #{issDouble}</if>
             <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
             <if test="groupCoding != null  and groupCoding != ''"> and group_coding = #{groupCoding}</if>