root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-12-17 11:11:49 +08:00
parent 56a58b54a3
commit 4c8e46d750
5 changed files with 107 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/pom.xml
View File

@@ -37,8 +37,15 @@
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.12.3</version>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-actuator</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- Excel打印-->
<dependency>
<groupId>e-iceblue</groupId>

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -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("未找到合适的仓位！");
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
View File

@@ -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("未查询到适用仓位！");

97
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR02.wql Normal file
View File

@@ -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

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -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")