From 01fa735c4e14b6b86e8aacba7763a1fd17f9f06a Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 1 Feb 2023 09:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=8E=92=E6=8E=92=E6=BB=A1=E4=B8=8D?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=8B=E4=B8=80=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java    | 4 ++--
 .../sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql    | 3 ++-
 lms/nladmin-system/src/main/resources/config/application.yml  | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
index a7616fa..6033712 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
@@ -230,10 +230,10 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                 Integer block_num = json1.getInteger("block_num");
                 Integer col_num = json1.getInteger("col_num");
                 Integer row_num = json1.getInteger("row_num");
-                if (col_num != 1) {// 物料位在第一个位置说明已经叠满了
+                if (col_num != 1) {
                     // 因为找到的是对应相同的物料点，所以是下一个位置
                     JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "'
-                    if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
+//                    if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
                     taskObj.put("point_code2", firstRow.getString("point_code"));
                     taskObj.put("update_time", DateUtil.now());
                     taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
index c9282ab..64f902b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
@@ -57,7 +57,7 @@
                 AND is_delete = '0'
                 AND lock_type = '1'
                 AND point_status = '3'
-                and col_num>=1
+                AND col_num>1
             	OPTION 输入.material_id <> ""
                      p.material_id = 输入.material_id
                 ENDOPTION
@@ -67,6 +67,7 @@
                 OPTION 输入.vehicle_type <> ""
                      p.can_vehicle_type like "%" 输入.vehicle_type "%"
                 ENDOPTION
+                AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1')
             	ORDER BY block_num,row_num,col_num
     		ENDSELECT
     	ENDQUERY
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index a4d00ab..3d904e6 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -19,6 +19,8 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.MySQL5InnoDBDialect
         enable_lazy_load_no_trans: true
+  main:
+    allow-bean-definition-overriding: true
 task:
   pool:
     # 核心线程池大小