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

手动完成入库作业 去除平库完成限制

Browse Source
This commit is contained in:
liuhanqing
2025-11-04 16:15:44 +08:00
parent ac0cf1b44d
commit fec6b4fd8a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
View File

@@ -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;
/**
* 审核盘点差异

5
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -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("未分配货位");
}