root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 移动类文件位置

Browse Source
This commit is contained in:
liyongde
2023-07-26 17:32:25 +08:00
parent 49285d566e
commit 34233e96b1
31 changed files with 108 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/doc/wms.xls
View File

Binary file not shown.

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java
View File

@@ -146,10 +146,9 @@ public class StringUtils {
* 获取ip地址
*/
public static String getIp(HttpServletRequest request) {
// TODO 不解析IP地址
if(true){
return "127.0.0.1";
}
// if(true){
// return "127.0.0.1";
// }
String ip = request.getHeader("x-forwarded-for");
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
View File

@@ -1,9 +1,7 @@
package org.nl.wms.ext.acs.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.ext.acs.service.vo.BaseResponse;
import org.nl.wms.ext.acs.service.vo.FeedBackTaskStatusResponse;
import org.nl.wms.ext.acs.service.vo.GetPalletizeResponse;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
/**
* @Author: lyd

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PutActionRequest.java
View File

@@ -1,22 +0,0 @@
package org.nl.wms.ext.acs.service.dto;
import lombok.Data;
import java.util.List;
/**
* @Author: lyd
* @Description: 提供设备信号
* @Date: 2023/7/26
*/
@Data
public class PutActionRequest extends BaseRequest {
/**
* 设备号
*/
private String device_code;
private List<SignalData> list ;
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/Resp.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/Resp.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto;
import lombok.Data;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BaseRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to;
import lombok.Data;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/BaseResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpStatus;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/ApplyTaskResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java
View File

@@ -1,8 +1,9 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to.acs;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpStatus;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
@Data
public class ApplyTaskResponse extends BaseResponse {

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CancelTaskRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.acs;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import java.util.Map;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CreateTaskRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CreateTaskRequest.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.acs;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import java.util.Map;
@@ -22,7 +23,6 @@ public class CreateTaskRequest extends BaseRequest {
*/
private String task_code;
/**
* 取货点1
*/

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/FeedBackTaskStatusResponse.java Normal file
View File

@@ -0,0 +1,6 @@
package org.nl.wms.ext.acs.service.dto.to.acs;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
public class FeedBackTaskStatusResponse extends BaseResponse {
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GetPalletizeResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java
View File

@@ -1,8 +1,9 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to.acs;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpStatus;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.ext.acs.service.dto.PalletizeDto;
@Data

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GrabResponse.java Normal file
View File

@@ -0,0 +1,7 @@
package org.nl.wms.ext.acs.service.dto.to.acs;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
public class GrabResponse extends BaseResponse {
}

27
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.ext.acs.service.dto.to.acs;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import org.nl.wms.ext.acs.service.dto.SignalData;
import java.util.List;
/**
* @Author: lyd
* @Description: 提供设备信号 lms->acs
* @Date: 2023/7/26
*/
@Data
public class PutActionRequest extends BaseRequest {
/**
* 设备号
*/
private String device_code;
/**
* 信号数据
*/
private List<SignalData> list;
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/ApplyTaskRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.BaseRequest;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import org.nl.wms.ext.acs.service.dto.PalletizeDto;
/**

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CancelTaskResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CancelTaskResponse.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
/**
* @Author: lyd

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CreateTaskResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CreateTaskResponse.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
/**
* @Author: lyd

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/FeedBackTaskStatusRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
/**
* ACS任务反馈请求实体

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GetPalletizeRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GetPalletizeRequest.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
@Data
public class GetPalletizeRequest extends BaseRequest {

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GrabRequest.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GrabRequest.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.ext.acs.service.dto;
package org.nl.wms.ext.acs.service.dto.to.wms;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
/**
* ACS抓取砖块记录信息实体

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/PutActionResponse.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/PutActionResponse.java
View File

@@ -1,4 +1,6 @@
package org.nl.wms.ext.acs.service.vo;
package org.nl.wms.ext.acs.service.dto.to.wms;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
/**
* @Author: lyd

40
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -15,11 +15,14 @@ import org.nl.wms.database.brick.service.IMdBaseBrickInfoService;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial;
import org.nl.wms.ext.acs.service.dto.*;
import org.nl.wms.ext.acs.service.dto.ApplyTaskRequest;
import org.nl.wms.ext.acs.service.vo.BaseResponse;
import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest;
import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest;
import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackTaskStatusRequest;
import org.nl.wms.ext.acs.service.dto.to.wms.GetPalletizeRequest;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.ext.acs.service.vo.ApplyTaskResponse;
import org.nl.wms.ext.acs.service.vo.GetPalletizeResponse;
import org.nl.wms.ext.acs.service.dto.to.acs.ApplyTaskResponse;
import org.nl.wms.ext.acs.service.dto.to.acs.GetPalletizeResponse;
import org.nl.wms.ext.record.service.ISysInteractRecordService;
import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService;
import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
@@ -50,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
/**
* @Author: lyd
@@ -72,7 +76,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Autowired
private TaskFactory taskFactory;
@Autowired
private ISysNoticeService noticeService;
@Autowired
@@ -410,7 +414,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
return BaseResponse.responseOk(requestNo);
}
public BaseResponse receiveTaskStatusAcs(JSONObject param) {
public BaseResponse feedbackTaskStatus(JSONObject param) {
// todo: action暂未维护
String requestNo = param.getString("requestNo");
FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class);
@@ -475,14 +479,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
/** 实时修改点位状态 */
public BaseResponse realTimeSetPoint(JSONObject param) {
String requestNo = param.getString("requestNo");
String deviceCode = param.getString("device_code");
String vehicleType = param.getString("vehicle_type");
// todo: 实体错误
PutActionRequest actionRequest = param.toJavaObject(PutActionRequest.class);
String requestNo = actionRequest.getRequestNo();
String deviceCode = actionRequest.getDevice_code();
List<SignalData> list = actionRequest.getList();
// String vehicleType = actionRequest.getVehicle_type();
if (deviceCode == null) {
return BaseResponse.responseError(requestNo, "设备编码不能为空");
}
// move
String move = (param.getInteger("move") + 1) + "";
String move = "";
// move 根据链表数据来
for (SignalData signalData : list) {
if (signalData.getCode().equals("move")) {
move = (Integer.parseInt(signalData.getValue()) + 1) + "";
}
}
// 找到点位
SchBasePoint schBasePoint = pointService.getById(deviceCode);
if (ObjectUtil.isEmpty(schBasePoint)) {
@@ -495,9 +507,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
&& move.equals(PointStatusEnum.EMPTY_VEHICLE.getCode())) || (pointStatus.equals(move))) { // 不做操作
return BaseResponse.responseOk(requestNo);
}
if (vehicleType != null) {
schBasePoint.setVehicle_type(vehicleType);
}
// if (vehicleType != null) {
// schBasePoint.setVehicle_type(vehicleType);
// }
schBasePoint.setPoint_status(move);
PointUtils.setUpdateByAcs(schBasePoint);
pointService.updateById(schBasePoint);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/FeedBackTaskStatusResponse.java
View File

@@ -1,4 +0,0 @@
package org.nl.wms.ext.acs.service.vo;
public class FeedBackTaskStatusResponse extends BaseResponse {
}

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GrabResponse.java
View File

@@ -1,5 +0,0 @@
package org.nl.wms.ext.acs.service.vo;
public class GrabResponse extends BaseResponse {
}

21
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/StandResponse.java
View File

@@ -1,21 +0,0 @@
package org.nl.wms.ext.acs.service.vo;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpStatus;
import lombok.Data;
/**
* @Author: lyd
* @Description: 是否静置完成
* @Date: 2023/7/14
*/
@Data
public class StandResponse extends BaseResponse {
private boolean is_success;
public StandResponse() {
this.setCode(HttpStatus.HTTP_OK);
this.setResponseDate(DateUtil.now());
this.setMessage("操作成功");
}
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.ext.acs.service.vo.BaseResponse;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.ext.record.service.dao.SysInteractRecord;
import java.util.Map;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
View File

@@ -8,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.ext.acs.service.vo.BaseResponse;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.ext.record.service.ISysInteractRecordService;
import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper;
import org.nl.wms.ext.record.service.dao.SysInteractRecord;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
View File

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.ext.acs.service.dto.BaseRequest;
import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -42,7 +42,7 @@ public abstract class AbstractTask {
private ISchBasePointService pointService;
@Autowired
private IPdmBdWorkorderService workorderService;
/**
* 任务创建
@@ -77,6 +77,11 @@ public abstract class AbstractTask {
List<AcsTaskDto> list = new ArrayList<>();
for (SchBaseTask task : taskList) {
AcsTaskDto taskDto = new AcsTaskDto();
String responseParam = task.getResponse_param();
if (ObjectUtil.isNotEmpty(responseParam)) {
JSONObject jsonObject = JSONObject.parseObject(responseParam);
taskDto.setDirection(jsonObject.getString("direction"));
}
taskDto.setRequestNo(IdUtil.simpleUUID());// todo
taskDto.setRequestDate(DateUtil.now());
taskDto.setExt_task_id(task.getTask_id());
@@ -125,7 +130,7 @@ public abstract class AbstractTask {
}
// todo: 以下改为public会出现自动注入类出现问题
// 以下改为public会出现自动注入类出现问题
protected abstract void updateStatus(String task_code, TaskStatus status);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.sch.task_manage;
import lombok.Data;
import org.nl.wms.ext.acs.service.dto.CreateTaskRequest;
import org.nl.wms.ext.acs.service.dto.to.acs.CreateTaskRequest;
@Data
public class AcsTaskDto extends CreateTaskRequest {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml
View File

@@ -6,7 +6,7 @@
p.*
FROM
`sch_base_point` p
WHERE (p.point_type = '1' OR p.point_type IS NULL OR p.point_type = '')
WHERE p.point_type = '1'
AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
AND p.point_status = '1'
AND p.region_code IN