From 9817f2dcc6c3805ee367c4414cfc868f75d39241 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sat, 20 Jan 2024 21:41:30 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/config/DruidFilter.java | 16 +++++++++------- .../org/nl/wms/pf/rest/FlourworkController.java | 10 ++++++++++ .../org/nl/wms/pf/service/FlourworkService.java | 1 + .../pf/service/impl/FlourworkServiceImpl.java | 11 +++++++++++ .../service/impl/HandMoveStorServiceImpl.java | 8 +++++++- .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 4 ++-- 7 files changed, 41 insertions(+), 11 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java index 434060a1..39287ecf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java @@ -46,14 +46,16 @@ public class DruidFilter extends FilterEventAdapter { try { count=statement.getUpdateCount(); }catch (Exception ex){ } - if (size>0 && count>0) { - Collection values = statement.getParameters().values(); - List params = new ArrayList<>(); - for (JdbcParameter value : values) { - params.add(value.getValue()); + if (count>0) { + if (size > 0) { + Collection values = statement.getParameters().values(); + List params = new ArrayList<>(); + for (JdbcParameter value : values) { + params.add(value.getValue()); + } + executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params); } - executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params); - log.info("[----SQL----][update][执行结果:{}][ SQL: {} ]",count,executeSql); + log.info("[----SQL----][update][ SQL: {} ]", executeSql); } super.statementExecuteAfter(statement, sql, result); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FlourworkController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FlourworkController.java index 174af66e..07530f0a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FlourworkController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FlourworkController.java @@ -93,6 +93,16 @@ public class FlourworkController { }, "autoCalledMater", 1); return new ResponseEntity<>(result.get(),HttpStatus.OK); } + @PostMapping("/autoCalledMater2") + @Log("自动叫料") + @ApiOperation("自动叫料") + public ResponseEntity autoCalledMater2(@RequestBody JSONObject whereJson){ + AtomicReference result = new AtomicReference<>(new JSONObject()); + RedissonUtils.lock(a -> { + result.set(flourworkService.autoCalledMater2(whereJson)); + }, "autoCalledMater", 1); + return new ResponseEntity<>(result.get(),HttpStatus.OK); + } @PostMapping("/startWork") @Log("开始作业") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java index b4c15444..6f0c4932 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java @@ -55,6 +55,7 @@ public interface FlourworkService { * @param whereJson / */ JSONObject autoCalledMater(JSONObject whereJson); + JSONObject autoCalledMater2(JSONObject whereJson); /** * 开始作业 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index 8652dd49..06b457f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -401,6 +401,17 @@ public class FlourworkServiceImpl implements FlourworkService { flourworkService.asyncdown(movList,SecurityUtils.getCurrentUserId(),SecurityUtils.getNickName()); return result; } + + @Override + public JSONObject autoCalledMater2(JSONObject whereJson) { + ArrayList striings = new ArrayList(); + JSONObject jsonObject = WQLObject.getWQLObject("sch_base_point").query("point_id ='" + "2021" + "'").uniqueResult(0); + striings.add("123123"); + striings.add("22222"); + flourworkService.asyncdown(striings, 12312L,"123213"); + return null; + } + @Override public void asyncdown(List movinvs,Long userid,String username){ try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 9dafe8c3..348dec0a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -930,6 +930,11 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { @Override public void handdown(JSONObject whereJson) { + HandMoveStorAcsTask handMoveStorAcsTask = new HandMoveStorAcsTask(); + + log.info("下发acs:{}","!23312"); + handMoveStorAcsTask.notifyAcs("!23312"); + log.info("下发acs反馈:{}","!23312"); //移库单主表 WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv"); //移库单明细表 @@ -937,7 +942,6 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); - HandMoveStorAcsTask handMoveStorAcsTask = new HandMoveStorAcsTask(); Long currentUserId = whereJson.getLong("currentUserId"); String nickName = whereJson.getString("nickName"); @@ -960,7 +964,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int i = 0; i < ja.size(); i++) { JSONObject jo = ja.getJSONObject(i); String taskdtl_id = jo.getString("taskdtl_id"); + log.info("下发acs:{}",taskdtl_id); JSONObject result = handMoveStorAcsTask.notifyAcs(taskdtl_id); + log.info("下发acs反馈:{}",taskdtl_id); JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(result)) { String status = result.getString("status"); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 949b17da..30f56233 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index db3c2a3a..9668241e 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -80,13 +80,13 @@ s - 512 + 2000 0 - 500 + 2000