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

fix: 任务优先级修改

Browse Source
This commit is contained in:
liyongde
2023-12-22 13:19:00 +08:00
parent 1a075dd83c
commit b01b4639e6
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/empty/HLCallEmptyTask.java
View File

@@ -40,9 +40,9 @@ public class HLCallEmptyTask extends AbstractAcsTask {
public String createTask(JSONObject form) { public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point"); JSONObject point = form.getJSONObject("point");
JSONObject work_order = form.getJSONObject("workorder"); JSONObject work_order = form.getJSONObject("workorder");
int priority = 1; int priority = 3;
if (ObjectUtil.isNotEmpty(work_order)) { if (ObjectUtil.isNotEmpty(work_order)) {
priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 4 : 1; priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 8 : 3;
} }
JSONObject task = TaskUtils.buildTask( JSONObject task = TaskUtils.buildTask(

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/call/material/YZCallMaterialTask.java
View File

@@ -52,7 +52,7 @@ public class YZCallMaterialTask extends AbstractAcsTask {
workorder.getString("material_id"), workorder.getString("material_id"),
VehicleType.CUP.value(), VehicleType.CUP.value(),
null, null,
TrueOrFalse.trueOrFalse(workorder.getString("is_urgent")) ? 4 : 1, TrueOrFalse.trueOrFalse(workorder.getString("is_urgent")) ? 8 : 4,
YZCallMaterialTask.class.getName(), YZCallMaterialTask.class.getName(),
form.getString("create_mode"), form.getString("create_mode"),
form.getString("request_param"), form.getString("request_param"),

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/empty/YZSendEmptyTask.java
View File

@@ -40,9 +40,9 @@ public class YZSendEmptyTask extends AbstractAcsTask {
public String createTask(JSONObject form) { public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point"); JSONObject point = form.getJSONObject("point");
JSONObject work_order = form.getJSONObject("workorder"); JSONObject work_order = form.getJSONObject("workorder");
int priority = 1; int priority = 3;
if (ObjectUtil.isNotEmpty(work_order)) { if (ObjectUtil.isNotEmpty(work_order)) {
priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 4 : 1; priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 8 : 3;
} }
String vehicleCode = TaskUtils.formatVehicleCode(point.getString("vehicle_code")); String vehicleCode = TaskUtils.formatVehicleCode(point.getString("vehicle_code"));

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

@@ -44,7 +44,7 @@ public class HLSendMaterialTask extends AbstractAcsTask {
public String createTask(JSONObject form) { public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point"); JSONObject point = form.getJSONObject("point");
JSONObject work_order = form.getJSONObject("workorder"); JSONObject work_order = form.getJSONObject("workorder");
int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 4 : 1; int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 8 : 4;
JSONObject vd = form.getJSONObject("vd"); JSONObject vd = form.getJSONObject("vd");
JSONObject task = TaskUtils.buildTask( JSONObject task = TaskUtils.buildTask(

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

@@ -42,7 +42,7 @@ public class YZSendMaterialTask extends AbstractAcsTask {
public String createTask(JSONObject form) { public String createTask(JSONObject form) {
JSONObject point = form.getJSONObject("point"); JSONObject point = form.getJSONObject("point");
JSONObject work_order = form.getJSONObject("workorder"); JSONObject work_order = form.getJSONObject("workorder");
int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 4 : 1; int priority = TrueOrFalse.trueOrFalse(work_order.getString("is_urgent")) ? 3 : 1;
JSONObject vd = form.getJSONObject("vd"); JSONObject vd = form.getJSONObject("vd");
JSONObject task = TaskUtils.buildTask( JSONObject task = TaskUtils.buildTask(