add:增加库存变动条件查询；

opt:修改连接acs超时时间

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());

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>

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;
 }

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
+
   })
 }