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

手持机部分

Browse Source
This commit is contained in:
张怡蓉
2025-07-24 09:05:46 +08:00
parent cadf2c881c
commit fd5ae47572
6 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@ 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;
import com.ruoyi.common.annotation.DataScope;
@@ -71,6 +73,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
private IOutExceptionRecordService outExceptionRecordService;
@Autowired
private PdaService pdaService;
@Autowired
private IBasWarehouseService basWarehouseService;
/**
@@ -221,8 +225,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
if (job == null) {
return AjaxResult.warn("任务不存在");
}
if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
return AjaxResult.warn("任务未开始");
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("1".equals(basWarehouse.getWarehouseType())) {
if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
return AjaxResult.warn("任务未开始");
}
}
if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) {
//空料箱入库 托盘垛入库
@@ -405,6 +412,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
public AjaxResult OuthandFinish(String[] jobIds) {
for (String jobId : jobIds) {
MydoJob job = selectMydoJobByJobId(jobId);
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){
return AjaxResult.error("只能完成正执行的作业");
}
TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
trayCodeMakeSure.setTrayCode(job.getTrayCode());
pdaService.outMakeSure(trayCodeMakeSure);

12
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -308,13 +308,15 @@ public class PdaController extends BaseController {
if(!basWarehouses.isEmpty()){
for(BasWarehouse basWarehouse : basWarehouses){
//高架库
if("1".equals(basWarehouse.getWarehouseType())){
MydoJob mydoJob = new MydoJob();
mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
mydoJob.setInOut(trayCodeMsg.getInOut());
// if("1".equals(trayCodeMsg.getInOut())){
mydoJob.setStatus("1");
// }
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
//将mydoJob添加进mydoJobArrayList
mydoJobArrayList.addAll(mydoJobs);
@@ -324,19 +326,19 @@ public class PdaController extends BaseController {
MydoJob mydoJob = new MydoJob();
if("4".equals(trayCodeMsg.getInOut())){
mydoJob.setInOut("4");
}else{
}else if("2".equals(trayCodeMsg.getInOut())){
mydoJob.setInOut("2");
}else{
List<String> list = new ArrayList<>(Arrays.asList("21", "22", "23","24","25","26"));
mydoJob.setInOutIds(list);
}
mydoJob.setWarehouseId(basWarehouse.getWarehouseId());
mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode());
mydoJob.setStatus("3");
List<MydoJob> mydoJobs2 = mydoJobService.selectMydoJobList(mydoJob);
mydoJobArrayList.addAll(mydoJobs2);
}
}
}
return AjaxResult.success(mydoJobArrayList);
}

2
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -231,7 +231,7 @@ public class PdaServiceImp implements PdaService {
//判断任务是否存在
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
mydoJobParam.setStatus("3");
// mydoJobParam.setStatus("3");
List<MydoJob> mydoJobList = mydoJobService.selectMydoJobList(mydoJobParam);
if (CollUtil.isEmpty(mydoJobList)) {
return AjaxResult.warn("任务不存在");

2
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -94,8 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>