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

叠盘机测高已可用，改为自动同步

Browse Source
This commit is contained in:
psh
2024-04-18 09:44:23 +08:00
parent 7b20aca842
commit 8a40def0bb
7 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/RkDto.java Normal file
View File

@@ -0,0 +1,13 @@
package org.nl.wms.board.service.dao.dto;
import lombok.Data;
import java.util.List;
@Data
public class RkDto {
private KcDto kc;
private HwDto hw;
private List<WlDto> kn;
private List<WlDto> wrk;
}

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/SckbDto.java Normal file
View File

@@ -0,0 +1,11 @@
package org.nl.wms.board.service.dao.dto;
import lombok.Data;
import java.util.List;
@Data
public class SckbDto {
private List<ScDto> pt;
private List<ScDto> ks;
}

31
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.board.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.RedisUtils;
import org.nl.wms.board.service.BoardService;
@@ -26,14 +27,6 @@ public class BoardServiceImpl implements BoardService {
if (czDto == null) {
czDto = new CzDto();
}
redisUtils.set("mother_tray",0);
redisUtils.set("sub_tray",0);
redisUtils.set("device_type",0);
redisUtils.set("frame_type",0);
redisUtils.set("mother_type",0);
redisUtils.set("sub_type",0);
redisUtils.set("point_qty",0);
czDto.setMother_tray(String.valueOf(redisUtils.get("mother_tray")));
czDto.setPoint_qty(String.valueOf(redisUtils.get("point_qty")));
czDto.setDevice_type((Integer) redisUtils.get("device_type"));
@@ -41,7 +34,7 @@ public class BoardServiceImpl implements BoardService {
czDto.setMother_type((Integer) redisUtils.get("mother_type"));
czDto.setSub_type((Integer) redisUtils.get("sub_type"));
czDto.setError((Integer) redisUtils.get("error"));
return JSONObject.parseObject(JSON.toJSONString(czDto));
return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
}
public JSONObject rk() {
@@ -50,18 +43,18 @@ public class BoardServiceImpl implements BoardService {
HwDto hwDto = boardMapper.hw();
List<WlDto> knList = boardMapper.kn();
List<WlDto> wrkList = boardMapper.wrk();
JSONObject jsonObject = new JSONObject();
jsonObject.put("kc", kcDto);
jsonObject.put("hw", hwDto);
jsonObject.put("kn", knList);
jsonObject.put("wrk", wrkList);
return jsonObject;
RkDto rkDto = new RkDto();
rkDto.setKc(kcDto);
rkDto.setHw(hwDto);
rkDto.setKn(knList);
rkDto.setWrk(wrkList);
return JSONObject.parseObject(JSON.toJSONString(rkDto, SerializerFeature.WriteNullStringAsEmpty));
}
public JSONObject sc() {
JSONObject jsonObject = new JSONObject();
jsonObject.put("pt", boardMapper.sc("HW"));
jsonObject.put("ks", boardMapper.sc("HWK"));
return jsonObject;
SckbDto sckbDto = new SckbDto();
sckbDto.setPt(boardMapper.sc("HW"));
sckbDto.setKs(boardMapper.sc("HWK"));
return JSONObject.parseObject(JSON.toJSONString(sckbDto, SerializerFeature.WriteNullStringAsEmpty));
}
}

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

@@ -23,6 +23,7 @@ import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task_manage.AbstractTask;
@@ -170,9 +171,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
public BaseResponse notify(JSONObject param) {
String requestNo = param.getString("requestNo");
log.info("notifyAcs - 请求参数 {}", param);
// 遍历所有键
for(String key:param.keySet()){
redisUtils.set(key,param.getString(key));
if(param.getInteger("type")==1){
//叠盘机高度同步
SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getPoint_code, param.getString("device_code")));
schBasePoint.setVehicle_qty(param.getInteger("number"));
pointService.update(schBasePoint);
}else if(param.getInteger("type")==2) {
// 输送线看板展示字段同步
for (String key : param.keySet()) {
redisUtils.set(key, param.getString(key));
}
}
return BaseResponse.responseOk(requestNo, "反馈成功！");
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
View File

@@ -80,7 +80,6 @@ public class POINTTask extends AbstractTask {
.eq(SchBasePoint::getPoint_code, task.getPoint_code2()));
//如果是叠盘位，根据当前数量+1为目标地址
int qty=nextSchBasePoint.getVehicle_qty()+1;
log.info("当前叠盘位完成任务次数为");
task.setPoint_code2(task.getPoint_code2().substring(0,task.getPoint_code2().length()-1)+qty);
}
task.setVehicle_code(schBasePoint.getVehicle_code());
@@ -175,7 +174,8 @@ public class POINTTask extends AbstractTask {
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
if(endPointObj.getPoint_code().startsWith("DKT")){
endPointObj.setVehicle_qty(endPointObj.getVehicle_qty()+1);
//叠盘机数量由acs同步，无需维护
// endPointObj.setVehicle_qty(endPointObj.getVehicle_qty()+1);
}else {
endPointObj.setVehicle_qty(1);
}