diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
index caf0428..8628c69 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
@@ -96,15 +96,15 @@ public class MaReceiveController extends BaseController {
 
     @ApiOperation(value = "获取租赁设备状态")
     @GetMapping("/getItemStatus")
-    public AjaxResult getDataReceiveDetailsById(Long itemId) {
-        Long itemStatus = maReceiveService.getItemStatus(itemId);
+    public AjaxResult getDataReceiveDetailsById(@RequestBody String maMachineRequest) {
+        Long itemStatus = maReceiveService.getItemStatus(maMachineRequest);
         return success(itemStatus);
     }
 
     @ApiOperation(value = "修改租赁设备状态")
     @GetMapping("/updateItemStatus")
-    public AjaxResult updateItemStatus(DataReceiveDetail dataReceiveDetail) {
-        Integer itemStatus = maReceiveService.updateItemStatus(dataReceiveDetail);
+    public AjaxResult updateItemStatus(@RequestBody String maMachineRequest) {
+        Integer itemStatus = maReceiveService.updateItemStatus(maMachineRequest);
         return success(itemStatus);
     }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java
index f292bf0..4f7bf15 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java
@@ -21,7 +21,7 @@ public interface MaReceiveService {
 
     List<DataReceiveDetail> getDateReceiveMachine(DataReceiveDetail dataReceiveDetail);
 
-    Long getItemStatus(Long itemId);
+    Long getItemStatus(String itemId);
 
-    Integer updateItemStatus(DataReceiveDetail dataReceiveDetail);
+    Integer updateItemStatus(String dataReceiveDetail);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
index ab70286..374f1cf 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
@@ -150,13 +150,21 @@ public class MaReceiveServiceImpl implements MaReceiveService {
     }
 
     @Override
-    public Long getItemStatus(Long itemId) {
-        return maMachineMapper.selectMaMachineByItemId(itemId);
+    public Long getItemStatus(String itemId) {
+        log.info("获取状态{}", itemId);
+        JSONObject object = JSONObject.parseObject(itemId);
+        itemId = object.getString("body");
+        DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(itemId, DataReceiveDetail.class);
+        return maMachineMapper.selectMaMachineByItemId(dataReceiveDetail.getItemId());
     }
 
 
 
-    public Integer updateItemStatus(DataReceiveDetail dataReceiveDetail) {
+    public Integer updateItemStatus(String dataReceiveDetailReq) {
+        log.info("修改状态{}", dataReceiveDetailReq);
+        JSONObject object = JSONObject.parseObject(dataReceiveDetailReq);
+        dataReceiveDetailReq = object.getString("body");
+        DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(dataReceiveDetailReq, DataReceiveDetail.class);
         if (dataReceiveDetail!=null && dataReceiveDetail.getOrderOverTime()!= null){
             return   maReceiveMapper.updateOrderOverTime(dataReceiveDetail);
         }else {
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
index c02534d..4c1a216 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateItemStatus">
         UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id
-            SET mm.ma_status = 130
+            SET mm.ma_status = #{maStatus}
         where drd.item_id = #{itemId}
     </update>
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml
index 0fe67f6..0f15677 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml
@@ -12,10 +12,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into data_receive_detail(receive_id,check_code,check_unit,check_date,is_new,ma_id,
                                         ma_user_name,next_check_date,out_factory_time,rent_price,rent_time,
                                         supplier,type_id,unit_id,order_over_time,ma_user_phone,ma_user_id_card,
-                                        ma_user_sex,ma_user_age)
+                                        ma_user_sex,ma_user_age,item_id)
         values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName},
                #{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId},
-               #{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge})
+               #{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge},#{itemId})
     </insert>
     <update id="updateStatus">
         UPDATE data_receive_detail