From 3ca99a04cff5dc72a8f1a4b4448ca592f915237f Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期六, 09 八月 2025 17:47:28 +0800 Subject: [PATCH] 生产管控 排产功能接口调整 --- src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 82 ++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java index ec495da..7b72e9e 100644 --- a/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java +++ b/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java @@ -208,34 +208,34 @@ return Result.OK("鎵归噺绉婚櫎鎴愬姛锛�"); } - /** - * 鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯� - */ - @AutoLog(value = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�") - @ApiOperation(value = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�", notes = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�") - @PostMapping(value = "/removeEquipmentsForProduction") - public Result<?> removeEquipmentsForProduction(@RequestParam(name = "productionId", required = true) String productionId, - @RequestParam(name = "equipmentIds", required = true) String equipmentIds) { - if (StringUtils.isNotBlank(productionId) && StringUtils.isNotBlank(equipmentIds)) { - List<String> equipmentIdList = Arrays.asList(equipmentIds.split(",")); - mdcEquipmentService.removeEquipmentsForProduction(productionId, equipmentIdList); - } - return Result.OK("鎵归噺绉婚櫎鎴愬姛锛�"); - } +// /** +// * 鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯� +// */ +// @AutoLog(value = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�") +// @ApiOperation(value = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�", notes = "璁惧浜х嚎琛�-鎵归噺绉婚櫎浜х嚎鍜岃澶囧叧绯�") +// @PostMapping(value = "/removeEquipmentsForProduction") +// public Result<?> removeEquipmentsForProduction(@RequestParam(name = "productionId", required = true) String productionId, +// @RequestParam(name = "equipmentIds", required = true) String equipmentIds) { +// if (StringUtils.isNotBlank(productionId) && StringUtils.isNotBlank(equipmentIds)) { +// List<String> equipmentIdList = Arrays.asList(equipmentIds.split(",")); +// mdcEquipmentService.removeEquipmentsForProduction(productionId, equipmentIdList); +// } +// return Result.OK("鎵归噺绉婚櫎鎴愬姛锛�"); +// } - /** - * 绉婚櫎浜х嚎鍜岃澶囧叧绯� - */ - @AutoLog(value = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�") - @ApiOperation(value = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�", notes = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�") - @PostMapping(value = "/removeEquipmentForProduction") - public Result<?> removeEquipmentForProduction(@RequestParam(name = "productionId", required = true) String productionId, - @RequestParam(name = "equipmentId", required = true) String equipmentId) { - if (StringUtils.isNotBlank(productionId) && StringUtils.isNotBlank(equipmentId)) { - mdcEquipmentService.removeEquipmentForProduction(productionId, equipmentId); - } - return Result.OK("绉婚櫎鎴愬姛锛�"); - } +// /** +// * 绉婚櫎浜х嚎鍜岃澶囧叧绯� +// */ +// @AutoLog(value = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�") +// @ApiOperation(value = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�", notes = "璁惧浜х嚎琛�-绉婚櫎浜х嚎鍜岃澶囧叧绯�") +// @PostMapping(value = "/removeEquipmentForProduction") +// public Result<?> removeEquipmentForProduction(@RequestParam(name = "productionId", required = true) String productionId, +// @RequestParam(name = "equipmentId", required = true) String equipmentId) { +// if (StringUtils.isNotBlank(productionId) && StringUtils.isNotBlank(equipmentId)) { +// mdcEquipmentService.removeEquipmentForProduction(productionId, equipmentId); +// } +// return Result.OK("绉婚櫎鎴愬姛锛�"); +// } /** * 娣诲姞 @@ -589,18 +589,18 @@ } - @AutoLog(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�") - @ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�") - @GetMapping(value = "/loadTreeListByProductionIds") - public Result<?> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) { - Result<List<MdcEquipmentTree>> result = new Result<>(); - try { - List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProductionIds(ids); - result.setSuccess(true); - result.setResult(mdcEquipmentTreeList); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return result; - } +// @AutoLog(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�") +// @ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�") +// @GetMapping(value = "/loadTreeListByProductionIds") +// public Result<?> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) { +// Result<List<MdcEquipmentTree>> result = new Result<>(); +// try { +// List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProductionIds(ids); +// result.setSuccess(true); +// result.setResult(mdcEquipmentTreeList); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } +// return result; +// } } -- Gitblit v1.9.3