diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index ac38b245..63187126 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -57,4 +57,11 @@ public interface WmsToAcsService { * @return */ Map replaceDevice(JSONArray arr); + + /** + * 变更设备电气信号 + * @param arr + * @return + */ + Map action(JSONArray arr); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 9f93f2b8..f36c814a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -97,4 +97,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ return AcsUtil.notifyAcs(api, arr); } + @Override + public Map action(JSONArray arr) { + String api = "api/wms/action"; + return AcsUtil.notifyAcs(api, arr); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java index 437616c2..2863e6f2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java @@ -240,6 +240,15 @@ public class CacheLineHandController { return new ResponseEntity<>(cacheLineHandService.deleteBox(param), HttpStatus.OK); } + @PostMapping("/check") + @Log("修改缓存线盘点状态") + @ApiOperation("修改缓存线盘点状态") + public ResponseEntity check(@RequestBody JSONObject param) { + log.info("海亮缓存线手持服务 [盘点] 接口被请求, 请求参数-{}", param); + cacheLineHandService.check(param); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/agvInBoxExceptionQuery") @Log("AGV入箱异常-查询") @ApiOperation("AGV入箱异常-查询") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java index cc916a94..77e2d448 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java @@ -251,7 +251,7 @@ public interface CacheLineHandService{ * @author gbx * @date 2023/3/24 */ - CommonResult cacheLineExcepOpt(JSONObject param); + JSONObject cacheLineExcepOpt(JSONObject param); /** * 倒料操作 @@ -292,4 +292,11 @@ public interface CacheLineHandService{ * @param param */ JSONObject deleteBox(JSONObject param); + + /** + * 删除箱子 + * + * @param param + */ + void check(JSONObject param); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java index 2b45fc5d..162c673d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java @@ -83,6 +83,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { private IMdMeMaterialbaseService materialbaseService; @Autowired private ISchBaseTaskService taskService; + @Autowired + private WmsToAcsService wmsToAcsService; @Override public JSONArray dropdownListQuery(String param, String type) { @@ -692,27 +694,19 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { */ @Override @Transactional(rollbackFor = Exception.class) - public CommonResult cacheLineExcepOpt(JSONObject param) { + public JSONObject cacheLineExcepOpt(JSONObject param) { // 缓存线编码 String wcsdevice_code = param.getString("wcsdevice_code"); // opt_type 1-暂停、2-启动,默认为1暂停 - String type = StatusEnum.PAUSE_CACHELINE.getCode(); String opt_type = param.getString("opt_type"); - if (StatusEnum.START_CACHELINE.getCode().equals(opt_type)) { - type = "0"; - } - JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); - //下发接收的,恢复是0,暂停是1 - jsonObject.put("type", type); + jsonObject.put("type", opt_type); //缓存线编码 - jsonObject.put("wcsdevice_code", wcsdevice_code); - jsonArray.add(jsonObject); - try { - return RestBusinessTemplate.execute(() -> AcsUtil.notifyAcs("api/wms/puaseCacheLine", jsonArray)); - } catch (NullPointerException e) { - throw new BadRequestException(e.toString()); - } + jsonObject.put("device_code", wcsdevice_code); + AcsUtil.notifyAcs("api/wms/puaseCacheLine", jsonObject); + JSONObject result = new JSONObject(); + result.put("message", "操作成功!"); + return result; } /** @@ -895,4 +889,31 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { } return res; } + + @Override + public void check(JSONObject param) { + String option = param.getString("option"); + if (StrUtil.isEmpty(option)) { + throw new BadRequestException("缺少关键参数option"); + } + + String device_code = param.getString("device_code"); + String code = ""; + if (option.equals("0")) { + code = "to_start_checking"; + } + if (option.equals("1")) { + code = "to_check_finish"; + } + String value = "1"; + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + jo.put("code", code); + jo.put("value", value); + + JSONArray ja = new JSONArray(); + ja.add(jo); + wmsToAcsService.action(ja); + + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelinePositionMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelinePositionMapper.xml index 173b21e0..0ba7cc41 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelinePositionMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelinePositionMapper.xml @@ -30,6 +30,6 @@ ORDER BY - scp.cacheline_code, scp.layer_num, scp.positionorder_no, scp.cache_line_no + scp.cacheline_code, scp.layer_num desc, scp.positionorder_no, scp.cache_line_no diff --git a/mes/qd/src/views/wms/old_manage/old_package/index.vue b/mes/qd/src/views/wms/old_manage/old_package/index.vue new file mode 100644 index 00000000..f5771f1e --- /dev/null +++ b/mes/qd/src/views/wms/old_manage/old_package/index.vue @@ -0,0 +1,459 @@ + + + + +