From f091d8316bc88437150e78a77eb5002b28baf592 Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Mon, 12 Sep 2022 15:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=BE=93=E9=80=81=E7=BA=BF=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/common/StructFindUtil.java   |  7 ++++++-
 .../main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql  | 11 ++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
index 613e6ae..a3a7e81 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
@@ -122,12 +122,17 @@ public class StructFindUtil {
                 .addParam("material_id", material_id).process().getResultJSONArray(0);
         for (int i = 0; i < deviceArr.size(); i++) {
             JSONObject deviceObj = deviceArr.getJSONObject(i);
-            int count = deviceObj.getIntValue("count");
+            /*int count = deviceObj.getIntValue("count");
             //假如到该输送线上料位置的任务>= 空闲的位置个数，则需要选择下一个输送线
             int task_num = WQL.getWO("QSTRUCT_RULE").addParam("flag", "7").process().uniqueResult(0).getIntValue("count");
             if (count > task_num) {
                 result = pointTable.query("device_id = '" + deviceObj.getString("device_id") + "' and device_point_type='01'").uniqueResult(0);
                 break;
+            }*/
+            //判断输送线上料位置有无空位置
+            result = pointTable.query("device_id = '" + deviceObj.getString("device_id") + "' and device_point_type='01'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(result)){
+                break;
             }
         }
         return result;
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
index ce6c843..22c5117 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
@@ -200,27 +200,24 @@ ENDIF
 IF 输入.flag = "6"
     QUERY
                 SELECT
+                    point.*,
                 	device.device_id,
                 	device.device_code,
                 	device.device_name,
-                	rule.in_seq_no,
-                	count( * ) AS count
+                	rule.in_seq_no
                 FROM
                 	sch_base_point point
                 	LEFT JOIN st_rule_cacheline rule ON point.device_id = rule.cacheline_id
                 	LEFT JOIN pdm_base_device device ON device.device_id = rule.cacheline_id
                 WHERE
                 	point.area_type = '07'
+                	AND device_point_type='01'
                 	AND point.mode<>'0'
                 	AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL )
                 	OPTION 输入.material_id <> ""
                          rule.material_id = 输入.material_id
                     ENDOPTION
-                GROUP BY
-                	device.device_id,
-                	device.device_code,
-                	device.device_name,
-                	rule.in_seq_no
+
                 ORDER BY
                 	rule.in_seq_no
              ENDSELECT