From e9abf08ab4a952840dc90af09866f0bed49c5e23 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 19 Dec 2022 11:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E4=BD=8Did=E4=B8=8E?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8Did=E4=B8=8D=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StructattrServiceImpl.java   |  7 ++++++-
 .../java/org/nl/wms/st/ivt/wql/QIVT_001.wql   | 20 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/StructattrServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/StructattrServiceImpl.java
index 387f881..c4f535b 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/StructattrServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/StructattrServiceImpl.java
@@ -91,11 +91,16 @@ public class StructattrServiceImpl implements StructattrService {
         StructattrDto byCode = this.findByCode(struct_code);
         if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!");
 
+        // 获取点位信息
+        WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
+        JSONObject jsonObject = pointTab.query("point_code = '" + struct_code + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonObject)) throw new BadRequestException("点位编码为[" + struct_code + "]不存在!");
+
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
 
-        dto.setStruct_id(IdUtil.getSnowflake(1, 1).nextId());
+        dto.setStruct_id(jsonObject.getLong("point_id"));
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
         dto.setUpdate_optid(currentUserId);
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
index 1cce779..060d167 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
@@ -1,10 +1,10 @@
 [交易说明]
 	交易名：	生产管理之产线管理下工序参数设置
-	所属模块：	
-	功能简述：	
-	版权所有：	
-	表引用：	
-	版本经历：	
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
 
 [数据库]
 	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -25,22 +25,22 @@
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
-	
+
 [临时变量]
 	--所有中间过程变量均可在此处定义
-		 
+
 [业务过程]
 
 	##########################################
 	#			1、输入输出检查				 #
 	##########################################
 
-	
+
 	##########################################
 	#			2、主过程前处理				 #
 	##########################################
-	
-	
+
+
 	##########################################
 	#			3、业务主过程			 	 #
 	##########################################