From 65d550ff2b91ff4519ebd87da21269d5c461bf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com>
Date: Fri, 23 May 2025 15:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E4=BB=B6=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0=EF=BC=8C=E8=BF=94=E5=9B=9EId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeBikeInfoServiceImpl.java              | 2 +-
 .../ebikeoperate/controller/EbikeComponentController.java   | 4 ++--
 .../cdzy/ebikeoperate/service/EbikeComponentService.java    | 2 +-
 .../service/impl/EbikeComponentServiceImpl.java             | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index b98427f7..a2ae0bfc 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -864,7 +864,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             QueryWrapper query = QueryWrapper.create();
             switch (orderType){
                 case "1":
-                    EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneById(ebikeBikeOrder.getOrderId());
+                    EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneById(ebikeBikeOrder.getBikeId());
                     modifyMaintenanceStatus(ebikeBikeInfo.getBikeCode());
                     break;
                 case "2":
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java
index 41541885..7909df29 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java
@@ -25,9 +25,9 @@ public class EbikeComponentController {
      * @return
      */
     @PostMapping("/componentInventoryEnterbound")
-    public JsonResult<?> ecuStorageSave(@RequestBody ReqComponentEnterRecordDto params) {
+    public JsonResult<?> componentInventoryEnterbound(@RequestBody ReqComponentEnterRecordDto params) {
 
-        return  ebikeComponentService.ecuStorageSave(params);
+        return  ebikeComponentService.componentInventoryEnterbound(params);
     }
     /**
      * 设备部件入库作废 （通用
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java
index 743cb529..04904505 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java
@@ -19,7 +19,7 @@ public interface EbikeComponentService  {
      * @param params
      * @return
      */
-    JsonResult<?> ecuStorageSave(ReqComponentEnterRecordDto params);
+    JsonResult<?> componentInventoryEnterbound(ReqComponentEnterRecordDto params);
 
     /**
      * 设备部件作废接口 （通用
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
index d902a044..870ae560 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
@@ -68,7 +68,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
      */
     @Override
     @Transactional
-    public JsonResult<?> ecuStorageSave(ReqComponentEnterRecordDto params) {
+    public JsonResult<?> componentInventoryEnterbound(ReqComponentEnterRecordDto params) {
         Integer stockInType = params.getStockInType();
         String userId = getStaffId();  // 获取当前操作用户ID
         Long orgId = getOrgId();       // 获取当前操作用户所在组织ID
@@ -105,7 +105,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
                 updateInventoryCount(ebikeComponentTypeInfo, orgId,enterQuantity,1);
             }
         }
-        return JsonResult.success("成功");
+        return JsonResult.success(componentEnterRecordId);
     }
     /*
     获取用户Id
@@ -436,7 +436,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
                 updateInventoryCount(ebikeComponentTypeInfo, orgId,enterQuantity,2);
             }
         }
-        return JsonResult.success("成功");
+        return JsonResult.success(componentOutRecordId);
     }
     private EbikeComponentOutRecords buildOutRecord(ReqComponentOutRecordDto params, EbikeComponentTypeInfo ebikeComponentTypeInfo,Integer stockInType,Long orgId) {
         EbikeComponentOutRecords ebikeComponentOutRecords = new EbikeComponentOutRecords();