From ef61898303efb47454eb377ef94ea92505ba275a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Mon, 15 Dec 2025 14:41:56 +0800
Subject: [PATCH] 1234

---
 .../java/com/ruoyi/api/service/impl/ToErpServiceImpl.java | 2 +-
 .../java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java | 8 ++++++--
 .../job/mydojob/service/impl/MydoJobServiceImpl.java      | 4 +---
 ruoyi-ui/src/views/in/stockIn/index.vue                   | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index ae45f4a..4294820 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -458,7 +458,7 @@ public class ToErpServiceImpl implements IToErpService {
      * 入库单据 -> 请求入库单列表
      * @return
      */
-    @Scheduled(fixedDelay = 600_000)
+//    @Scheduled(fixedDelay = 600_000)
     public AjaxResult getErpStockinList(){
 
         ErpStockinParam erpStockinParam = new ErpStockinParam();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index 1394d7e..5eef56b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -139,13 +139,17 @@ public class ToWmsServiceImpl implements IToWmsService {
         mydoJobService.getInJobId(map);//存储过程【util_serial_job】生成作业号
         mydoJob.setJobId(map.get("v_serial"));
         mydoJob.setCargoSpaceId(cargoSpaceId);
+        mydoJob.setStatus("3");
         mydoJob.setInOrOut("1");
         mydoJob.setTrayCode(requestEnter.getTrayCode());
         map.put("v_param", "1");
         mydoJobService.getInTask(map);
         mydoJob.setTaskNo(map.get("v_serial"));
-//        HashMap<String, String> result = new HashMap<>();
-//        result.put("cargoSpaceId",cargoSpaceId);
+        BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId);
+        mydoJob.setRoadwayId(basCargoSpace.getTheFloor().toString());
+        mydoJob.setCreateTime(new Date());
+        mydoJobService.insertMydoJob(mydoJob);
+
         return AjaxResult.success(mydoJob);
     }
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 90897ca..d58a7c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -136,9 +136,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
      */
     @Override
     public int insertMydoJob(MydoJob mydoJob) {
-        mydoJob.setCreateTime(new Date());
-        mydoJob.setJobId(basJobIdService.getJobId("RK"));
-        mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
+
         return mydoJobMapper.insertMydoJob(mydoJob);
     }
 
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 083c432..ccdb297 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -177,7 +177,7 @@
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
       <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
       <el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
-      <el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
+      <el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫 码数量-->
       <el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
       <el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->
       <el-table-column label="规格型号" align="left" prop="spec" width="160"/>