FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复手动入库单listid重复问题

Browse Source
This commit is contained in:
陆一凡 2025-03-11 21:29:53 +08:00
parent bf1be14fbb
commit b4ee7885ca
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
View File

@ -62,14 +62,13 @@ public class AppPmsController extends BaseController {
logger.info("手动入库单请求：{}", JSONObject.toJSONString(orderInRequestList)); logger.info("手动入库单请求：{}", JSONObject.toJSONString(orderInRequestList));
// TODO // TODO
// 判断数据是否缺失 // 判断数据是否缺失
String orderId= OrderCodeFactory.getOrderCode("RK", "");
for(PmsOrderInRequest orderInRequest : orderInRequestList) { for(PmsOrderInRequest orderInRequest : orderInRequestList) {
if (StringUtils.isEmpty(orderInRequest.getGoodsId()) if (StringUtils.isEmpty(orderInRequest.getGoodsId())
|| StringUtils.isEmpty(orderInRequest.getGoodsDesc()) || StringUtils.isEmpty(orderInRequest.getGoodsDesc())
|| orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) { || orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) {
return error("缺少请求数据。"); return error("缺少请求数据。");
} }
String orderId= OrderCodeFactory.getOrderCode("RK", "");
AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
BeanUtils.copyProperties(orderInRequest, appPmsOrderIn); BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);
appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("","")); appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("",""));
@ -250,6 +249,7 @@ public class AppPmsController extends BaseController {
@Anonymous @Anonymous
@PostMapping("/pmsStockInComplete") @PostMapping("/pmsStockInComplete")
public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) { public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) {
logger.info("请求码盘：请求体为{}", JSON.toJSONString(request));
return toAjax(appPmsOrderInService.pmsStockInComplete(request)); return toAjax(appPmsOrderInService.pmsStockInComplete(request));
} }

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
View File

@ -185,29 +185,24 @@ public class AppTaskController extends BaseController
@Anonymous @Anonymous
public AjaxResult receiveTaskResult(@RequestBody TaskResultFeedRequest feedBackRequest) public AjaxResult receiveTaskResult(@RequestBody TaskResultFeedRequest feedBackRequest)
{ {
logger.info("反馈任务状态：{}", JSON.toJSONString(feedBackRequest));
// 判断请求参数是否齐全 // 判断请求参数是否齐全
if (feedBackRequest == null if (feedBackRequest == null
|| StringUtils.isEmpty(feedBackRequest.getTaskId()) || StringUtils.isEmpty(feedBackRequest.getTaskId())
|| feedBackRequest.getTaskStatus() == null || feedBackRequest.getTaskStatus() == null
|| StringUtils.isEmpty(feedBackRequest.getVehicleNo())) { || StringUtils.isEmpty(feedBackRequest.getVehicleNo())) {
logger.info("缺少请求数据。");
return error("缺少请求数据。"); return error("缺少请求数据。");
} }
// 判断任务状态是否正确 // 判断任务状态是否正确
if (!wcsTaskStatusList.contains(feedBackRequest.getTaskStatus())) { if (!wcsTaskStatusList.contains(feedBackRequest.getTaskStatus())) {
logger.info("任务状态码反馈不正确。");
return error("任务状态码反馈不正确。"); return error("任务状态码反馈不正确。");
} }
// 查询任务号 // 查询任务号
AppWcsTask thisFbWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(feedBackRequest.getTaskId()); AppWcsTask thisFbWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(feedBackRequest.getTaskId());
if (thisFbWcsTask == null) { if (thisFbWcsTask == null) {
logger.info("反馈的任务号不存在。");
return error("反馈的任务号不存在。"); return error("反馈的任务号不存在。");
} }
// 判断反馈的任务号与数据库中是否一致 // 判断反馈的任务号与数据库中是否一致
if (Objects.equals(thisFbWcsTask.getWcsTaskStatus(), feedBackRequest.getTaskStatus())) { if (Objects.equals(thisFbWcsTask.getWcsTaskStatus(), feedBackRequest.getTaskStatus())) {
logger.info("请勿重复反馈相同任务状态。");
return error("请勿重复反馈相同任务状态。"); return error("请勿重复反馈相同任务状态。");
} }
AppTask wmsTaskQuery = new AppTask(); AppTask wmsTaskQuery = new AppTask();
@ -238,7 +233,6 @@ public class AppTaskController extends BaseController
// appTaskService.batchUpdateAppTask(thisWmsTaskList); // appTaskService.batchUpdateAppTask(thisWmsTaskList);
updateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList);
} }
logger.info("反馈任务完成成功。");
return success("反馈任务完成成功。"); return success("反馈任务完成成功。");
} }
if (998 == feedBackRequest.getTaskStatus()) { if (998 == feedBackRequest.getTaskStatus()) {
@ -254,7 +248,6 @@ public class AppTaskController extends BaseController
// appTaskService.batchUpdateAppTask(thisWmsTaskList); // appTaskService.batchUpdateAppTask(thisWmsTaskList);
updateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList);
} }
logger.info("反馈任务取消成功。");
return success("反馈任务取消成功。"); return success("反馈任务取消成功。");
} }
if (999 == feedBackRequest.getTaskStatus()) { if (999 == feedBackRequest.getTaskStatus()) {
@ -269,7 +262,6 @@ public class AppTaskController extends BaseController
// appTaskService.batchUpdateAppTask(thisWmsTaskList); // appTaskService.batchUpdateAppTask(thisWmsTaskList);
updateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList);
} }
logger.info("反馈任务异常成功。");
return success("反馈任务异常成功。"); return success("反馈任务异常成功。");
} }
@ -288,7 +280,6 @@ public class AppTaskController extends BaseController
@Anonymous @Anonymous
public AjaxResult sendLocation(@RequestBody WcsLocationRequest wcsStackerTask) public AjaxResult sendLocation(@RequestBody WcsLocationRequest wcsStackerTask)
{ {
logger.info("接受wcs请求的入库请求,请求参数,{}",JSON.toJSONString(wcsStackerTask));
if(ObjectUtil.isEmpty(wcsStackerTask.getPoint())|| if(ObjectUtil.isEmpty(wcsStackerTask.getPoint())||
ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){ ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){
return error("缺少请求数据"); return error("缺少请求数据");