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

feat(入库订单): 删除入库订单校验

Browse Source
This commit is contained in:
陆一凡 2025-03-04 15:20:10 +08:00
parent 0dad2afa47
commit a7b254599b
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,6 @@ public class AppPmsController extends BaseController {
Integer orderType = orderInRequest.getOrderType();
if (StringUtils.isEmpty(orderInRequest.getListId())
|| !orderInTypeList.contains(orderInRequest.getOrderType())
|| StringUtils.isEmpty(orderInRequest.getCustomerId())
|| StringUtils.isEmpty(orderInRequest.getOrderId())
|| StringUtils.isEmpty(orderInRequest.getGoodsId())
|| StringUtils.isEmpty(orderInRequest.getGoodsCode())
@ -81,13 +80,7 @@ public class AppPmsController extends BaseController {
appPmsOrderIn.setCreateTime(new Date());
appPmsOrderIn.setUpdateTime(new Date());
AppPendingStorage appPendingStorage = new AppPendingStorage();
appPendingStorage.setRecordId(UUID.randomUUID().toString());
BeanUtils.copyProperties(appPmsOrderIn, appPendingStorage);
int i = appPendingStorageService.insertAppPendingStorage(appPendingStorage);
if (i == 0) {
return error("存入入库码盘信息失败");
}
int i1 = appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
if (i1 == 0) {
return error("入库单保存失败");
@ -107,7 +100,6 @@ public class AppPmsController extends BaseController {
// 判断请求数据完整性
if (StringUtils.isEmpty(orderOutRequest.getListId())
|| orderOutRequest.getOrderType() == null
|| StringUtils.isEmpty(orderOutRequest.getCustomerId())
|| StringUtils.isEmpty(orderOutRequest.getGoodsId())
|| orderOutRequest.getGoodsNum() == null
|| StringUtils.isEmpty(orderOutRequest.getGoodsDesc())) {

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonResponse.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonRes.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.quartz.domain.app;
/**
* Wcs通用响应信息
*/
public class WcsCommonResponse {
public class WcsCommonRes {
/**
* code
*/

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskRequest.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskReq.java
View File

@ -5,7 +5,7 @@ import java.math.BigDecimal;
/**
* 向wcs发送堆垛机任务请求
*/
public class WcsStackerTaskRequest {
public class WcsStackerTaskReq {
/**
* 任务id
*/

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

@ -6,8 +6,8 @@ import com.ruoyi.app.service.*;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.quartz.domain.app.WcsCommonResponse;
import com.ruoyi.quartz.domain.app.WcsStackerTaskRequest;
import com.ruoyi.quartz.domain.app.WcsCommonRes;
import com.ruoyi.quartz.domain.app.WcsStackerTaskReq;
import com.ruoyi.system.service.ISysConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -117,14 +117,14 @@ public class TaskExecutor {
}
for (AppWcsTask appWcsTask : wcsTaskList) {
// 添加wcs任务请求
WcsStackerTaskRequest wcsStackerTaskRequest = getWcsStackerTaskRequest(appWcsTask);
WcsStackerTaskReq wcsStackerTaskReq = getWcsStackerTaskRequest(appWcsTask);
// 发送http请求---请求5次
for (int i = 0; i < 5; i++) {
WcsCommonResponse wcsCommonResponse = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskRequest)), WcsCommonResponse.class);
if (wcsCommonResponse == null) {
WcsCommonRes wcsCommonRes = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskReq)), WcsCommonRes.class);
if (wcsCommonRes == null) {
continue;
}
if (wcsCommonResponse.getCode() == 0) {
if (wcsCommonRes.getCode() == 0) {
// 返回ok
appWcsTask.setWcsTaskStatus(1);// 已经发送成功
} else {
@ -145,15 +145,15 @@ public class TaskExecutor {
* @param appWcsTask 任务
* @return 请求详情
*/
private WcsStackerTaskRequest getWcsStackerTaskRequest(AppWcsTask appWcsTask) {
WcsStackerTaskRequest wcsStackerTaskRequest = new WcsStackerTaskRequest();
wcsStackerTaskRequest.setTaskId(appWcsTask.getWcsTaskId());
wcsStackerTaskRequest.setTaskType(appWcsTask.getWcsTaskType());
wcsStackerTaskRequest.setPriority(appWcsTask.getTaskPriority());
wcsStackerTaskRequest.setOrigin(appWcsTask.getOrigin());
wcsStackerTaskRequest.setDestination(appWcsTask.getDestination());
wcsStackerTaskRequest.setVehicleNo(appWcsTask.getVehicleId());
return wcsStackerTaskRequest;
private WcsStackerTaskReq getWcsStackerTaskRequest(AppWcsTask appWcsTask) {
WcsStackerTaskReq wcsStackerTaskReq = new WcsStackerTaskReq();
wcsStackerTaskReq.setTaskId(appWcsTask.getWcsTaskId());
wcsStackerTaskReq.setTaskType(appWcsTask.getWcsTaskType());
wcsStackerTaskReq.setPriority(appWcsTask.getTaskPriority());
wcsStackerTaskReq.setOrigin(appWcsTask.getOrigin());
wcsStackerTaskReq.setDestination(appWcsTask.getDestination());
wcsStackerTaskReq.setVehicleNo(appWcsTask.getVehicleId());
return wcsStackerTaskReq;
}
@Transactional