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

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;
                 }
 

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");

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',

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',

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': '路由方案',

acs2/nladmin-ui/src/views/acs/instruction/index.vue

@@ -146,6 +146,14 @@
             {{ dict.label.task_type[scope.row.instruction_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))">
+          <template slot-scope="scope">
+            <span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
+            <span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
+            <span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
+            <span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
         <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
         <!--        <el-table-column prop="link_num" label="关联编号" />-->

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -505,12 +505,20 @@
         <el-table-column type="selection" width="25" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
-        <el-table-column prop="action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('action_type',crud.data,$t('task.txt_box.Action_type'))">
         <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))">
+          <template slot-scope="scope">
+            <span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
+            <span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
+            <span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
+            <span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
           <template slot-scope="scope">