diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
index c4efa45c2..c08f6dca4 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
@@ -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;
}
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
index a44f5d923..6871d552f 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
@@ -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");
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/en.js b/acs2/nladmin-ui/src/i18n/langs/task/en.js
index 9d7584ae9..bc571ce9f 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/en.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/en.js
@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': 'Origin Or Destination',
'Task_type': 'Task Type',
'Action_type': 'Action Type',
+ 'ORDINARY': 'Ordinary task',
+ 'IN_STOCK': 'Pick up secondary distribution',
+ 'OUT_STOCK': 'Release cargo secondary distribution',
+ 'IN_OUT_STOCK': 'Pick and release cargo secondary distribution',
'Warehouse_task_type': 'Warehouse Task Type',
'AGV_system': 'AGV System',
'Routing_scheme': 'Routing Scheme',
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/in.js b/acs2/nladmin-ui/src/i18n/langs/task/in.js
index 44e14cb5b..b1c10a540 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/in.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/in.js
@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': 'Asal Atau Tujuan',
'Task_type': 'Jenis Tugas',
'Action_type': 'Tipe tugas sekunder',
+ 'ORDINARY': 'Tugas biasa',
+ 'IN_STOCK': 'Dapatkan pasokan kedua',
+ 'OUT_STOCK': 'Memasukkan barang ke distribusi kedua',
+ 'IN_OUT_STOCK': 'Ambil paket distribusi kedua',
'Warehouse_task_type': 'Jenis Tugas Gudang',
'AGV_system': 'Sistem AGV',
'Routing_scheme': 'Skema Routing',
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/zh.js b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
index 7a63d004b..063726046 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/zh.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': '输入起点或终点',
'Task_type': '任务类型',
'Action_type': '二次分配类型',
+ 'ORDINARY': '普通任务',
+ 'IN_STOCK': '取货二次分配',
+ 'OUT_STOCK': '放货二次分配',
+ 'IN_OUT_STOCK': '取放货二次分配',
'Warehouse_task_type': '立库任务类型',
'AGV_system': 'agv系统',
'Routing_scheme': '路由方案',
diff --git a/acs2/nladmin-ui/src/views/acs/instruction/index.vue b/acs2/nladmin-ui/src/views/acs/instruction/index.vue
index ffa308884..6b3792827 100644
--- a/acs2/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/instruction/index.vue
@@ -146,6 +146,14 @@
{{ dict.label.task_type[scope.row.instruction_type] }}
+
+
+ {{ $t('task.txt_box.ORDINARY') }}
+ {{ $t('task.txt_box.IN_STOCK') }}
+ {{ $t('task.txt_box.OUT_STOCK') }}
+ {{ $t('task.txt_box.IN_OUT_STOCK') }}
+
+
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 591b09a86..28fe6037d 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -505,12 +505,20 @@
-
{{ dict.label.task_type[scope.row.task_type] }}
+
+
+ {{ $t('task.txt_box.ORDINARY') }}
+ {{ $t('task.txt_box.IN_STOCK') }}
+ {{ $t('task.txt_box.OUT_STOCK') }}
+ {{ $t('task.txt_box.IN_OUT_STOCK') }}
+
+
+