From a9f60019562433c3263c5996346468c2ca39d39e Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Tue, 23 Jul 2024 10:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=20=E9=9D=99=E6=80=81=E5=8F=B0=E8=B4=A6=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=92=8Ckks=E7=BC=96=E7=A0=81=20=E9=87=8D=E5=A4=8D=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../leger/controller/EquipmentLedgerController.java | 11 +++++++++++
 .../controller/ToolInventoryRecordController.java   | 13 ++++++++++++-
 .../modules/leger/mapper/EquipmentLedgerMapper.java |  4 ++++
 .../modules/leger/mapper/EquipmentLedgerMapper.xml  |  6 +++++-
 .../leger/mapper/ToolInventoryRecordMapper.java     |  7 ++++++-
 .../leger/mapper/ToolInventoryRecordMapper.xml      |  6 +++++-
 .../leger/service/IEquipmentLedgerService.java      |  6 +++++-
 .../leger/service/IToolInventoryRecordService.java  |  6 +++++-
 .../service/impl/EquipmentLedgerServiceImpl.java    |  8 +++++++-
 .../impl/ToolInventoryRecordServiceImpl.java        |  6 ++++++
 10 files changed, 66 insertions(+), 7 deletions(-)

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<EquipmentLedger> list = equipmentLedgerService.list(queryWrapper);
 		return R.data(list);
 	}
+
+	/**
+	 * 获取kkskey
+	 */
+	@GetMapping("/getKksKey")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取kks编号", notes = "获取kks编号")
+	public R<EquipmentLedger>  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<ToolInventoryRecord> 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<EquipmentLedger> {
 	 * 获取kks编号
 	 */
 	List<EquipmentLedger> 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
     </select>
 
+    <select id="getKksKey" resultMap="equipmentLedgerResultMap">
+        select kks_encoding from l_equipment_ledger where is_deleted = 0 and kks_encoding = ${kks_encoding}
+    </select>
+
     <select id="getDetailList" resultMap="equipmentLedgerResultMap">
-        select kks_description, station from l_equipment_ledger where kks_encoding = ${kks_encoding} and check_status = 2
+        select kks_description, station from l_equipment_ledger where kks_encoding = ${kks_encoding} and check_status = 2 and is_deleted = 0
     </select>
 </mapper>
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<ToolInventoryRecor
 	 */
 	List<ToolInventoryRecord> 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 @@
     </select>
 
     <select id="getDetailList" resultMap="toolInventoryRecordResultMap">
-        select ' ' as kks_encoding , stations from l_tool_inventory_record where tools_code_id = ${tools_code_id}
+        select ' ' as kks_encoding , stations from l_tool_inventory_record where tools_code_id = ${tools_code_id} and is_deleted = 0 and check_status = 2
+    </select>
+
+    <select id="getToolsCodeId" resultMap="toolInventoryRecordResultMap">
+        select tools_code_id from l_tool_inventory_record where tools_code_id = ${tools_code_id}  and is_deleted = 0
     </select>
 </mapper>
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<EquipmentLedger> {
 	List<EquipmentLedgerExcel> export(EquipmentLedgerVO equipmentLedger);
 
 	/**
-	 * 获取路线编号
+	 * 获取kksNo
 	 */
 	List<EquipmentLedger> 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<ToolInventoryRe
 	 */
 	List<ToolInventoryRecord> 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<EquipmentLedgerM
 
 	@Override
 	public EquipmentLedger getDetailList(String KkstNo) {
-		EquipmentLedger DetailList = baseMapper.getDetailList(KkstNo);
+		EquipmentLedger DetailList  = baseMapper.getKksKey(KkstNo);
+		return DetailList;
+	}
+
+	@Override
+	public EquipmentLedger getKksKey(String KksNo) {
+		EquipmentLedger DetailList = baseMapper.getDetailList(KksNo);
 		return DetailList;
 	}
 }
diff --git a/src/main/java/org/energy/modules/leger/service/impl/ToolInventoryRecordServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/ToolInventoryRecordServiceImpl.java
index 516b4f7..debdcc3 100644
--- a/src/main/java/org/energy/modules/leger/service/impl/ToolInventoryRecordServiceImpl.java
+++ b/src/main/java/org/energy/modules/leger/service/impl/ToolInventoryRecordServiceImpl.java
@@ -60,4 +60,10 @@ public class ToolInventoryRecordServiceImpl extends BaseServiceImpl<ToolInventor
 		return DetailList;
 	}
 
+	@Override
+	public ToolInventoryRecord getToolsCodeId(String toolsCodeId) {
+		ToolInventoryRecord KksNoDetail = baseMapper.getToolsCodeId(toolsCodeId);
+		return KksNoDetail;
+	}
+
 }