更新

acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -183,7 +183,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             } else {
 
                 String instcode = inst.getInstruction_code();
-                int type = Integer.parseInt(inst.getInstruction_type());
+                int type = Integer.parseInt(inst.getAgv_inst_type());
                 int priority = Integer.parseInt(inst.getPriority()) + 128;
                 DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
                 DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java

@@ -312,10 +312,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
 //                        standardOrdinarySiteDeviceDriver.setAgvphase(phase);
 //                        standardOrdinarySiteDeviceDriver.setIndex(index);
 //                        standardOrdinarySiteDeviceDriver.setInst(inst);
-                    standardInspectSiteDeviceDriver.writing(5);
+
-                    if (standardInspectSiteDeviceDriver.getMove() > 0) {
+                    //if (standardInspectSiteDeviceDriver.getMove() > 0) {
                     data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
-                    }
+                    //}
+                    standardInspectSiteDeviceDriver.writing(5);
                 }
 
             }

acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java

@@ -181,7 +181,7 @@ public class AutoCreateInst {
                     instdto.setAgv_inst_type("3");
                 }
             } else {
-                instdto.setAgv_inst_type("4");
+                instdto.setAgv_inst_type("1");
             }
 
             try {

acs/nladmin-system/src/main/resources/config/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ACS}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数

acs/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

acs/nladmin-ui/.env.production

@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://127.0.0.1:8010'
+VUE_APP_BASE_API  = 'http://192.168.200.100:8010'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://127.0.0.1:8010'
+VUE_APP_WS_API = 'ws://192.168.200.100:8010'

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

@@ -109,8 +109,12 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
         <el-table-column prop="instruction_code" label="指令编号" />
-        <el-table-column prop="instruction_type" label="指令类型" />
+        <el-table-column prop="instruction_type" label="指令类型">
-<!--        <el-table-column prop="link_num" label="关联编号" />-->
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.instruction_type] }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column prop="link_num" label="关联编号" />-->
         <el-table-column prop="task_code" label="任务号" />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="instruction_status" label="指令状态">
@@ -133,13 +137,13 @@
         <el-table-column prop="start_point_code2" label="取货点2" />
         <el-table-column prop="next_point_code2" label="放货点2" />
         <el-table-column prop="carno" label="车号" />
-<!--        <el-table-column prop="compound_inst" label="复合指令">-->
+        <!--        <el-table-column prop="compound_inst" label="复合指令">-->
-<!--          <template slot-scope="scope">-->
+        <!--          <template slot-scope="scope">-->
-<!--            <span v-if="scope.row.compound_inst==='0' ">否</span>-->
+        <!--            <span v-if="scope.row.compound_inst==='0' ">否</span>-->
-<!--            <span v-if="scope.row.compound_inst==='1' ">是</span>-->
+        <!--            <span v-if="scope.row.compound_inst==='1' ">是</span>-->
-<!--          </template>-->
+        <!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        </el-table-column>-->
-<!--        <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
+        <!--        <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
         <el-table-column prop="matarial" label="物料" />
         <el-table-column prop="quantity" label="数量" />
         <el-table-column prop="remark" label="描述" />
@@ -216,7 +220,7 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status'],
+  dicts: ['task_status', 'task_type'],
   name: 'Instruction',
   components: { crudOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],