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

产线入库调试修改

Browse Source
This commit is contained in:
liuhanqing
2025-09-28 14:58:00 +08:00
parent 10c895ff80
commit 48353a2ab4
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
View File

@@ -22,4 +22,6 @@ public class WmsJobRequest {
private String positionCode1; private String positionCode1;
//终点 //终点
private String positionCode2; private String positionCode2;
//任务id
private String jobId;
} }

16
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -264,6 +264,7 @@ public class ToWmsServiceImpl implements IToWmsService {
result.put("cargoSpaceId", mydoJob.getCargoSpaceId()); result.put("cargoSpaceId", mydoJob.getCargoSpaceId());
result.put("roadwayId", mydoJob.getRoadwayId()); result.put("roadwayId", mydoJob.getRoadwayId());
result.put("entranceId", mydoJob.getEntranceId()); result.put("entranceId", mydoJob.getEntranceId());
result.put("inOrOut", mydoJob.getInOrOut());
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@@ -287,7 +288,7 @@ public class ToWmsServiceImpl implements IToWmsService {
String width = basProduct.getSpare37(); String width = basProduct.getSpare37();
String height = basProduct.getSpare38(); String height = basProduct.getSpare38();
String volume = basProduct.getSpare39(); String volume = basProduct.getSpare39();
return 0; return 1;
} }
@Override @Override
@@ -334,18 +335,19 @@ public class ToWmsServiceImpl implements IToWmsService {
MydoJob mydoJobParam = new MydoJob(); MydoJob mydoJobParam = new MydoJob();
switch (wmsJobRequest.getWmsType()) { switch (wmsJobRequest.getWmsType()) {
case "1": case "1":
if (StrUtil.isEmpty(wmsJobRequest.getTrayCode())) {
return AjaxResult.error(MessageUtils.message("error.message1"));
}
if (StrUtil.isEmpty(wmsJobRequest.getTaskNo())) { if (StrUtil.isEmpty(wmsJobRequest.getTaskNo())) {
return AjaxResult.error(MessageUtils.message("error.message2")); return AjaxResult.error("任务号不能为空");
}
if (StrUtil.isEmpty(wmsJobRequest.getJobId())) {
return AjaxResult.error("任务Id不能为空");
} }
//入库 //入库
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo()); mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode()); mydoJobParam.setJobId(wmsJobRequest.getJobId());
List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if (inMydoJobs.isEmpty()) { if (inMydoJobs.isEmpty()) {
return AjaxResult.error(MessageUtils.message("warn.message")); return AjaxResult.error("任务不存在");
} }
MydoJob inMydoJob = inMydoJobs.get(0); MydoJob inMydoJob = inMydoJobs.get(0);
mydoJobService.manualCompleted(inMydoJob, 1); mydoJobService.manualCompleted(inMydoJob, 1);

2
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -140,7 +140,7 @@
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/> <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width=120 label="货位状态" align="left" prop="cargoSpaceStatus" ><!--货位状态--> <el-table-column width=120 label="是否锁定" align="left" prop="cargoSpaceStatus" ><!--是否锁定-->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/> <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
</template> </template>