From e7e55249afe6f1b167439ca50ca95adc9ea5f7c6 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 13 Apr 2023 16:38:03 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=90=88=E5=90=8C=E5=9C=A8=E9=80=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/wms/ql/wql/QL_ERP.wql | 13 +++++++++ .../rest/StatisticalReportController.java | 7 +++++ .../service/StatisticalReportService.java | 2 ++ .../impl/StatisticalReportServiceImpl.java | 13 +++++++-- mes/qd/src/api/wms/statistics/report.js | 9 +++++- .../wms/statistics/materPlan/StructIvt3.vue | 29 ++++++++++++++----- 6 files changed, 62 insertions(+), 11 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql index f2ef9e3a..574ab090 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql @@ -177,5 +177,18 @@ ENDQUERY ENDIF + IF 输入.flag = "7" + QUERY + SELECT + DISTINCT PURCHASE.NAME + FROM + PURCHASE_CONTRACT_VIEW PURCHASE + where + PURCHASE.STATUSFLAG = '1' + AND PURCHASE.DEL_FLAG = '0' + ENDSELECT + ENDQUERY + ENDIF + 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 268f06ca..185e504f 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 @@ -109,6 +109,13 @@ public class StatisticalReportController { return new ResponseEntity<>(statisticalReportService. query3(whereJson),HttpStatus.OK); } + @GetMapping("/supplier") + @Log("查询erp供应商") + @ApiOperation("查询erp供应商") + public ResponseEntity supplier(){ + return new ResponseEntity<>(statisticalReportService. + getSupplier(),HttpStatus.OK); + } @GetMapping("/query4") @Log("查询月生产计划") @ApiOperation("查询月生产计划") 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 622a19cb..cb533c0b 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 @@ -48,6 +48,8 @@ public interface StatisticalReportService { JSONArray query3(Map whereJson); + JSONArray getSupplier(); + JSONArray query4(Map whereJson); 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 01e70b6b..c70521e0 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 @@ -347,10 +347,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONObject map = new JSONObject(); map.put("flag", "4"); map.put("ext_id", jsonMater.getString("ext_id")); -// JSONObject num_jo = null; + JSONObject num_jo = null; - JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); + // JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); @@ -586,6 +586,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { return ja; } + @Override + public JSONArray getSupplier() { + JSONArray ja = WQL.getWO("QL_ERP") + .setDbname("dataSource1") + .addParam("flag", "7") + .process().getResultJSONArray(0); + return ja; + } + @Override public JSONArray query4(Map whereJson) { HashMap map = new HashMap<>(whereJson); diff --git a/mes/qd/src/api/wms/statistics/report.js b/mes/qd/src/api/wms/statistics/report.js index 722453fa..7a713c58 100644 --- a/mes/qd/src/api/wms/statistics/report.js +++ b/mes/qd/src/api/wms/statistics/report.js @@ -46,6 +46,13 @@ export function query3(params) { }) } +export function supplier() { + return request({ + url: 'api/statistical/supplier', + method: 'get' + }) +} + export function query4(params) { return request({ url: 'api/statistical/query4', @@ -62,4 +69,4 @@ export function confirmOutStore(data) { }) } -export default { getHeader, getHeader2, materPlanDtlQuery, query1, query2, query3, query4, confirmOutStore } +export default { getHeader, getHeader2, materPlanDtlQuery, query1, query2, query3, query4, supplier, confirmOutStore } diff --git a/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue b/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue index 4204f949..8e130900 100644 --- a/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue +++ b/mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue @@ -28,14 +28,22 @@ :value="item.material_id" /> - 供应商: + 供应商: + + + { + debugger + this.Depts = res + }) }, /** * 接受父组件传值