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

fix: 干燥区送料任务优先级默认为10，取消货位信息功能测试优化

Browse Source
This commit is contained in:
zhaoyf
2026-05-21 13:12:40 +08:00
parent 93e3a89d11
commit ab2224663f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -193,8 +193,8 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
break; break;
case 3: case 3:
//载具解绑 //载具解绑
if(!requireSucess && task != 0){ if(!requireSucess){
System.out.println("触发载具解绑" + task + mode + device_code); log.debug("触发载具解绑：device_code= {}",device_code);
this.vehicleUnbind(); this.vehicleUnbind();
} }
case 5: case 5:
@@ -317,9 +317,9 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (result.getStatus() == HttpStatus.OK.value()) { if (result.getStatus() == HttpStatus.OK.value()) {
JSONObject jsonObject = JSONObject.parseObject(result.body()); JSONObject jsonObject = JSONObject.parseObject(result.body());
if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
// Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
// map.put("to_command",5); map.put("to_command",30);
this.writing(this.mode); this.writing(map);
this.setRequireSucess(true); this.setRequireSucess(true);
} }
} }

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/GZSendMaterialTask.java
View File

@@ -54,7 +54,8 @@ public class GZSendMaterialTask extends AbstractAcsTask {
vd.getString("material_id"), vd.getString("material_id"),
vd.getString("vehicle_type"), vd.getString("vehicle_type"),
vd.getString("vehicle_code"), vd.getString("vehicle_code"),
TrueOrFalse.trueOrFalse(workOrder.getString("is_urgent")) ? 4 : 1, // TrueOrFalse.trueOrFalse(workOrder.getString("is_urgent")) ? 4 : 1,
10,
GZSendMaterialTask.class.getName(), GZSendMaterialTask.class.getName(),
form.getString("create_mode"), form.getString("create_mode"),
form.getString("request_param"), form.getString("request_param"),

2
lms/nladmin-system/src/main/resources/config/application.yml
View File

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