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-28 11:19:53 +08:00
parent 05c1ee55a7
commit a41bc7cc4f
6 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -49,6 +49,14 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
if (StrUtil.isNotEmpty(map.get("material_code"))) {
map.put("material_code", "%" + map.get("material_code") + "%");
}
String begin_time = map.get("begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
String end_time = map.get("end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
String deptIds = DataAuthUtil.getDeptStr();
map.put("deptIds", deptIds);
if (StrUtil.isNotEmpty(map.get("buss_type"))) {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
View File

@@ -182,7 +182,7 @@
struct.struct_code like 输入.struct_code
ENDOPTION
OPTION 输入.stor_id <> ""
ivt2.stor_id = 输入.stor_id
struct.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id

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

@@ -184,7 +184,7 @@ public class IvtQueryServiceImpl implements IvtQueryService {
dtl_map.put("品质类型", jo.getString("quality_scode"));
dtl_map.put("库存等级", jo.getString("ivt_level"));
dtl_map.put("是否可用", jo.getString("is_active"));
dtl_map.put("桶数", jo.getString("bucket_num"));
dtl_map.put("桶数", jo.getIntValue("bucket_num"));
dtl_map.put("库存重量", jo.getString("ivt_qty"));
dtl_map.put("可用重量", jo.getString("canuse_qty"));
dtl_map.put("冻结数", jo.getString("frozen_qty"));