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

物料查询修改

Browse Source
This commit is contained in:
18188916393
2022-07-06 08:45:06 +08:00
parent 2b617ac1fe
commit be05539301
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -1,9 +1,11 @@
package org.nl.wms.sch.manage;
import cn.hutool.core.util.StrUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.tasks.AcsTaskDto;
import org.nl.wms.sch.tasks.TaskTypeEnum;
import org.nl.wql.core.bean.WQLObject;
import java.util.ArrayList;
@@ -44,10 +46,16 @@ public abstract class AbstractAcsTask {
List<AcsTaskDto> arr = new ArrayList<>();
for (int i = 0, j = tasks.size(); i < j; i++) {
JSONObject json = tasks.getJSONObject(i);
String task_type = json.getString("task_type");
String priority = "0";
if (StrUtil.equals(task_type, TaskTypeEnum.DUMPINV_TASK.getCode())){
priority="1";
}
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_uuid(json.optString("task_uuid"));
taskDto.setTask_code(json.optString("task_code"));
taskDto.setTask_type("");
taskDto.setPriority(priority);
taskDto.setStart_device_code(json.optString("start_point_code"));
taskDto.setNext_device_code(json.optString("next_point_code"));
taskDto.setVehicle_code(json.optString("vehicle_code"));
@@ -111,10 +119,16 @@ public abstract class AbstractAcsTask {
JSONArray arr = taskTab.query("task_uuid = '" + task_uuid + "'").getResultJSONArray(0);
for (int i = 0, j = arr.size(); i < j; i++) {
JSONObject json = arr.getJSONObject(i);
String task_type = json.getString("task_type");
String priority = "0";
if (StrUtil.equals(task_type, TaskTypeEnum.DUMPINV_TASK.getCode())){
priority="1";
}
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_uuid(json.optString("task_uuid"));
taskDto.setTask_code(json.optString("task_code"));
taskDto.setTask_type("");
taskDto.setPriority(priority);
taskDto.setStart_device_code(json.optString("start_point_code"));
taskDto.setNext_device_code(json.optString("next_point_code"));
taskDto.setVehicle_code(json.optString("vehicle_code"));

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QST_structIvt_01.wql
View File

@@ -83,7 +83,7 @@
(struct.struct_code like "%" 输入.struct_blury "%" or struct.struct_name like "%" 输入.struct_blury "%")
ENDOPTION
OPTION 输入.material_blury <> ""
(m.material_code like "%" 输入.material_blury "%" or m.material_name like "%" 输入.material_blury "%")
(labelMst.material_code like "%" 输入.material_blury "%" or labelMst.material_name like "%" 输入.material_blury "%")
ENDOPTION
OPTION 输入.vehicle_code <> ""
ivt.vehicle_code = 输入.vehicle_code

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

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