任务完成处理和pda盘点界面优化

2026-09-16 11:28:04 +08:00
parent b21e559035
commit 82a8dfcaa9
12 changed files with 629 additions and 53 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/RequestWcsHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/RequestWcsHandler.java
@@ -239,6 +239,112 @@ public class RequestWcsHandler {



+    }
+
+
+    /**
+     * 推送wcs移库任务
+     */
+    @Scheduled(fixedRate = TIMEINTERVAL_2000)
+    public void sendWcsMoveTask(){
+        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+                new MydoJob().builder()
+                        .status(TaskStatusEnum.READY.getCode())
+                        .inOrOut(TaskType.TASKTYPE_PICK_BACK)
+                        .build()
+        );
+
+        if (mydoJobs.isEmpty()) return;
+
+        for (MydoJob mydoJob : mydoJobs){
+
+            //初始化参数
+            HashMap<String, Object> paramMap = new HashMap<>();
+            paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
+            paramMap.put("trayCode", mydoJob.getTrayCode());//容器编号
+            paramMap.put("taskNo", mydoJob.getTaskNo());//容器编号
+            paramMap.put("jobId", mydoJob.getJobId());
+            paramMap.put("inOrOut", mydoJob.getInOrOut());
+            paramMap.put("cargoSpaceId", mydoJob.getCargoSpaceId());
+
+            AjaxResult ajaxResult = apiWcsService.sendBackMydoJob(paramMap);
+
+            if (ajaxResult.isSuccess()){
+                log.info("【推送回流入库】<托盘回流>入库，更新货位和库存预占用状态，wms作业号:{}，货位:{}，托盘号:{}", mydoJob.getJobId(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode());
+                mydoJob.setStatus(TaskStatusEnum.RUNNING.getCode());
+                mydoJobService.updateMydoJob(mydoJob);
+
+                //更新库存状态【占用中】
+                List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
+                if (!stocks.isEmpty()){
+                    for (BasStock stock : stocks) {
+                        stock.setStockStatus(BasStockCode.STOCK_STATUS_OCCUPIED);
+                        stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
+                        basStockService.updateBasStock(stock);
+                    }
+                }
+
+                //更新货位状态【入库预占用】
+                basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKIN);
+
+            }
+        }
+
+
+
+    }
+
+
+    /**
+     * 推送wcs盘点出库任务
+     */
+    @Scheduled(fixedRate = TIMEINTERVAL_2000)
+    public void sendWcsInventoryOutTask(){
+        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+                new MydoJob().builder()
+                        .status(TaskStatusEnum.READY.getCode())
+                        .inOrOut(TaskType.TASKTYPE_STOCKOUT_INVENTORY)
+                        .build()
+        );
+
+        if (mydoJobs.isEmpty()) return;
+
+        for (MydoJob mydoJob : mydoJobs){
+
+            //初始化参数
+            HashMap<String, Object> paramMap = new HashMap<>();
+            paramMap.put("reqCode", UUID.randomUUID().toString());//请求码
+            paramMap.put("trayCode", mydoJob.getTrayCode());//容器编号
+            paramMap.put("taskNo", mydoJob.getTaskNo());//容器编号
+            paramMap.put("jobId", mydoJob.getJobId());
+            paramMap.put("inOrOut", mydoJob.getInOrOut());
+            paramMap.put("cargoSpaceId", mydoJob.getCargoSpaceId());
+
+            AjaxResult ajaxResult = apiWcsService.sendInventoryOutMydoJob(paramMap);
+
+            if (ajaxResult.isSuccess()){
+                log.info("【推送盘点出库】<盘点>出库，更新货位和库存预占用状态，wms作业号:{}，货位:{}，托盘号:{}", mydoJob.getJobId(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode());
+                mydoJob.setStatus(TaskStatusEnum.RUNNING.getCode());
+                mydoJobService.updateMydoJob(mydoJob);
+
+                //更新库存状态【占用中】
+                List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
+                if (!stocks.isEmpty()){
+                    for (BasStock stock : stocks) {
+                        stock.setStockStatus(BasStockCode.STOCK_STATUS_OCCUPIED);
+                        stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
+                        basStockService.updateBasStock(stock);
+                    }
+                }
+
+                //更新货位状态【入库预占用】
+                basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKOUT);
+
+            }
+        }
+
+
+
    }