From 1b539a22bbe403d40d22c0f3b8e65f16e334e861 Mon Sep 17 00:00:00 2001 From: qinx <2562295436@qq.com> Date: Fri, 3 Mar 2023 08:57:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mes=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/WmsToJnService.java | 18 ++++++++++++++++++ .../acs/service/impl/WmsToJnServiceImpl.java | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java index b6ab099..f6d2f08 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java @@ -144,4 +144,22 @@ public interface WmsToJnService { */ Map feedBackTrayBak(Map whereJson); + + /** + * 更新工单开始 + * + * @param + * @return Map + */ + + Map feedBackStartWorkShop(Map whereJson); + + /** + * 更新工单结束 + * + * @param + * @return Map + */ + + Map feedBackFinishWorkShop(Map whereJson); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index 7ee3969..fd6faf2 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -862,7 +862,7 @@ public class WmsToJnServiceImpl implements WmsToJnService { String method = "/TrayBak"; String vehicle_code = (String) whereJson.get("vehicle_code"); JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "15").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); - jsonObject.put("RO",DateUtil.now()); + jsonObject.put("outdate",DateUtil.now()); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); obj.put("stringData", jsonObject.toString()); @@ -901,4 +901,15 @@ public class WmsToJnServiceImpl implements WmsToJnService { log.info("诺力请求嘉耐反馈钢托盘回收出参{}", returnResultMsg); return null; } + + @Override + public Map feedBackStartWorkShop(Map whereJson) { + String + return null; + } + + @Override + public Map feedBackFinishWorkShop(Map whereJson) { + return null; + } } From 0a18ace3ea63a55394c23086a860ea47bfbbb710 Mon Sep 17 00:00:00 2001 From: qinx <2562295436@qq.com> Date: Fri, 3 Mar 2023 09:22:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?mes=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index fd6faf2..f7cdfe7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -904,7 +904,6 @@ public class WmsToJnServiceImpl implements WmsToJnService { @Override public Map feedBackStartWorkShop(Map whereJson) { - String return null; } From a847bfda74309612519c4ad7999378f61c6a71ec Mon Sep 17 00:00:00 2001 From: qinx <2562295436@qq.com> Date: Mon, 6 Mar 2023 14:18:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=9Facs=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 23 ++++++++++++--- .../src/main/resources/AutoAcsToWms.xml | 28 +++++++++++++++++++ .../main/resources/config/application-dev.yml | 4 +-- .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 5 ++-- 5 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 wms/hd/nladmin-system/src/main/resources/AutoAcsToWms.xml diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ffafdbb..dab5ec0 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -61,7 +61,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map receiveTaskFromAcs(Map jsonObject) { - log.debug("WCS的请求参数为:" + jsonObject); + log.debug("ACS的receiveTaskFromAcs请求参数为:" + jsonObject); String device_code = (String) jsonObject.get("device_code"); String type = (String) jsonObject.get("type"); String group_id = (String) jsonObject.get("group_id"); @@ -327,6 +327,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map manipulatorApply(Map jsonObject) { + log.debug("ACS的manipulatorApply请求参数为:" + jsonObject); String device_code = (String) jsonObject.get("device_code"); if (StrUtil.isEmpty(device_code)) { throw new BadRequestException("设备点位不能为空！"); @@ -450,6 +451,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map group(Map jsonObject) { + log.debug("ACS的group请求参数为:" + jsonObject); String task_code = jsonObject.get("task_code").toString(); String vehicle_code = jsonObject.get("vehicle_code").toString(); //永远判断生成不生成输送任务 @@ -532,10 +534,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map inKiln(Map jsonObject) { + log.debug("ACS的inKiln请求参数为:" + jsonObject); String vehicle_code = String.valueOf(jsonObject.get("vehicle_code")); KilnUtil.inKiln(vehicle_code); JSONObject jo = new JSONObject(); - jo.put("vehicle_code",vehicle_code); + jo.put("vehicle_code", vehicle_code); //调用wms的接口 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); wmsToJnService.feedBackInKiln(jo); @@ -549,6 +552,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map ispackage(Map jsonObject) { + log.debug("ACS的ispackage请求参数为:" + jsonObject); String vehicle_code = jsonObject.get("vehicle_code").toString(); if (StrUtil.isEmpty(vehicle_code)) { throw new BadRequestException("托盘条码不能为空！"); @@ -573,7 +577,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { KilnUtil.outKiln(vehicle_code); JSONObject jo = new JSONObject(); - jo.put("vehicle_code",vehicle_code); + jo.put("vehicle_code", vehicle_code); //调用wms的接口 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); wmsToJnService.feedBackOutKiln(jo); @@ -588,6 +592,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map getEmptyVehicle_code(Map jsonObject) { + log.debug("ACS的getEmptyVehicle_code请求参数为:" + jsonObject); //获取一个空的托盘号 String code = "VEHICCLE_CODE_MTP"; String vehicle_type = "03"; @@ -617,6 +622,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map getDevicecodeByVehicle_ype(Map jsonObject) { + log.debug("ACS的getDevicecodeByVehicle_ype请求参数为:" + jsonObject); String vehicle_type = (String) jsonObject.get("vehicle_type"); if (StrUtil.isEmpty(vehicle_type)) { throw new BadRequestException("托盘类型不能为空！"); @@ -634,6 +640,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map getVehicleInfoBycode(Map jsonObject) { + log.debug("ACS的getVehicleInfoBycode请求参数为:" + jsonObject); String device_code = (String) jsonObject.get("device_code"); WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); String vehicle_code = point_table.query("point_code='" + device_code + "'").uniqueResult(0).getString("vehicle_code"); @@ -654,6 +661,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map sureProduceTask(Map jsonObject) { + log.debug("ACS的sureProduceTask请求参数为:" + jsonObject); String producetask_code = (String) jsonObject.get("producetask_code"); String device_code = (String) jsonObject.get("device_code"); String material_code = (String) jsonObject.get("material_code"); @@ -700,7 +708,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (StrUtil.equals("FJJXS1", device_code) || StrUtil.equals("FJJXS2", device_code) || StrUtil.equals("FJJXS3", device_code)) { //调用mes接口 HashMap map = new HashMap(); - map.put("producetask_code",producetask_code); + map.put("producetask_code", producetask_code); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); wmsToJnServiceImpl.feedBackPackWordShop(map); } @@ -721,6 +729,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public void updateVehicleType(Map jsonObject) { + log.debug("ACS的updateVehicleType请求参数为:" + jsonObject); String vehicle_type = (String) jsonObject.get("vehicle_type"); if (vehicle_type.equals("1")) { vehicle_type = "03"; @@ -758,6 +767,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public Map receiveTaskStatusAcs(String string) { { JSONArray array = JSONArray.parseArray(string); + log.debug("ACS的receiveTaskStatusAcs请求参数为:" + array); //返回处理失败的任务 JSONArray errArr = new JSONArray(); for (int i = 0; i < array.size(); i++) { @@ -822,6 +832,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map CribbingInfoByCode(String material_code) { + log.debug("ACS的CribbingInfoByCode请求参数为:" + material_code); if (StrUtil.isEmpty(material_code)) { throw new BadRequestException("物料条码不能为空！"); } @@ -839,6 +850,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map receiveAgvStatus(JSONArray arr) { + log.debug("ACS的receiveAgvStatus请求参数为:" + arr); WQLObject deviceStatus_table = WQLObject.getWQLObject("st_buss_deviceStatus"); for (int i = 0; i < arr.size(); i++) { JSONObject jo = arr.getJSONObject(i); @@ -877,6 +889,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map queryCribbingInfo(Map jsonObject) { + log.debug("ACS的queryCribbingInfo请求参数为:" + jsonObject); String device_code = (String) jsonObject.get("device_code"); WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); JSONObject produceInfoByCode = this.getProduceInfoByCode(device_code); @@ -901,6 +914,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map queryPrintInfoByCode(Map jsonObject) { + log.debug("ACS的queryPrintInfoByCode请求参数为:" + jsonObject); //找出最近的一个到包装位的任务 JSONObject taskObj = WQLObject.getWQLObject("sch_base_task").query("next_point_code='BZSLW' and is_delete='0' and task_type='07'", "update_time desc").uniqueResult(0); JSONObject result = WQL.getWO("ACSTOMES_001").addParam("flag", "9").addParam("task_id", taskObj.getString("task_id")).process().uniqueResult(0); @@ -910,6 +924,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public Map deleteTask(Map jsonObject) { + log.debug("ACS的deleteTask请求参数为:" + jsonObject); String task_code = jsonObject.get("task_code").toString(); WQLObject task_table = WQLObject.getWQLObject("sch_base_task"); WQLObject group_table = WQLObject.getWQLObject("st_buss_vehiclegroup"); diff --git a/wms/hd/nladmin-system/src/main/resources/AutoAcsToWms.xml b/wms/hd/nladmin-system/src/main/resources/AutoAcsToWms.xml new file mode 100644 index 0000000..35dd6c5 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/resources/AutoAcsToWms.xml @@ -0,0 +1,28 @@ + + + + + + + + + ${LOG_HOME}/AutoAcsToWms/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + + + + + diff --git a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml index 1fd5203..1654c34 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -7,11 +7,11 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy #url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:jl_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:jl_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:jn_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} #password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:root} - password: ${DB_PWD:Root.123456} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/wms/hd/nladmin-system/src/main/resources/config/application.yml b/wms/hd/nladmin-system/src/main/resources/config/application.yml index c7ad90c..e124131 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: 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 a667e32..cdbb146 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -20,6 +20,7 @@ https://juejin.cn/post/6844903775631572999 + @@ -59,7 +60,7 @@ https://juejin.cn/post/6844903775631572999 - + @@ -109,7 +110,7 @@ https://juejin.cn/post/6844903775631572999 - +