zhifei 1 год назад
Родитель
Сommit
27307735c6

+ 12 - 3
ruoyi-ui/src/views/ams/task/index.vue

@@ -148,6 +148,16 @@
           v-hasPermi="['ams:wcsTask:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleCharge"
+          v-hasPermi="['ams:wcsTask:add']"
+        >充电任务</el-button>
+      </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="primary"-->
@@ -520,9 +530,8 @@ export default {
         {'label':'普通任务','value':'01'}
       ],
       chargeCombo: [
-        {'label':'迷你堆垛A','value':'1'},
-        {'label':'迷你堆垛B','value':'2'},
-        {'label':'三向车','value':'3'}
+        {'label':'六号车','value':'6'},
+        {'label':'七号车','value':'7'},
       ],
       taskTypeCombo: [
         {'label':'是','value':'Y'},

+ 1 - 1
warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -112,7 +112,7 @@ public class AciService {
                 taskBean.setAciAccept(0);
                 taskBean.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_POWER.getValue());
                 taskBean = amsTaskService.selectAmsTaskByModel(taskBean);
-                s = "87CD0008000C00010071000663010001%04X";
+                s = "87CD0008000C000100710006630100010001%04X";
                 if (taskBean != null) {
 
                     s = String.format(s, Integer.parseInt(taskBean.getDeviceName()));