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 27cf03c7..fb03d1df 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 @@ -655,8 +655,18 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { public Map bucketQuery(Map whereJson, Pageable page) { // 仓位属性表【ST_IVT_StructAttr】 Object storagevehicleCode = whereJson.get("storagevehicle_code"); + Object materialCode = whereJson.get("material_code"); + //转id + if (materialCode == null || storagevehicleCode==null){ + return null; + } + JSONObject meMaterialbase = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + materialCode + "'").uniqueResult(0); + if (meMaterialbase == null){ + throw new BadRequestException("物料编号:"+materialCode+" 查询不到对应物料信息"); + } Map paramMap = new HashMap<>(); paramMap.put("storagevehicle_code",storagevehicleCode); + paramMap.put("material_id",meMaterialbase.getString("material_id")); paramMap.put("flag","6"); JSONObject jsonObject = WQL.getWO("statistical_report_query_02").addParamMap(paramMap).pageQuery(WqlUtil.getHttpContext(page), "bucketunique"); return jsonObject; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql index 5aaba957..1a359d48 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql @@ -289,6 +289,9 @@ OPTION 输入.storagevehicle_code <> "" procedureoffline.storagevehicle_code = 输入.storagevehicle_code ENDOPTION + OPTION 输入.material_id <> "" + procedureoffline.material_id = 输入.material_id + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue b/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue index 77222616..e92e72a9 100644 --- a/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue +++ b/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue @@ -72,9 +72,7 @@ export default { type: Boolean, default: false }, - openParam: { - type: String - } + openParam: {} }, data() { return { @@ -86,7 +84,8 @@ export default { dialogShow: { handler(newValue, oldValue) { this.dialogVisible = newValue - this.crud.query.storagevehicle_code = this.openParam + this.crud.query.storagevehicle_code = this.openParam.storagevehicle_code + this.crud.query.material_code = this.openParam.material_code } } }, diff --git a/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue b/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue index 0b3f967e..e7feb327 100644 --- a/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/sendOutQuery/index.vue @@ -217,7 +217,7 @@ export default { currentRow: {}, Depts: [], resultPutDialog: false, - openParam: null, + openParam: {}, query_flag: true, passList: [ { 'label': '未出库', 'value': '0' }, @@ -264,7 +264,8 @@ export default { }) }, openBucket(row) { - this.openParam = row.storagevehicle_code + this.openParam.storagevehicle_code = row.storagevehicle_code + this.openParam.material_code = row.material_code this.bucketDialog = true }, orgFormat(row) {