lsy/FT577-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充入库任务无巷道号的问题，优化出库分配校验可能为null的问题

Browse Source
This commit is contained in:
FT577-Server
2026-10-22 15:21:16 +08:00
parent 371e8f3224
commit 5a4b5a2bab
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java
View File

@@ -346,6 +346,7 @@ public class ApiWcsService implements IApiWcsService {
.roadwayId(wcsStockinReiceive.getRoadwayId()) .roadwayId(wcsStockinReiceive.getRoadwayId())
.cargoSpaceId(cargoStockin.getCargoSpaceId()) .cargoSpaceId(cargoStockin.getCargoSpaceId())
.cargoSpaceName(cargoStockin.getCargoSpaceName()) .cargoSpaceName(cargoStockin.getCargoSpaceName())
.roadwayId(cargoStockin.getRoadwayId())
.trayType(String.valueOf(type)) .trayType(String.valueOf(type))
.build(); .build();
@@ -374,7 +375,7 @@ public class ApiWcsService implements IApiWcsService {
.jobDetailId(jobId + "-1") .jobDetailId(jobId + "-1")
.inQuantity(BigDecimal.ONE) .inQuantity(BigDecimal.ONE)
.productId(trayMsg.getProductId()) .productId(trayMsg.getProductId())
.productName(basProductService.selectBasProductByProductId(trayMsg.getProductId()).getProductName()) .productName(trayMsg.getProductName())
.rollerNumber(trayMsg.getRollerNumber()) .rollerNumber(trayMsg.getRollerNumber())
.inDate(DateUtil.date()) .inDate(DateUtil.date())
.inOrOutId(instockinId) .inOrOutId(instockinId)
@@ -399,7 +400,7 @@ public class ApiWcsService implements IApiWcsService {
.jobDetailId(jobId + "-" + sum++) .jobDetailId(jobId + "-" + sum++)
.inQuantity(BigDecimal.ONE) .inQuantity(BigDecimal.ONE)
.productId(trayMsg.getProductId()) .productId(trayMsg.getProductId())
// .productName(basProductService.selectBasProductByProductId(trayMsg.getProductId()).getProductName()) .productName(trayMsg.getProductName())
.rollerNumber(trayMsg.getRollerNumber()) .rollerNumber(trayMsg.getRollerNumber())
.inDate(DateUtil.date()) .inDate(DateUtil.date())
.inOrOutId(instockinId) .inOrOutId(instockinId)

2
ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.ruoyi.bas.stock.domain.BasStock;
import com.ruoyi.bas.stock.service.IBasStockInfoService; import com.ruoyi.bas.stock.service.IBasStockInfoService;
import com.ruoyi.bas.stock.service.IBasStockService; import com.ruoyi.bas.stock.service.IBasStockService;
import com.ruoyi.common.*; import com.ruoyi.common.*;
import com.ruoyi.common.Utils.DecimalUtil;
import com.ruoyi.common.annotation.WarehouseScope; import com.ruoyi.common.annotation.WarehouseScope;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.in.job.domain.MydoJob; import com.ruoyi.in.job.domain.MydoJob;
@@ -548,7 +549,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
//2.生成辊号库存对应托盘的出库作业 //2.生成辊号库存对应托盘的出库作业
MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(stock.getTrayCode()); MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(stock.getTrayCode());
mydoJob.setCargoSpaceId(stock.getCargoSpaceId());
if (ObjUtil.isNull(mydoJob)){ if (ObjUtil.isNull(mydoJob)){