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

修复少量问题

Browse Source
This commit is contained in:
葛林强 2025-03-06 13:57:29 +08:00
parent 7ad26066d3
commit a8a73a1af9
3 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1089,8 +1089,8 @@ public class AppTaskController extends BaseController
* @return 结果
*/
@Anonymous
@GetMapping("/getPickTask/{vehicleNo}")
public AjaxResult getPickTask(@PathVariable String vehicleNo) {
@GetMapping("/getPickTask")
public AjaxResult getPickTask(@RequestParam("vehicleNo") String vehicleNo) {
if(StringUtils.isEmpty(vehicleNo)) {
return error("载具号不能为空");
}
@ -1109,7 +1109,8 @@ public class AppTaskController extends BaseController
@Anonymous
@PostMapping("/pickComplete")
public AjaxResult pickComplete(@RequestBody PickCompleteReq request) {
public AjaxResult pickComplete(@RequestBody List<PickCompleteReq> requests) {
for(PickCompleteReq request : requests) {
if(request == null || StringUtils.isEmpty(request.getTaskId()) || request.getPickNum() == null) {
return error("请求参数不能为空");
}
@ -1127,6 +1128,8 @@ public class AppTaskController extends BaseController
if (selectTask.getTaskStatus() != 4) {
return error("该任务状态不是待捡货，请检查！");
}
}
for(PickCompleteReq request : requests) {
// 更新捡货任务数量
AppTask updatePickNum = new AppTask();
updatePickNum.setTaskId(request.getTaskId());
@ -1137,8 +1140,7 @@ public class AppTaskController extends BaseController
if (updateAppTask == 0) {
return error("数据服务异常，请重试");
}
}
return success("捡货成功");
}
}

6
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
View File

@ -72,6 +72,7 @@ public class TaskExecutor {
if (!preTaskList.isEmpty()) {
continue;
}
}
// 判断这个箱子的任务是否已经下发过
if (wcsTaskMap.containsKey(appTask.getVehicleId())) {
appTask.setWcsTaskId(wcsTaskMap.get(appTask.getVehicleId()).getWcsTaskId());
@ -93,7 +94,6 @@ public class TaskExecutor {
appTask.setWcsTaskId(newWcsTask.getWcsTaskId());
appTask.setTaskStatus(1);
}
}
if(!wcsTaskMap.isEmpty()) {
// 更新wms任务
appTaskService.batchUpdateAppTask(executingWmsTaskList);
@ -301,6 +301,8 @@ public class TaskExecutor {
AppTaskBak appTaskBak = new AppTaskBak();
BeanUtils.copyProperties(task, appTaskBak);
logger.info("出库任务数据归档成功。{}", JSON.toJSONString(appTaskBak));
appTaskBakService.insertAppTaskBak(appTaskBak);// 数据归档
appTaskService.deleteAppTaskByTaskId(task.getTaskId()); // 删除旧数据
}
// 调用 pms 接口
PmsOutFeedBack pmsOutFeedBack = new PmsOutFeedBack();
@ -310,7 +312,7 @@ public class TaskExecutor {
recordList.setMaterialsNo(task.getGoodsId());
String url = sysConfigService.selectConfigByKey("pms.outComplete");
if (StringUtils.isEmpty(url)) {
return;
continue;
}
PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(recordList)), PmsCommonRes.class);
logger.info("pms出库反馈请求信息：{}，结果：{}", JSON.toJSONString(recordList), JSON.toJSONString(pmsCommonRes));

6
ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml
View File

@ -72,10 +72,10 @@
</insert>
<insert id="batchInsertAppWcsTask" parameterType="java.util.List">
insert into app_task
insert into app_wcs_task
<foreach collection="list" item="appWcsTask" separator=",">
(
<trim prefixOverrides=",">
<trim suffixOverrides=",">
<if test="appWcsTask.wcsTaskId != null">wcs_task_id,</if>
<if test="appWcsTask.wcsTaskStatus != null">wcs_task_status,</if>
<if test="appWcsTask.wcsTaskType != null">wcs_task_type,</if>
@ -91,7 +91,7 @@
)
values
(
<trim prefixOverrides=",">
<trim suffixOverrides=",">
<if test="appWcsTask.wcsTaskId != null">#{appWcsTask.wcsTaskId},</if>
<if test="appWcsTask.wcsTaskStatus != null">#{appWcsTask.wcsTaskStatus},</if>
<if test="appWcsTask.wcsTaskType != null">#{appWcsTask.wcsTaskType},</if>