现场运行调整
This commit is contained in:
@@ -85,7 +85,7 @@ public class WcsServiceController extends BaseController {
|
||||
@PostMapping("/reAssign")
|
||||
public AjaxResult reAssign(@RequestBody WmsJobHandler 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);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public class WmsJobHandler {
|
||||
String cargoSpaceId;
|
||||
|
||||
/** 任务类型 */
|
||||
int wmsType;
|
||||
Integer wmsType;
|
||||
|
||||
/** 备注 */
|
||||
String remark;
|
||||
|
||||
@@ -678,7 +678,7 @@ public class ApiWcsService implements IApiWcsService {
|
||||
BasCargoSpace cargoSpaceNew = basCargoSpaceService.selectBasCargoSpaceForStockin(
|
||||
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());
|
||||
return AjaxResult.error("该区域没有可用的空货位");
|
||||
} else {
|
||||
@@ -691,14 +691,14 @@ public class ApiWcsService implements IApiWcsService {
|
||||
cargoSpaceNew.setStatus(CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKIN);
|
||||
basCargoSpaceService.updateBasCargoSpace(cargoSpaceNew);
|
||||
|
||||
return AjaxResult.success(
|
||||
new WmsJobHandler().builder()
|
||||
WmsJobHandler jobReturn = new WmsJobHandler().builder()
|
||||
.cargoSpaceId(cargoSpaceNew.getCargoSpaceId())
|
||||
.trayCode(mydoJob.getTrayCode())
|
||||
.jobId(wmsJobHandler.getJobId())
|
||||
.reqCode(wmsJobHandler.getReqCode())
|
||||
.build()
|
||||
);
|
||||
.build();
|
||||
|
||||
return AjaxResult.success(jobReturn);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user