diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
index f016c68c..a757ee66 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
@@ -37,7 +37,7 @@ public class InterationUtil {
String url = acsUrl + api;
try {
HttpResponse execute = HttpRequest.post(url)
- .timeout(3000)
+ .timeout(15000)
.body(String.valueOf(param))
.execute();
JSONObject response = JSONObject.parseObject(execute.body());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml
index 4949b419..a779fcb6 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/mapper/xml/StIvtStructivtflowMapper.xml
@@ -18,6 +18,15 @@
and (struct.struct_code LIKE '%${query.search}%'
or struct.struct_name LIKE '%${query.search}%')
+
+ and material.material_code LIKE '%${query.material_code}%'
+
+
+ and struct_flow.vehicle_code LIKE '%${query.vehicle_code}%'
+
+
+ and struct_flow.pcsn = '${query.pcsn}'
+
and struct_flow.update_time >= #{query.start_time}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java
index 1b569820..9234beba 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dto/StructIvtFlowQuery.java
@@ -14,4 +14,7 @@ import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow;
public class StructIvtFlowQuery extends BaseQuery {
private String search;
+ private String material_code;
+ private String vehicle_code;
+ private String pcsn;
}
diff --git a/wms_pro/qd/src/views/monitor/eslog/view/loki.js b/wms_pro/qd/src/views/monitor/eslog/view/loki.js
index 8cc509d5..e52b08a1 100644
--- a/wms_pro/qd/src/views/monitor/eslog/view/loki.js
+++ b/wms_pro/qd/src/views/monitor/eslog/view/loki.js
@@ -5,6 +5,7 @@ export function getLogData(param) {
url: '/api/esLog/query',
method: 'post',
data: param
+
})
}