From 4c8e46d750f9ae9edb1e025065030c9e79423f97 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sat, 17 Dec 2022 11:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mes/hd/nladmin-system/pom.xml | 7 ++ .../service/impl/HandPFOutIvtServiceImpl.java | 2 +- .../wms/st/core/manage/AbstractInManage.java | 2 +- .../st/core/wql/QST_IVT_RAWASSISTISTOR02.wql | 97 +++++++++++++++++++ .../impl/StatisticalReportServiceImpl.java | 2 +- 5 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR02.wql diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 08daa37b..a3058fb2 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -37,8 +37,15 @@ org.redisson redisson-spring-boot-starter 3.12.3 + + + spring-boot-starter-actuator + org.springframework.boot + + + e-iceblue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 7ae8a151..9100f1f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -821,7 +821,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { if (sect_rows.size() > 0) { struct_map.put("sect_flag", "1"); } - JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(struct_map).process().uniqueResult(0); + JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR02").addParamMap(struct_map).process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)) { throw new PdaRequestException("未找到合适的仓位！"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java index f37ffcea..906f3303 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java @@ -712,7 +712,7 @@ public abstract class AbstractInManage { if (sect_rows.size() > 0) { struct_map.put("sect_flag", "1"); } - JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(struct_map).process().uniqueResult(0); + JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR02").addParamMap(struct_map).process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)){ if (ObjectUtil.isNotEmpty(whereJson.get("is_pc"))){ throw new BadRequestException("未查询到适用仓位！"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR02.wql new file mode 100644 index 00000000..bba4a475 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR02.wql @@ -0,0 +1,97 @@ +[交易说明] + 交易名： 基础点位分页查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.material_search TYPEAS s_string + 输入.end_time TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.bill_status TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.create_mode TYPEAS s_string + 输入.bill_type TYPEAS s_string + 输入.stor_id TYPEAS s_string + 输入.sect_id TYPEAS s_string + 输入.buss_type TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.iostorinvdis_id TYPEAS s_string + 输入.iostorinvdtl_id TYPEAS s_string + 输入.storagevehicle_code TYPEAS s_string + 输入.height TYPEAS s_string + 输入.sect_flag TYPEAS s_string + 输入.open_flag TYPEAS s_string + 输入.is_finish TYPEAS s_string + 输入.iostorinv_id TYPEAS s_string + 输入.query_type TYPEAS s_string + 输入.clsss_ids TYPEAS f_string + 输入.deptIds TYPEAS f_string + 输入.material_type_id TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "7" + QUERY + SELECT DISTINCT + sa.* + FROM + st_ivt_structattr sa + LEFT JOIN st_ivt_sectattr se ON se.sect_id = sa.sect_id + LEFT JOIN st_ivt_structrelamaterial sm ON sm.sect_id = sa.sect_id + WHERE + se.sect_type_attr = '00' + AND sa.lock_type = '00' + AND sa.is_used = '1' + AND sa.is_delete = '0' + AND ( sa.storagevehicle_code IS NULL OR sa.storagevehicle_code = '' ) + AND sa.height = 输入.height + OPTION 输入.sect_flag = "1" + sm.material_type_id = 输入.material_type_id + ENDOPTION + OPTION 输入.sect_id <> "" + sa.sect_id = 输入.sect_id + ENDOPTION + OPTION 输入.stor_id <> "" + sa.stor_id = 输入.stor_id + ENDOPTION + order by sa.struct_code + ENDSELECT + ENDQUERY + ENDIF + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index b26ce381..2461f1d3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -500,7 +500,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { String allmaterialId = " "; if (ObjectUtil.isNotEmpty(maters)){ - allmaterialId = "(\""+maters.stream().map(o -> ((JSONObject) o).getString("ext_id")).collect(Collectors.joining("\",\""))+"\")"; + allmaterialId = "(\'"+maters.stream().map(o -> ((JSONObject) o).getString("ext_id")).collect(Collectors.joining("\',\'"))+"\')"; } JSONArray ja = WQL.getWO("QL_ERP") .setDbname("dataSource1")