From 5a4b5a2bab9e3220a16c6e0ab490fc22cca1f54d Mon Sep 17 00:00:00 2001 From: FT577-Server Date: Thu, 22 Oct 2026 15:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=A5=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A0=E5=B7=B7=E9=81=93=E5=8F=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E5=88=86?= =?UTF-8?q?=E9=85=8D=E6=A0=A1=E9=AA=8C=E5=8F=AF=E8=83=BD=E4=B8=BAnull?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/api/service/impl/ApiWcsService.java | 5 +++-- .../out/stockout/service/impl/OutStockoutServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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)){