From cd18562ba8aaf8520a2c22dd42f0c1e3b1b07f32 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 1 Dec 2022 16:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/start/Init.java | 36 +++++++++++-------- .../sch/service/impl/PointServiceImpl.java | 2 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/src/main/java/org/nl/start/Init.java index 52fded750..41b6241de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/lms/nladmin-system/src/main/java/org/nl/start/Init.java @@ -21,34 +21,40 @@ public class Init implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { /*WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr"); + WQLObject tab2 = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); + WQLObject tab3 = WQLObject.getWQLObject("st_ivt_sectattr"); String now = DateUtil.now(); - for (int i = 1; i < 10000; i++) { + for (int i = 1; i <= 10000; i++) { JSONObject json = new JSONObject(); json.put("struct_id", IdUtil.getSnowflake(1,1).nextId()); if (i < 10) { - json.put("struct_code", "01-"+"000"+i+"-01"); - json.put("struct_name", "01排"+"000"+i+"列-01层"); + json.put("struct_code", "11-"+"000"+i+"-01"); + json.put("struct_name", "11排"+"000"+i+"列-01层"); }else if (i >= 10 && i < 100) { - json.put("struct_code", "01-"+"00"+i+"-01"); - json.put("struct_name", "01排"+"00"+i+"列-01层"); + json.put("struct_code", "11-"+"00"+i+"-01"); + json.put("struct_name", "11排"+"00"+i+"列-01层"); }else if (i >= 100 && i < 1000) { - json.put("struct_code", "01-"+"0"+i+"-01"); - json.put("struct_name", "01排"+"0"+i+"列-01层"); + json.put("struct_code", "11-"+"0"+i+"-01"); + json.put("struct_name", "11排"+"0"+i+"列-01层"); } else { - json.put("struct_code", "01-"+i+"-01"); - json.put("struct_name", "01排"+i+"列-01层"); + json.put("struct_code", "11-"+i+"-01"); + json.put("struct_name", "11排"+i+"列-01层"); } + JSONObject jsonObject = tab2.query("stor_id = '1597073830499717120'").uniqueResult(0); + JSONObject jsonObjec2 = tab3.query("stor_id = '1597073830499717120' and sect_code = 'XN11'").uniqueResult(0); + json.put("simple_name", json.getString("struct_name")); - json.put("sect_id", "1586913215886004224"); - json.put("sect_code", "XN01"); - json.put("sect_name", "虚拟区"); - json.put("stor_id", "1582991156504039424"); - json.put("stor_code", "CP01"); - json.put("stor_name", "成品仓库"); + json.put("sect_id", jsonObjec2.getString("sect_id")); + json.put("sect_code", jsonObjec2.getString("sect_code")); + json.put("sect_name", jsonObjec2.getString("sect_name")); + json.put("stor_id", jsonObject.getString("stor_id")); + json.put("stor_code", jsonObject.getString("stor_code")); + json.put("stor_name", jsonObject.getString("stor_name")); + json.put("lock_type", "1"); json.put("row_num", 1); json.put("col_num", i); json.put("layer_num", 1); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 21da6eca2..80afc8153 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -308,7 +308,7 @@ public class PointServiceImpl implements PointService { WQLObject wo = WQLObject.getWQLObject("sch_base_point"); // 先删除所有点位类型为仓位的点位 - WQLObject.getWQLObject("sch_base_point").delete(" point_type = '01'"); + WQLObject.getWQLObject("sch_base_point").delete(" point_type = '2'"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName();