diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java index ea72e367..43cd249f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java @@ -113,6 +113,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.getString("ivt_qty")); dtl_map.put("可用重量", jo.getString("canuse_qty")); dtl_map.put("冻结数", jo.getString("frozen_qty")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql index a7c99056..5b28253c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql @@ -1,10 +1,10 @@ [交易说明] 交易名: 库存分页查询 - 所属模块: - 功能简述: - 版权所有: - 表引用: - 版本经历: + 所属模块: + 功能简述: + 版权所有: + 表引用: + 版本经历: [数据库] --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库 @@ -31,26 +31,26 @@ [临时表] --这边列出来的临时表就会在运行期动态创建 - + [临时变量] --所有中间过程变量均可在此处定义 - + [业务过程] ########################################## # 1、输入输出检查 # ########################################## - + ########################################## # 2、主过程前处理 # ########################################## - - + + ########################################## # 3、业务主过程 # ########################################## - + IF 输入.flag = "1" PAGEQUERY SELECT @@ -72,12 +72,38 @@ ivt.frozen_qty, ivt.warehousing_qty, ivt.qty_unit_name, - ivt.instorage_time + ivt.instorage_time, + bucket.bucket_num FROM ST_IVT_StructIvt ivt LEFT JOIN ST_IVT_StructAttr struct ON ivt.struct_id = struct.struct_id LEFT JOIN MD_ME_MaterialBase me ON me.material_id = ivt.material_id LEFT JOIN MD_PB_ClassStandard class ON class.class_id = me.material_type_id + LEFT JOIN ( + SELECT + COUNT(*) AS bucket_num, + br.storagevehicle_code, + br.material_id, + br.pcsn, + br.is_active, + br.ivt_level, + br.quality_scode + FROM + MD_PB_BucketRecord br + WHERE 1=1 + GROUP BY + br.storagevehicle_code, + br.material_id, + br.pcsn, + br.is_active, + br.ivt_level, + br.quality_scode + ) bucket ON (bucket.storagevehicle_code = struct.storagevehicle_code + and bucket.material_id=ivt.material_id + and bucket.pcsn=ivt.pcsn + and bucket.is_active=ivt.is_active + and bucket.ivt_level=ivt.ivt_level + and bucket.quality_scode=ivt.quality_scode) WHERE 1=1 OPTION 输入.stor_id <> "" struct.stor_id = 输入.stor_id @@ -251,4 +277,4 @@ ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue index a5efcd42..18352ebb 100644 --- a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue @@ -173,6 +173,7 @@ +