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

更新

Browse Source
This commit is contained in:
loujf
2023-02-17 14:05:42 +08:00
parent ccc01ad78a
commit f5bdddaf82
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -200,7 +200,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break; break;
} }
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { if (device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
} }
@@ -300,7 +300,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break; break;
} }
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { if (device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
} }
@@ -422,7 +422,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break; break;
} }
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { if (device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
} }
@@ -503,7 +503,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey); logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break; break;
} }
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) { if (device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
} }

2
acs/qd/.env.development
View File

@@ -1,7 +1,7 @@
ENV = 'development' ENV = 'development'
# 接口地址 # 接口地址
VUE_APP_BASE_API = 'http://192.168.81.140:8010' VUE_APP_BASE_API = 'http://127.0.0.1:8010'
VUE_APP_WS_API = 'ws://127.0.0.1:8010' VUE_APP_WS_API = 'ws://127.0.0.1:8010'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件

8
acs/qd/.env.production
View File

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

12
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -80,18 +80,18 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
pointTab.update(endpointObj); pointTab.update(endpointObj);
JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
//调用mes接口
HashMap hashMap = new HashMap();
hashMap.put("vehicle_code",startPointObj.getString("vehicle_code"));
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackTrayBak(hashMap);
startPointObj.put("lock_type", "00"); startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00"); startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", ""); startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj); pointTab.update(startPointObj);
taskTab.update(jsonTask); taskTab.update(jsonTask);
//调用mes接口
HashMap hashMap = new HashMap();
hashMap.put("vehicle_code",vehicle_code);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackTrayBak(hashMap);
//将组盘表删除 //将组盘表删除
WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup"); WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupObj = group_Table.query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0); JSONObject groupObj = group_Table.query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0);

4
wms/qd/.env.development
View File

@@ -1,8 +1,8 @@
ENV = 'development' ENV = 'development'
# 接口地址 # 接口地址
VUE_APP_BASE_API = 'http://localhost:8010' VUE_APP_BASE_API = 'http://localhost:8012'
VUE_APP_WS_API = 'ws://localhost:8010' VUE_APP_WS_API = 'ws://localhost:8012'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

8
wms/qd/src/views/wms/st/basedata/inkilncache/index.vue
View File

@@ -79,16 +79,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="工单id">
<el-input v-model="form.producetask_id" style="width: 370px;" @focus="getWork"/> <el-input v-model="form.producetask_id" style="width: 370px;" @focus="getWork"/>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="物料id">
<el-input v-model="form.material_id" style="width: 370px;" @focus="getWork"/> <el-input v-model="form.material_id" style="width: 370px;" @focus="getWork"/>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="工序id">
<el-input v-model="form.workprocedure_id" style="width: 370px;" @focus="getWork"/> <el-input v-model="form.workprocedure_id" style="width: 370px;" @focus="getWork"/>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="设备id">
<el-input v-model="form.device_id" style="width: 370px;" @focus="getWork"/> <el-input v-model="form.device_id" style="width: 370px;" @focus="getWork"/>
</el-form-item> </el-form-item>
<el-form-item v-if="form.point_status=='02'" label="生产任务" prop="producetask_code"> <el-form-item v-if="form.point_status=='02'" label="生产任务" prop="producetask_code">

8
wms/qd/src/views/wms/st/basedata/outkilncache/index.vue
View File

@@ -79,16 +79,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="工单id">
<el-input v-model="form.producetask_id" style="width: 370px;" @focus="getWork" /> <el-input v-model="form.producetask_id" style="width: 370px;" @focus="getWork" />
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="物料id">
<el-input v-model="form.material_id" style="width: 370px;" @focus="getWork" /> <el-input v-model="form.material_id" style="width: 370px;" @focus="getWork" />
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="工序id">
<el-input v-model="form.workprocedure_id" style="width: 370px;" @focus="getWork" /> <el-input v-model="form.workprocedure_id" style="width: 370px;" @focus="getWork" />
</el-form-item> </el-form-item>
<el-form-item v-if="false" label="生产任务"> <el-form-item v-if="false" label="设备id">
<el-input v-model="form.device_id" style="width: 370px;" @focus="getWork" /> <el-input v-model="form.device_id" style="width: 370px;" @focus="getWork" />
</el-form-item> </el-form-item>
<el-form-item v-if="form.point_status=='02'" label="生产任务" prop="producetask_code"> <el-form-item v-if="form.point_status=='02'" label="生产任务" prop="producetask_code">