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

fix: 二次分配任务指令前端添加字段

Browse Source
This commit is contained in:
lishuai
2024-06-29 16:41:54 +08:00
parent 022eff8245
commit 43d7236761
7 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -770,6 +770,10 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
Integer actionType = ActionTypeEnum.IN_STOCK.getCode();
String newPointCode = applyXGAgvTask(task_code, actionType, instructionDto);
log.info("取货二次分配追加诺宝成功，新点位 - {}", newPointCode);
JSONObject map = new JSONObject();
map.put("status", 200);
map.put("message", "取货二次分配追加诺宝成功！");
return map;
}
//如果是放货二次分配，取放货二次分配需要重新追加动作块
if (AgvActionTypeEnum.OUT_STOCK.getCode().equals(instructionDto.getAgv_action_type()) || AgvActionTypeEnum.IN_OUT_STOCK.getCode().equals(instructionDto.getAgv_action_type())) {
@@ -777,6 +781,10 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
String newPointCode = applyXGAgvTask(task_code, actionType, instructionDto);
// sendAddSequencesToNBAgv(instructionDto.getInstruction_code(), deviceCodeNow, instructionDto);
log.info("放货二次分配追加诺宝成功，新点位 - {}", newPointCode);
JSONObject map = new JSONObject();
map.put("status", 200);
map.put("message", "放货二次分配追加诺宝成功！");
return map;
}
}
//一楼叉车
@@ -816,14 +824,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
//取货完成
JSONObject jsonObject = agvWaitUtil.waitOutGet(deviceCodeNow, instructionDto);
if (StringUtil.equals("200",jsonObject.getString("status"))){
log.info("允许仙工AGV取货完成后请求离开，设备号 - {}", deviceCodeNow);
log.info("仙工AGV取货完成后离开，设备号 - {}", deviceCodeNow);
return jsonObject;
}
} else if (address.contains("PUT")) {
//放货完成
JSONObject jsonObject = agvWaitUtil.waitOutPut(deviceCodeNow, instructionDto);
if (StringUtil.equals("200",jsonObject.getString("status"))){
log.info("允许仙工AGV取货完成后请求离开，设备号 - {}", deviceCodeNow);
log.info("仙工AGV放货完成后离开，设备号 - {}", deviceCodeNow);
return jsonObject;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
View File

@@ -295,7 +295,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
String length = datas.getString("boxLength");
String weight = datas.getString("boxWidth");
String height = datas.getString("boxHigh");
String desiccant = datas.getString("desiccantTemplat");
String desiccant = datas.getString("desiccantTemplate");
List list = new ArrayList();
Map map4 = new HashMap();
map4.put("code", "to_length");