From 2d0c08748f0e8833c09fa59a32113b78e0687c22 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Mon, 10 Apr 2023 17:33:42 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E6=9E=9A=E4=B8=BE=E5=88=A4=E6=96=AD?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/StatusEnum.java | 10 +++++----- .../impl/ProduceshiftorderServiceImpl.java | 20 +++++++++++-------- .../java/org/nl/wms/mps/wql/ONEPART_QUERY.wql | 1 + .../wms/pda/rest/CacheLineHandController.java | 12 +++++------ .../impl/CacheLineHandServiceImpl.java | 4 ++++ 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index 93a45376..54edfa23 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -53,11 +53,11 @@ public enum StatusEnum { START_CACHELINE("2","启动",""), //设备状态枚举1-关机、2-开机、3-生产中、4-待机、5-故障 - DEVICE_STATUS_OFF("1","启动",""), - DEVICE_STATUS_ON("2","启动",""), - DEVICE_STATUS_RUNING("3","启动",""), - DEVICE_STATUS_WAITING("4","启动",""), - DEVICE_STATUS_ERROR("5","启动",""), + DEVICE_STATUS_OFF("1","关机",""), + DEVICE_STATUS_ON("2","开机",""), + DEVICE_STATUS_RUNING("3","生产中",""), + DEVICE_STATUS_WAITING("4","待机",""), + DEVICE_STATUS_ERROR("5","故障",""), // 点位表点位状态 POINT_STATUS_EMPTY("1", "空位", ""), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java index 60b16410..0e1d95aa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java @@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.MapOf; import org.nl.common.utils.api.CommonResult; @@ -219,21 +220,24 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService{ List list = WQL.getWO("ONEPART_QUERY").addParam("flag", "1").addParam("condition", param).process().getResultJSONArray(0).toJavaList(DeviceDto.class); list.forEach(r -> { //状态为为关机 - if(StrUtil.isEmpty(r.getDevice_status())) { - r.setDevice_status("1"); - r.setDevice_status_name("关机"); - } - else{ + if(StrUtil.isNotEmpty(r.getDevice_status())) { //不是关机与故障状态则为运行 - if(!Objects.equals(r.getDevice_status(), "1") && !Objects.equals(r.getDevice_status(), "5")) { + if(!Objects.equals(r.getDevice_status(), StatusEnum.DEVICE_STATUS_OFF.getCode()) && !Objects.equals(r.getDevice_status(), StatusEnum.DEVICE_STATUS_ERROR.getCode())) { r.setIs_run("1"); + //todo 当前工单数 + r.setJob_count("1"); } else{ r.setIs_run("0"); + r.setJob_count("0"); } } - //todo 当前工单数 - r.setJob_count("1"); + else{ + r.setDevice_status(StatusEnum.DEVICE_STATUS_OFF.getCode()); + r.setDevice_status_name("关机"); + r.setIs_run("0"); + r.setJob_count("0"); + } }); return list; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql index 96db9508..d53b9c55 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql @@ -82,6 +82,7 @@ dict1.label shift_type_scode_name, dict2.label order_status_name, mater.material_name, + mater.material_code, workorder.shift_type_scode, workprocedure.workprocedure_name, workorder.workorder_status order_status, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java index 8f8f367a..79a79190 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java @@ -260,18 +260,18 @@ public class CacheLineHandController{ } @PostMapping("/agvOutBoxExceptionQuery") - @Log("AGV出箱异常-查询") - @ApiOperation("AGV出箱异常-查询") + @Log("AGV异常-查询") + @ApiOperation("AGV异常-查询") public ResponseEntity agvOutBoxExceptionQuery(@RequestBody JSONObject param) { - log.info("海亮缓存线手持服务 [AGV出箱异常-查询] 接口被请求, 请求参数-{}", param); + log.info("海亮缓存线手持服务 [AGV异常-查询] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.agvOutBoxExceptionQuery(param), HttpStatus.OK); } @PostMapping("/agvOutBoxExceptionConfirm") - @Log("AGV出箱异常-确认") - @ApiOperation("AGV出箱异常-确认") + @Log("AGV异常-确认") + @ApiOperation("AGV异常-确认") public ResponseEntity agvOutBoxExceptionConfirm(@RequestBody JSONObject param) { - log.info("海亮缓存线手持服务 [AGV出箱异常-确认] 接口被请求, 请求参数-{}", param); + log.info("海亮缓存线手持服务 [AGV异常-确认] 接口被请求, 请求参数-{}", param); cacheLineHandService.agvOutBoxExceptionConfirm(param); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java index 5de37f53..f29f7aaa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java @@ -574,7 +574,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ } } + /** + * 缓存线异常确认 + */ @Override + @Transactional(rollbackFor = Exception.class) public CommonResult cacheLineExcepOpt(JSONObject param) { // 缓存线编码 String wcsdevice_code = param.getString("wcsdevice_code");