diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java index cb11aef4..e1286806 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java @@ -123,4 +123,11 @@ public class StatisticalReportController { statisticalReportService.download(response, whereJson); } + @GetMapping("/bucketQuery") + @Log("线下桶记录查询") + @ApiOperation("线下桶记录查询") + public ResponseEntity bucketQuery(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(statisticalReportService.bucketQuery(whereJson, page), HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java index 9b444f76..eac429fb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java @@ -65,4 +65,12 @@ public interface StatisticalReportService { * @param whereJson */ void download(HttpServletResponse response,Map whereJson); + + /** + * + * @param whereJson + * @param page + * @return + */ + Map bucketQuery(Map whereJson, Pageable page); } 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 1372025d..6d67bd75 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 @@ -649,4 +649,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { FileUtil.downloadExcel(excelData, response); } } + + @Override + public Map bucketQuery(Map whereJson, Pageable page) { + // 仓位属性表【ST_IVT_StructAttr】 + Object storagevehicleCode = whereJson.get("storagevehicle_code"); + Map paramMap = new HashMap<>(); + paramMap.put("storagevehicle_code",storagevehicleCode); + 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 01f9b85e..242d97e4 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 @@ -20,6 +20,7 @@ 输入.end_date TYPEAS s_string 输入.pcsn TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.storagevehicle_code TYPEAS s_string 输入.bill_code TYPEAS s_string 输入.io_type TYPEAS s_string 输入.buss_type TYPEAS s_string @@ -262,4 +263,29 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "6" + PAGEQUERY + SELECT + procedureoffline.storagevehicle_code, + procedureoffline.bucketunique, + mb.material_code, + mb.material_id, + mb.material_name, + mb.material_model, + mb.material_spec, + procedureoffline.pcsn, + procedureoffline.qty, + procedureoffline.qty_unit_name + FROM + pdm_bi_procedureoffline procedureoffline + LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id + WHERE + 1 = 1 + OPTION 输入.storagevehicle_code <> "" + procedureoffline.storagevehicle_code = 输入.storagevehicle_code + 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 d8f0cf4d..54a5f1c1 100644 --- a/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue +++ b/mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue @@ -31,17 +31,11 @@ - - - - - - - + + - @@ -52,16 +46,15 @@ import CRUD, { presenter, header } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import crudOrderproc from '@/api/wms/pcs/orderproc' -import BagDialog from '@/views/wms/statistics/ivtQuery/BagDialog' export default { name: 'ReceiveDialog', dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable'], - components: { crudOperation, pagination, BagDialog }, + components: { crudOperation, pagination }, mixins: [presenter(), header()], cruds() { return CRUD({ - url: 'api/ivtQuery/bucketQuery', + url: 'api/statistical/bucketQuery', idField: 'id', sort: 'id,desc', crudMethod: { ... crudOrderproc }, @@ -87,7 +80,6 @@ export default { return { dialogVisible: false, openParamOne: null, - bagDialog: false } }, watch: { @@ -124,7 +116,6 @@ export default { }, openBag(row) { this.openParamOne = row.bucketunique - this.bagDialog = true } } }