From b0210e70ae5688bcf415c803d88681ba0d86b6a7 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Mon, 6 Jan 2025 12:02:03 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=EF=BC=9B?=
 =?UTF-8?q?=20opt:=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8E=A5acs=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/common/utils/InterationUtil.java    | 2 +-
 .../service/dao/mapper/xml/StIvtStructivtflowMapper.xml  | 9 +++++++++
 .../record/service/dto/StructIvtFlowQuery.java           | 3 +++
 wms_pro/qd/src/views/monitor/eslog/view/loki.js          | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

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}%')
             </if>
+            <if test="query.material_code != null and query.material_code != ''">
+                and material.material_code LIKE '%${query.material_code}%'
+            </if>
+            <if test="query.vehicle_code != null and query.vehicle_code != ''">
+                and struct_flow.vehicle_code LIKE '%${query.vehicle_code}%'
+            </if>
+            <if test="query.pcsn != null and query.pcsn != ''">
+                and struct_flow.pcsn = '${query.pcsn}'
+            </if>
             <if test="query.start_time != null and query.start_time != ''">
                 and struct_flow.update_time >= #{query.start_time}
             </if>
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<StIvtStructivtflow> {
 
     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
+
   })
 }