From ad6498005020adc52927980ce9d44a3933225569 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 18 Apr 2023 14:02:15 +0800 Subject: [PATCH 1/4] =?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/acs/rest/WmsToAcsController.java | 21 ++ .../wms/ext/acs/service/WmsToAcsService.java | 19 ++ .../acs/service/impl/WmsToAcsServiceImpl.java | 221 ++++++++++++++++++ lms/nladmin-ui/src/assets/images/home_agv.png | Bin 0 -> 8831 bytes .../src/views/wms/agvrush/charge/BarChart.vue | 110 +++++++++ .../views/wms/agvrush/charge/chargeQuery.js | 17 ++ .../src/views/wms/agvrush/charge/index.vue | 201 ++++++++++++++++ .../src/views/wms/sendout/outone/index.vue | 1 - 8 files changed, 589 insertions(+), 1 deletion(-) create mode 100644 lms/nladmin-ui/src/assets/images/home_agv.png create mode 100644 lms/nladmin-ui/src/views/wms/agvrush/charge/BarChart.vue create mode 100644 lms/nladmin-ui/src/views/wms/agvrush/charge/chargeQuery.js create mode 100644 lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java index 581ec4f23..a8b3c735d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java @@ -104,5 +104,26 @@ public class WmsToAcsController { return new ResponseEntity<>(wmsToAcsService.putPlusPullAction(jo), HttpStatus.OK); } + @PostMapping("/unLock") + @Log(value = "给ACS下发修立库点位解锁", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) + @ApiOperation("给ACS下发修立库点位解锁") + public ResponseEntity unLock(@RequestBody JSONObject jo) { + return new ResponseEntity<>(wmsToAcsService.unLock(jo), HttpStatus.OK); + } + + @PostMapping("/queryDeviceInfo") + @Log(value = "LMS向acs请求设备信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) + @ApiOperation("LMS向acs请求设备信息") + public ResponseEntity queryDeviceInfo(@RequestBody JSONObject jo) { + return new ResponseEntity<>(wmsToAcsService.queryDeviceInfo(jo), HttpStatus.OK); + } + + @PostMapping("/sendAgvChargeTask") + @Log(value = "LMS下发AGV充电任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) + @ApiOperation("LMS下发AGV充电任务") + public ResponseEntity sendAgvChargeTask(@RequestBody JSONObject jo) { + return new ResponseEntity<>(wmsToAcsService.sendAgvChargeTask(jo), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index f46dc9c35..b3718c660 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -77,5 +77,24 @@ public interface WmsToAcsService { */ JSONObject putPlusPullAction(JSONObject jo); + /** + * 给ACS下发修立库点位解锁 + * @param jo / + * @return JSONObject + */ + JSONObject unLock(JSONObject jo); + /** + * lms向acs请求设备信息 + * @param jo / + * @return JSONObject + */ + JSONObject queryDeviceInfo(JSONObject jo); + + /** + * LMS下发AGV充电任务 + * @param jo / + * @return JSONObject + */ + JSONObject sendAgvChargeTask(JSONObject jo); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index f7564cf53..60c10324f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -111,4 +111,225 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { return result; } + @Override + public JSONObject unLock(JSONObject whereJson) { + String api = "api/wms/unLock"; + //判断是否连接ACS系统 + String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue(); + JSONObject result = new JSONObject(); + if (StrUtil.equals("0", isConnect)) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "下发成功，但未连接ACS!"); + result.put("data", new JSONObject()); + return result; + } + + //ACS地址：127.0.0.1:8010 + String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); + + String url = acsUrl + api; + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(whereJson)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + + } catch (Exception e) { + String msg = e.getMessage(); + //ConnectException: Connection refused: connect + //网络不通 + System.out.println(msg); + result.put("status", HttpStatus.BAD_REQUEST); + result.put("message", "网络不通,操作失败!"); + result.put("data", new JSONObject()); + } + //acs抛异常这里 + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException("解锁失败："+result.getString("message")); + } + return result; + } + + /* + 对应车间： + A1车间对应车号：2,3 + A2车间对应车号： + A3车间对应车号： + A4车间对应车号： + LK车间对应车号：1 + */ + @Override + public JSONObject queryDeviceInfo(JSONObject whereJson) { + String api = "api/wms/queryDeviceInfo"; + //判断是否连接ACS系统 + String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue(); + JSONObject result = new JSONObject(); + if (StrUtil.equals("0", isConnect)) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "下发成功，但未连接ACS!"); + result.put("data", new JSONArray()); + + /* // 测试数据 + JSONArray data = result.getJSONArray("data"); + JSONObject a = new JSONObject(); + a.put("electricity", "86"); + a.put("status_name", "空闲"); + a.put("car_no", "1"); + a.put("task_code", ""); + a.put("fault", ""); + data.add(a); + + JSONObject b = new JSONObject(); + b.put("electricity", "13"); + b.put("status_name", "执行中"); + b.put("car_no", "2"); + b.put("task_code", "000001"); + b.put("fault", "取货失败"); + data.add(b); + + JSONObject c = new JSONObject(); + c.put("electricity", "100"); + c.put("status_name", "充电中"); + c.put("car_no", "3"); + c.put("task_code", "000002"); + c.put("fault", ""); + data.add(c); + + JSONObject nowJson = new JSONObject(); // 返回数据 + JSONArray ArrA1 = new JSONArray(); // A1车间 + JSONArray ArrLk = new JSONArray(); // LK车间 + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + + if ("2,3".contains(json.getString("car_no"))) { + ArrA1.add(json); + } + if ("1".contains(json.getString("car_no"))) { + ArrLk.add(json); + } + } + nowJson.put("jsonA1",ArrA1); + nowJson.put("jsonLK",ArrLk); + result.put("data", nowJson);*/ + + return result; + } + + //ACS地址：127.0.0.1:8010 + String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); + + String url = acsUrl + api; + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(whereJson)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + + // 重新组织数据 + JSONArray data = result.getJSONArray("data"); + + JSONObject nowJson = new JSONObject(); // 返回数据 + JSONArray ArrA1 = new JSONArray(); // A1车间 + JSONArray ArrLk = new JSONArray(); // LK车间 + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + + if ("2,3".contains(json.getString("car_no"))) { + ArrA1.add(json); + } + if ("1".contains(json.getString("car_no"))) { + ArrLk.add(json); + } + } + nowJson.put("jsonA1",ArrA1); + nowJson.put("jsonLK",ArrLk); + result.put("data", nowJson); + + } catch (Exception e) { + String msg = e.getMessage(); + //ConnectException: Connection refused: connect + //网络不通 + System.out.println(msg); + result.put("status", HttpStatus.BAD_REQUEST); + result.put("message", "网络不通,操作失败!"); + result.put("data", new JSONArray()); + } + //acs抛异常这里 + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException("查询失败："+result.getString("message")); + } + return result; + } + + /* + 对应系统： + 车号1对应系统：1 + 车号2、3对应系统：2 + */ + @Override + public JSONObject sendAgvChargeTask(JSONObject whereJson) { + String api = "api/wms/sendAgvChargeTask"; + //判断是否连接ACS系统 + String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue(); + JSONObject result = new JSONObject(); + if (StrUtil.equals("0", isConnect)) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "下发成功，但未连接ACS!"); + result.put("data", new JSONObject()); + + /* // 测试数据 + String car_no = whereJson.getString("car_no"); + + JSONObject jsonParam = new JSONObject(); + if ("2,3".contains(car_no)) { + jsonParam.put("avg_system", "2"); + jsonParam.put("car_no", car_no); + } else if ("1".contains(car_no)) { + jsonParam.put("avg_system", "1"); + jsonParam.put("car_no", car_no); + }*/ + + return result; + } + + //ACS地址：127.0.0.1:8010 + String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); + + String url = acsUrl + api; + + // 判断此此号属于哪个系统 + String car_no = whereJson.getString("car_no"); + + JSONObject jsonParam = new JSONObject(); + if ("2,3".contains(car_no)) { + jsonParam.put("avg_system", "2"); + jsonParam.put("car_no", car_no); + } else if ("1".contains(car_no)) { + jsonParam.put("avg_system", "1"); + jsonParam.put("car_no", car_no); + } + + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(jsonParam)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + result.put("status", HttpStatus.BAD_REQUEST); + result.put("message", "网络不通,操作失败!"); + result.put("data", new JSONObject()); + } + //acs抛异常这里 + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException("下发失败："+result.getString("message")); + } + return result; + } + } diff --git a/lms/nladmin-ui/src/assets/images/home_agv.png b/lms/nladmin-ui/src/assets/images/home_agv.png new file mode 100644 index 0000000000000000000000000000000000000000..d73781d864107f8a474f15441f0fc1030c6cd23b GIT binary patch literal 8831 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 dA +
+ + + diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/chargeQuery.js b/lms/nladmin-ui/src/views/wms/agvrush/charge/chargeQuery.js new file mode 100644 index 000000000..c182eee0c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/chargeQuery.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function queryDeviceInfo(data) { // 获取设备信息 + return request({ + url: 'api/wms/task/queryDeviceInfo', + method: 'post', + data: data + }) +} + +export function sendAgvChargeTask(data) { // 下发AGV充电任务 + return request({ + url: 'api/wms/task/sendAgvChargeTask', + method: 'post', + data: data + }) +} diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue new file mode 100644 index 000000000..5addd0224 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue b/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue index f7a2d070b..aa65a3386 100644 --- a/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue +++ b/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue @@ -138,7 +138,6 @@ export default { // 展开显示设备信息 todo: 1 if (data.data.type !== 'pro-rect' && data.data.type !== 'pro-circle' && data.data.type !== 'triangle' && data.data.type !== 'rect-radius') { if (data.data.properties.struct_id) { - debugger this.moveShow(data.data) // 传递节点数据，用来获取id做比对 this.dialogDeviceMsgVisible = true this.struct_id = data.data.properties.struct_id // ?暂时没用 From 49a0c619381dc61b8d26d5a5237605d3c325ff29 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 18 Apr 2023 21:25:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E7=BA=B8=E7=AE=A1=E5=BA=93=E3=80=81?= =?UTF-8?q?=E7=AB=8B=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paper_tube_device/ItemProtocol.java | 4 +++ .../PaperTubeConveyorDeviceDriver.java | 10 ++++-- .../SiemensConveyorDeviceDriver.java | 8 ++--- .../liKuData/OutConfirmReportResponse.java | 12 +++++++ .../ext/wms/liKuData/OutConfirmRequest.java | 14 ++++++++ .../acs/ext/wms/rest/AcsToLiKuController.java | 7 ++++ .../acs/ext/wms/rest/WmsToAcsController.java | 7 ++++ .../acs/ext/wms/service/AcsToLiKuService.java | 4 +++ .../acs/ext/wms/service/WmsToAcsService.java | 8 +++++ .../service/impl/AcsToLiKuServiceImpl.java | 16 ++++++++++ .../wms/service/impl/WmsToAcsServiceImpl.java | 32 +++++++++++++++++++ .../nl/acs/opc/DeviceOpcProtocolRunable.java | 31 +++++++++++++++++- .../acs/device/driver/paper_tube_conveyor.vue | 8 +---- 13 files changed, 146 insertions(+), 15 deletions(-) create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmReportResponse.java create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmRequest.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/ItemProtocol.java index 0404160bb..5f6d4454e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/ItemProtocol.java @@ -112,6 +112,10 @@ public class ItemProtocol { return list; } + @Override + public String toString() { + return ""; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java index 11944f625..38928bf5e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java @@ -149,12 +149,16 @@ public class PaperTubeConveyorDeviceDriver extends AbstractOpcDeviceDriver imple } else if (this.getMode() == 2) { mode = "联机"; } else if (this.getMode() == 3) { - mode = "运行中"; + mode = "入库中"; + } else if (this.getMode() == 4) { + mode = "出库中"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); - jo.put("isOnline", this.getIsonline()); - jo.put("isError", this.getIserror()); + jo.put("inventory_qty", inventory_qty); + jo.put("out_finish", out_finish); + jo.put("material", material); + return jo; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 26e4394c7..605c7596f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -870,10 +870,10 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { message = "申请空盘入库任务中..."; - if(taskserver.querySameOriginTask(this.device_code) > 0 ){ - message = "已存在空盘出库任务不再请求"; - return; - } +// if(taskserver.querySameOriginTask(this.device_code) > 0 ){ +// message = "已存在空盘出库任务不再请求"; +// return; +// } JSONObject apply = new JSONObject(); apply.put("device_code", device_code); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmReportResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmReportResponse.java new file mode 100644 index 000000000..9a088c0bc --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmReportResponse.java @@ -0,0 +1,12 @@ +package org.nl.acs.ext.wms.liKuData; + +import lombok.Data; + +/** + * 出库任务库位解锁Data类 + * @author: wangs + * @createDate: 2022/11/24 + */ +@Data +public class OutConfirmReportResponse extends BaseResponseData { +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmRequest.java new file mode 100644 index 000000000..7217c6333 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/OutConfirmRequest.java @@ -0,0 +1,14 @@ +package org.nl.acs.ext.wms.liKuData; + +import lombok.Data; + +/** + * 出库库位解锁 请求参数类 + * + * @author: wangs by + * @createDate: 2022/11/24 + */ +@Data +public class OutConfirmRequest extends BaseStoreRequest { + String outPortNo; +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java index 494393c02..beedf6fa4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java @@ -111,4 +111,11 @@ public class AcsToLiKuController { return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); } + @PostMapping("/outConfirm") + @Log(value = "下发解锁出库口",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) + @ApiOperation("下发解锁出库口") + public ResponseEntity outConfirm(@RequestBody OutConfirmRequest requestParam) { + return new ResponseEntity<>(acsToLiKuService.outConfirm(requestParam), HttpStatus.OK); + } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index b004859c4..cf8012a22 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java @@ -39,6 +39,13 @@ public class WmsToAcsController { return new ResponseEntity<>(wmstoacsService.crateTask(whereJson), HttpStatus.OK); } + @PostMapping("/unLock") + @Log(value = "解锁立库点位",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) + @ApiOperation("解锁立库点位") + public ResponseEntity unLock(@RequestBody String whereJson) { + return new ResponseEntity<>(wmstoacsService.unLock(whereJson), HttpStatus.OK); + } + @PostMapping("/cancelTask") @Log(value = "WMS取消任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) @ApiOperation("WMS取消任务") diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java index 60c427e7b..58d5290ff 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java @@ -88,6 +88,10 @@ public interface AcsToLiKuService { * @return */ public Resp querySsxDeviceStatus(DeviceStatusRequest requestParam); + + + public Resp outConfirm(OutConfirmRequest requestParam); + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java index 7890352df..1aae7354d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java @@ -19,6 +19,14 @@ public interface WmsToAcsService { CreateTaskResponse crateTask(String whereJson); + /** + * 解锁立库点位 + * + * @param jsonObject 条件 + * @return + */ + Map unLock(String jsonObject); + /** * 取消任务 * diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java index 1bdb2e8e9..3c2b00d47 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java @@ -204,6 +204,22 @@ public class AcsToLiKuServiceImpl implements AcsToLiKuService { } } + + @Override + public Resp outConfirm(OutConfirmRequest requestParam) { + try { + MDC.put(log_file_type, log_type); + log.info("outConfirm-----输入参数{}", JSON.toJSONString(requestParam)); + String api = addressService.findByCode("outConfirm").getMethods_url(); + String result = AcsUtil.notifyAcs(api, requestParam); + log.info("outConfirm-----输出参数{}", result); + return RespUtil.getResp(result, new OutConfirmRequest()); + } finally { + MDC.remove(log_file_type); + } + } + + @Override public Resp sendInst(String type, Instruction dto){ AcsToLiKuService acsToLiKuService = SpringContextHolder.getBean(AcsToLiKuService.class); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 0ad6c223e..2904daced 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -23,6 +23,9 @@ import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanne import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDefination; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.ext.wms.data.*; +import org.nl.acs.ext.wms.liKuData.DeviceStatusResponse; +import org.nl.acs.ext.wms.liKuData.OutConfirmReportResponse; +import org.nl.acs.ext.wms.liKuData.OutConfirmRequest; import org.nl.acs.ext.wms.liKuData.Resp; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.WmsToAcsService; @@ -769,6 +772,35 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } + @Override + public Map unLock(String param) { + try { + MDC.put(log_file_type, log_type); + log.info("unLock--------------:输入参数" + param); + JSONObject jo = JSONObject.parseObject(param); + String task_code = String.valueOf(jo.get("task_code")); + String device_code = String.valueOf(jo.get("device_code")); + String vehicle_code = String.valueOf(jo.get("vehicle_code")); + OutConfirmRequest outConfirmRequest = new OutConfirmRequest(); + outConfirmRequest.setOutPortNo(device_code); + outConfirmRequest.setPalletCode(vehicle_code); + + Resp resp = acsToLiKuService.outConfirm(outConfirmRequest); + + + } catch (Exception e) { + e.printStackTrace(); + log.info("unLock--------------:输出参数" + e.getMessage()); + } finally { + MDC.remove(log_file_type); + } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK.value()); + resultJson.put("message", "操作成功"); + log.info("unLock--------------:输出参数" + resultJson); + return resultJson; + } + @Override public Map updateTask(String whereJson) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index 531f767cf..c020e6280 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -12,6 +12,8 @@ import org.openscada.opc.lib.da.ItemState; import org.openscada.opc.lib.da.Server; import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; @Slf4j public class DeviceOpcProtocolRunable implements Runnable { @@ -20,6 +22,8 @@ public class DeviceOpcProtocolRunable implements Runnable { int error_num; String message; private Server server; + boolean flag =false; + public DeviceOpcProtocolRunable() { this.error_num = 0; @@ -172,10 +176,30 @@ public class DeviceOpcProtocolRunable implements Runnable { value = OpcUtl.getValue(item, itemState); his = accessor_value.getValue(item.getId()); if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) { + flag = true; log.warn("opc 值不健康 item: {}, 状态: {},当前读取值：{}, 系统内存值{} ", item.getId(), itemState.getQuality(), value, his); } + if(flag){ + if (this.server != null) { + try { + this.server.disconnect(); + } catch (Exception var25) { + log.warn("{} : server disconnect", var25); + } + } + DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable(); + runable.setProtocols(protocols); + runable.setOpcServer(OpcServer); + ExecutorService executorService = Executors.newCachedThreadPool(); + executorService.submit(runable); + log.warn("opc 值不健康 item: {}, 重新创建连接,当前线程名：{}", item.getId(),tag); + break; + } } while (ObjectUtil.equal(value, his));//如果两次的值相等，不走下面的代码 + if(flag){ + break; + } OpcItemDto itemDto = this.getItem(item.getId()); //默认记录日志 if (true) { @@ -197,7 +221,12 @@ public class DeviceOpcProtocolRunable implements Runnable { // accessor_value.getHistoryUnifiedData(item.getId()); //设置值 accessor_value.setValue(item.getId(), value); - + if(flag){ + break; + } + } + if(flag){ + break; } } } catch (Exception var30) { diff --git a/acs/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor.vue index 6184e0f15..032907b97 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor.vue @@ -369,9 +369,6 @@ export default { return } for (const val in this.data1) { - if (this.data1[val].code.indexOf('inventory_qty') !== -1) { - this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) - } if (this.data1[val].code.indexOf('inventory_qty') !== -1) { this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) } @@ -396,12 +393,9 @@ export default { return } for (const val in this.data2) { - if (this.data2[val].code.indexOf('to_target') !== -1) { + if (this.data2[val].code.indexOf('to_out_qty') !== -1) { this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) } - if (this.data2[val].code.indexOf('to_task') !== -1) { - this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6) - } } } }, From 5f3acc4ddc1f4c7cbcff9286047c4f20a00b0eaa Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 19 Apr 2023 10:37:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E6=8C=87=E4=BB=A4=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 8 ++++++-- .../org/nl/modules/system/util/CodeUtil.java | 16 +++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 2904daced..f05daf04e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -59,7 +59,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { private final ApplicationContext applicationContext; - private final InstructionService InstructionService; + private final InstructionService instructionService; private final TaskService taskService; private final DeviceService deviceService; private final DeviceAppService deviceAppService; @@ -784,7 +784,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { OutConfirmRequest outConfirmRequest = new OutConfirmRequest(); outConfirmRequest.setOutPortNo(device_code); outConfirmRequest.setPalletCode(vehicle_code); - + Instruction instruction = instructionService.findByCode(String.valueOf(task_code)); + if(ObjectUtil.isNotEmpty(instruction)){ + task_code = instruction.getInstruction_code(); + outConfirmRequest.setOrderId(task_code); + } Resp resp = acsToLiKuService.outConfirm(outConfirmRequest); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java index 982cd1b0d..ccfbf9825 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java @@ -7,13 +7,15 @@ import java.util.HashMap; public class CodeUtil { - public static synchronized String getNewCode(String ruleCode){ - GenCodeService service=new GenCodeServiceImpl(); - String flag = "1"; - HashMap map = new HashMap<>(); - map.put("flag",flag); - map.put("code",ruleCode); - return service.codeDemo(map); + public static String getNewCode(String ruleCode){ + synchronized (ruleCode) { + GenCodeService service=new GenCodeServiceImpl(); + String flag = "1"; + HashMap map = new HashMap<>(); + map.put("flag",flag); + map.put("code",ruleCode); + return service.codeDemo(map); + } } } From 86e005744587683735b46454aa436a9fbd824e49 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 19 Apr 2023 10:56:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E7=AB=8B=E5=BA=93=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=97=B6=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=AB=8B=E5=BA=93=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java | 2 +- .../java/org/nl/acs/instruction/service/InstructionService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index a09703451..0acfcf874 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -102,7 +102,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { // 5 取消指令 } else if(StrUtil.equals(status,"5")) { - instructionService.cancel(inst.getInstruction_id()); + instructionService.forceCancel(inst.getInstruction_id()); } InStoreReportResponse inStoreReportResponse = new InStoreReportResponse(); inStoreReportResponse.setOrderId(inst_code); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java index 1884f590c..5681fb899 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -178,7 +178,7 @@ public interface InstructionService { void cancel(String id) throws Exception; /** - * 取消指令 + * 强制取消指令 * * @param id */