现场调试更改

2026-09-08 22:20:47 +08:00
parent 5353351520
commit 7c3ee78d41
140 changed files with 4488 additions and 4311 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/RequestWcsHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/RequestWcsHandler.java
@@ -0,0 +1,141 @@
+package com.ruoyi.scheduleTask;
+
+import com.ruoyi.api.domain.wcsStockin.WcsStockinReceive;
+import com.ruoyi.api.domain.wcsStockout.WcsStockoutParam;
+import com.ruoyi.api.service.IApiWcsService;
+import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
+import com.ruoyi.bas.stock.domain.BasStock;
+import com.ruoyi.bas.stock.service.IBasStockInfoService;
+import com.ruoyi.bas.stock.service.IBasStockService;
+import com.ruoyi.common.*;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.job.domain.MydoJob;
+import com.ruoyi.in.job.service.IMydoJobService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@Component
+public class RequestWcsHandler {
+
+    @Autowired
+    IMydoJobService mydoJobService;
+    @Autowired
+    IApiWcsService apiWcsService;
+    @Autowired
+    IBasStockService basStockService;
+    @Autowired
+    IBasStockInfoService basStockInfoService;
+    @Autowired
+    IBasCargoSpaceService basCargoSpaceService;
+
+    private static final int TIMEINTERVAL_DEFAULT = 1000;
+    private static final int TIMEINTERVAL_2000 = 2000;
+    private static final int TIMEINTERVAL_5000 = 5000;
+
+    /**
+     * 推送wcs空托盘出库作业
+     */
+    @Scheduled(fixedRate = TIMEINTERVAL_2000)
+    public void sendWcsEmptyContainerTask(){
+        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+                new MydoJob().builder()
+                        .inOrOut(TaskType.TASKTYPE_STOCKOUT_EMPTY_TRAY)
+                        .status(TaskStatusEnum.READY.getCode())
+                        .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.sendEmptyTrayOutMydoJob(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());
+                for (BasStock stock : stocks) {
+                    stock.setStockStatus(BasStockCode.STOCK_STATUS_OCCUPIED);
+                    basStockService.updateBasStock(stock);
+                }
+
+                //更新货位状态【出库预占用】
+                basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKOUT);
+
+            }
+        }
+
+    }
+
+
+    /**
+     * 手动操作 - 推送wcs指定货位出库
+     */
+    @Scheduled(fixedRate = TIMEINTERVAL_2000)
+    public void stockoutMydoJobForManual(){
+        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+                new MydoJob().builder()
+                        .status(TaskStatusEnum.READY.getCode())
+                        .inOrOut(TaskType.TASKTYPE_STOCKOUT_MANUAL)
+                        .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.sendOutMydoJob(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());
+                for (BasStock stock : stocks) {
+                    stock.setStockStatus(BasStockCode.STOCK_STATUS_OCCUPIED);
+                    basStockService.updateBasStock(stock);
+                }
+
+                //更新货位状态【出库预占用】
+                basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKOUT);
+
+            }
+        }
+
+    }
+
+
+
+
+
+}