diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 20b19a3..ca9f682 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -272,4 +272,15 @@ public class EquipmentLedgerController extends DafController { List list = equipmentLedgerService.list(queryWrapper); return R.data(list); } + + /** + * 获取kkskey + */ + @GetMapping("/getKksKey") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取kks编号", notes = "获取kks编号") + public R getKksKey(String KksNo) { + EquipmentLedger DetailList = equipmentLedgerService.getKksKey("'" + KksNo + "'"); + return R.data(DetailList); + } } diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index 899280c..34f7b5b 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -235,7 +235,7 @@ public class ToolInventoryRecordController extends DafController { } /** - * 获取对象编号 + * 获取工器具明细 */ @GetMapping("/getDetailList") @ApiOperationSupport(order = 12) @@ -245,4 +245,15 @@ public class ToolInventoryRecordController extends DafController { return R.data(DetailList); } + /** + * 获取对象编号 + */ + @GetMapping("/getToolsCodeId") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取工器具信息", notes = "获取工器具信息") + public R getToolsCodeId(String toolsCodeId) { + ToolInventoryRecord DetailList = toolInventoryRecordService.getToolsCodeId("'" + toolsCodeId + "'"); + return R.data(DetailList); + } + } diff --git a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java index fe76dba..14f3033 100644 --- a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java @@ -34,6 +34,10 @@ public interface EquipmentLedgerMapper extends BaseMapper { * 获取kks编号 */ List getKksNoList(); + /** + * 获取kksKey + */ + EquipmentLedger getKksKey(String kksNo); /** * 获取kks的信息 */ diff --git a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml index be707ae..0131b90 100644 --- a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml @@ -95,7 +95,11 @@ select kks_encoding from l_equipment_ledger where is_deleted = 0 and check_status = 2 + + diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java index a5923c5..1a3d2d5 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java @@ -35,8 +35,13 @@ public interface ToolInventoryRecordMapper extends BaseMapper getToolsCodeIdList(); /** - * 获取kks的信息 + * 获取工器具明细 */ ToolInventoryRecord getDetailList(String toolsCodeId); + /** + * 获取工器具编码 + */ + ToolInventoryRecord getToolsCodeId(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index 6aa0887..3420c82 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -76,6 +76,10 @@ + + diff --git a/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java b/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java index af15762..44f5b81 100644 --- a/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java +++ b/src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java @@ -36,9 +36,13 @@ public interface IEquipmentLedgerService extends BaseService { List export(EquipmentLedgerVO equipmentLedger); /** - * 获取路线编号 + * 获取kksNo */ List getKksNoList(); + /** + * 获取kks编码 + */ + EquipmentLedger getKksKey(String KksNo); /** * 获取路线的信息 */ diff --git a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java index e6e979a..29d651c 100644 --- a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java +++ b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java @@ -42,8 +42,12 @@ public interface IToolInventoryRecordService extends BaseService getToolsCodeIdList(); /** - * 获取路线的信息 + * 获取工器具明细 */ ToolInventoryRecord getDetailList(String toolsCodeId); + /** + * 获取工器具编码 + */ + ToolInventoryRecord getToolsCodeId(String toolsCodeId); } diff --git a/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java index 255e067..06995fc 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java @@ -53,7 +53,13 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl