diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java
index 8b7f9ba..d7bc06f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java
@@ -346,6 +346,7 @@ public class ApiWcsService implements IApiWcsService {
                     .roadwayId(wcsStockinReiceive.getRoadwayId())
                     .cargoSpaceId(cargoStockin.getCargoSpaceId())
                     .cargoSpaceName(cargoStockin.getCargoSpaceName())
+                    .roadwayId(cargoStockin.getRoadwayId())
                     .trayType(String.valueOf(type))
                     .build();
 
@@ -374,7 +375,7 @@ public class ApiWcsService implements IApiWcsService {
                             .jobDetailId(jobId + "-1")
                             .inQuantity(BigDecimal.ONE)
                             .productId(trayMsg.getProductId())
-                            .productName(basProductService.selectBasProductByProductId(trayMsg.getProductId()).getProductName())
+                            .productName(trayMsg.getProductName())
                             .rollerNumber(trayMsg.getRollerNumber())
                             .inDate(DateUtil.date())
                             .inOrOutId(instockinId)
@@ -399,7 +400,7 @@ public class ApiWcsService implements IApiWcsService {
                             .jobDetailId(jobId + "-" + sum++)
                             .inQuantity(BigDecimal.ONE)
                             .productId(trayMsg.getProductId())
-//                            .productName(basProductService.selectBasProductByProductId(trayMsg.getProductId()).getProductName())
+                            .productName(trayMsg.getProductName())
                             .rollerNumber(trayMsg.getRollerNumber())
                             .inDate(DateUtil.date())
                             .inOrOutId(instockinId)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
index 029dfed..24654f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
@@ -13,6 +13,7 @@ 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.Utils.DecimalUtil;
 import com.ruoyi.common.annotation.WarehouseScope;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.in.job.domain.MydoJob;
@@ -548,7 +549,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
 
 //2.生成辊号库存对应托盘的出库作业
             MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(stock.getTrayCode());
-            mydoJob.setCargoSpaceId(stock.getCargoSpaceId());
 
             if (ObjUtil.isNull(mydoJob)){