From e528ceecdfbc90b995e5cfe435a8ef9fe829d81c Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Mon, 31 Oct 2022 14:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/dp/rest/BigScreenController.java | 3 -- .../core/service/impl/DumpinvServiceImpl.java | 18 ++++---- .../java/org/nl/wms/st/wql/QST_DUMP00.wql | 4 ++ .../src/main/resources/logback-spring.xml | 43 ++++++++++++++++++- .../src/views/wms/st/core/dumpinv/index.vue | 4 +- wms/qd/src/views/wms/st/core/inbill/index.vue | 2 +- 6 files changed, 59 insertions(+), 15 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/rest/BigScreenController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/rest/BigScreenController.java index d599023..c745a61 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/rest/BigScreenController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/rest/BigScreenController.java @@ -28,20 +28,17 @@ public class BigScreenController { private final BigScreenService bigScreenService; @PostMapping("/screenlogin") - @Log("大屏登陆验证") @ApiOperation("大屏登陆验证") public ResponseEntity handlogin(@RequestBody Map whereJson) { return new ResponseEntity<>(bigScreenService.handleLogin(whereJson), HttpStatus.OK); } @PostMapping("/shLargeScreen") - @Log("大屏熟化存储区查询") @ApiOperation("大屏熟化存储区查询") public ResponseEntity queryShLargeScreen(@RequestBody Map whereJson) { return new ResponseEntity<>(bigScreenService.queryShLargeScreen(whereJson), HttpStatus.OK); } @PostMapping("/hwLargeScreen") - @Log("大屏恒温存储区查询") @ApiOperation("大屏恒温存储区查询") public ResponseEntity queryHwLargeScreen(@RequestBody Map whereJson) { return new ResponseEntity<>(bigScreenService.queryHwLargeScreen(whereJson), HttpStatus.OK); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java index 636a29f..e22ce03 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java @@ -39,6 +39,7 @@ public class DumpinvServiceImpl implements DumpinvService { HashMap param = new HashMap<>(); param.put("flag", "1"); param.put("bill_status", (String) whereJson.get("bill_status")); + param.put("bill_code", (String) whereJson.get("name")); JSONObject result = WQL.getWO("QST_DUMP00").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "dump.update_time desc"); return result; } @@ -83,15 +84,15 @@ public class DumpinvServiceImpl implements DumpinvService { map.put("flag", "1"); map.put("label_uuid", label_uuid); JSONObject materialObj = WQLObject.getWQLObject("md_base_materiallabelmst").query("label_uuid='" + label_uuid + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(materialObj)){ + if (ObjectUtil.isEmpty(materialObj)) { throw new BadRequestException("未找到该物料批次的信息!"); } String material_code = materialObj.getString("material_code"); - JSONArray turnInArr = new JSONArray(); - if (StrUtil.equals(material_code,"1")){ - turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like'%01层%'").getResultJSONArray(0); - }else { - turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like'%01层%'").getResultJSONArray(0); + JSONArray turnInArr = new JSONArray(); + if (StrUtil.equals(material_code, "1")) { + turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like'%01层%'").getResultJSONArray(0); + } else { + turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like'%01层%'").getResultJSONArray(0); } @@ -150,10 +151,11 @@ public class DumpinvServiceImpl implements DumpinvService { String point_codeflag = turnOutObj.getString("point_code"); point_codeflag = point_codeflag.substring(point_codeflag.length() - 2); JSONArray turnInArr = new JSONArray(); - if (StrUtil.equals("01", point_codeflag)){ + if (StrUtil.equals("01", point_codeflag)) { turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like '%1层%'").getResultJSONArray(0); + } else { + turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like '%1层%'").getResultJSONArray(0); } - turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like '%1层%'").getResultJSONArray(0); json.put("turnin_struct_uuid", turnInArr.getJSONObject(0).optString("point_uuid")); json.put("vehicle_code", turnOutObj.optString("vehicle_code")); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_DUMP00.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_DUMP00.wql index 79fd0e2..5568de1 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_DUMP00.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_DUMP00.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.bill_status TYPEAS s_string 输入.task_uuid TYPEAS s_string + 输入.bill_code TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -62,6 +63,9 @@ OPTION 输入.bill_status <> "" dump.bill_status = 输入.bill_status ENDOPTION + OPTION 输入.bill_code <> "" + dump.bill_code = 输入.bill_code + ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml index fe45d3c..cfefec2 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -56,10 +56,51 @@ https://juejin.cn/post/6844903775631572999 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wms/qd/src/views/wms/st/core/dumpinv/index.vue b/wms/qd/src/views/wms/st/core/dumpinv/index.vue index 0beb0eb..80ebdb3 100644 --- a/wms/qd/src/views/wms/st/core/dumpinv/index.vue +++ b/wms/qd/src/views/wms/st/core/dumpinv/index.vue @@ -134,8 +134,8 @@ - - + + diff --git a/wms/qd/src/views/wms/st/core/inbill/index.vue b/wms/qd/src/views/wms/st/core/inbill/index.vue index b9daa48..b4addea 100644 --- a/wms/qd/src/views/wms/st/core/inbill/index.vue +++ b/wms/qd/src/views/wms/st/core/inbill/index.vue @@ -112,7 +112,7 @@ - +