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-01 12:24:32 +08:00
parent 7a741704d3
commit 1091de1e92
7 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
View File

@@ -99,8 +99,8 @@
mb.material_code
FROM
pdm_bi_procedureoffline off
LEFT JOIN md_me_materialbase mb ON mb.material_id = off.material_id
LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
INNER JOIN md_me_materialbase mb ON mb.material_id = off.material_id
INNER JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
WHERE
off.`status` = '0'
AND

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

@@ -43,6 +43,14 @@ public class IostordailyServiceImpl implements IostordailyService {
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
HashMap<String, String> map = new HashMap<>(whereJson);
map.put("flag", "1");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);