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

现场运行调整

Browse Source
This commit is contained in:
Lenovo
2026-09-21 11:01:46 +08:00
parent 074fc081cf
commit 8565eb60fd
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java
View File

@@ -85,7 +85,7 @@ public class WcsServiceController extends BaseController {
@PostMapping("/reAssign") @PostMapping("/reAssign")
public AjaxResult reAssign(@RequestBody WmsJobHandler wmsJobHandler) { public AjaxResult reAssign(@RequestBody WmsJobHandler wmsJobHandler) {
AjaxResult ajaxResult = apiWcsService.reAssign(wmsJobHandler); AjaxResult ajaxResult = apiWcsService.reAssign(wmsJobHandler);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "入库重分货位",ajaxResult); RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "入库重分货位", ajaxResult);
requestLogService.insertRequestLog(requestLog); requestLogService.insertRequestLog(requestLog);
return ajaxResult; return ajaxResult;
} }

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

@@ -23,7 +23,7 @@ public class WmsJobHandler {
String cargoSpaceId; String cargoSpaceId;
/** 任务类型 */ /** 任务类型 */
int wmsType; Integer wmsType;
/** 备注 */ /** 备注 */
String remark; String remark;

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

@@ -678,7 +678,7 @@ public class ApiWcsService implements IApiWcsService {
BasCargoSpace cargoSpaceNew = basCargoSpaceService.selectBasCargoSpaceForStockin( BasCargoSpace cargoSpaceNew = basCargoSpaceService.selectBasCargoSpaceForStockin(
new BasCargoSpace().builder().roadwayId(mydoJob.getRoadwayId()).cargoAreaId(basCargoSpaceParam.getCargoAreaId()).theType(mydoJob.getTrayType()).build() new BasCargoSpace().builder().roadwayId(mydoJob.getRoadwayId()).cargoAreaId(basCargoSpaceParam.getCargoAreaId()).theType(mydoJob.getTrayType()).build()
); );
if (ObjUtil.isNotNull(cargoSpaceNew)) { if (ObjUtil.isNull(cargoSpaceNew)) {
log.info("【入库重分】重分失败，该区域没有可用的空货位，货区:{}，托盘类型:{}", basCargoSpaceParam.getCargoAreaId(), mydoJob.getTrayType()); log.info("【入库重分】重分失败，该区域没有可用的空货位，货区:{}，托盘类型:{}", basCargoSpaceParam.getCargoAreaId(), mydoJob.getTrayType());
return AjaxResult.error("该区域没有可用的空货位"); return AjaxResult.error("该区域没有可用的空货位");
} else { } else {
@@ -691,14 +691,14 @@ public class ApiWcsService implements IApiWcsService {
cargoSpaceNew.setStatus(CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKIN); cargoSpaceNew.setStatus(CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKIN);
basCargoSpaceService.updateBasCargoSpace(cargoSpaceNew); basCargoSpaceService.updateBasCargoSpace(cargoSpaceNew);
return AjaxResult.success( WmsJobHandler jobReturn = new WmsJobHandler().builder()
new WmsJobHandler().builder() .cargoSpaceId(cargoSpaceNew.getCargoSpaceId())
.cargoSpaceId(cargoSpaceNew.getCargoSpaceId()) .trayCode(mydoJob.getTrayCode())
.trayCode(mydoJob.getTrayCode()) .jobId(wmsJobHandler.getJobId())
.jobId(wmsJobHandler.getJobId()) .reqCode(wmsJobHandler.getReqCode())
.reqCode(wmsJobHandler.getReqCode()) .build();
.build()
); return AjaxResult.success(jobReturn);
} }
} }