diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 40c1c65..a6989b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; -import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish; import com.ruoyi.check.DifferenceRecordFinish.service.ICheckDifferenceRecordFinishService; @@ -17,7 +16,6 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.domain.ExtraField; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -53,6 +51,13 @@ public class CheckDifferenceRecordController extends BaseController { @Autowired private ICheckDifferenceRecordAddInfoService checkDifferenceRecordAddInfoService; + @Autowired + private IBasStockService basStockService; + @Autowired + private ICheckDifferenceRecordFinishService checkDifferenceRecordFinishService; + @Autowired + private IBasJobIdService basJobIdService; + /** * 查询盘点差异列表 */ @@ -115,12 +120,6 @@ public class CheckDifferenceRecordController extends BaseController { return toAjax(checkDifferenceRecordService.deleteCheckDifferenceRecordByCheckGuids(checkGuids)); } - @Autowired - private IBasStockService basStockService; - @Autowired - private ICheckDifferenceRecordFinishService checkDifferenceRecordFinishService; - @Autowired - private IBasJobIdService basJobIdService; /** * 审核盘点差异 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 7f0b1c5..2d5b537 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 @@ -9,6 +9,7 @@ import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; import com.ruoyi.bas.taskNo.service.IBasTaskNoService; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.check.difference.domain.CheckDifferenceRecord; import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; @@ -248,7 +249,9 @@ public class MydoJobServiceImpl implements IMydoJobService { if (mydoJob == null) { return AjaxResult.warn("任务不存在"); } - if (StrUtil.isEmpty(mydoJob.getCargoSpaceId())){ + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId()); + + if (StrUtil.isEmpty(mydoJob.getCargoSpaceId()) && "1".equals(basWarehouse.getWarehouseType())){ return AjaxResult.warn("未分配货位"); }