diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
index a002ae6..edfc6c9 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
@@ -12,9 +12,11 @@ import com.hxhq.business.domain.StudyGyzj;
 import com.hxhq.business.dto.gyzj.FfjlDetailDto;
 import com.hxhq.business.dto.gyzj.FfjlListDto;
 import com.hxhq.business.dto.gyzj.ListDto;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.gyzj.*;
+import com.hxhq.business.service.IArchiveLogService;
 import com.hxhq.business.service.IGyzjFfjlJcgjService;
 import com.hxhq.business.service.IStudyGyzjService;
 import com.hxhq.business.utils.JctUtil;
@@ -47,7 +49,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     private IGyzjFfjlJcgjService gyzjFfjlJcgjService;
     @Autowired
     private IStudyGyzjService studyGyzjService;
-
+    @Autowired
+    private IArchiveLogService archiveLogService;
 
     //region 发放记录
 
@@ -167,6 +170,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请借阅");
+
     }
 
     /**
@@ -209,6 +215,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请解档");
     }
 
     /**
@@ -241,6 +249,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
                 gyzjFfjl.setDazt(DaztEnum.ygd.getValue());
                 // 稽查轨迹
                 gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
+                //保存日志
+                archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjl.getId(), gyzjFfjl.getMc(), gyzjFfjl.getBh(), gyzjFfjl.getNd()+gyzjFfjl.getNddw(), "申请归档");
             }
             this.updateBatchById(gyzjFfjlList);
             gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
@@ -274,6 +284,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请归档");
     }
 
 
@@ -570,6 +582,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意归档");
 
     }
 
@@ -598,7 +612,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
-
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝归档");
     }
 
     /**
@@ -624,6 +639,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意解档");
 
     }
 
@@ -651,6 +668,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝解档");
 
     }
 
@@ -681,6 +700,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意借阅");
 
     }
 
@@ -712,6 +733,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝借阅");
 
     }
 
@@ -737,6 +760,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "确认归还");
 
     }
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index b18ed4a..6345e4f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -1013,6 +1013,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (!gyzjOld.getGhzt().equals(GhztEnum.wsq.getValue())) {
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是未申请归还状态，不能归还");
         }
+        if (!gyzjOld.getCczt().equals(CcztEnum.Qc.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】是暂存状态，请先将该物质从暂存处取出");
+        }
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());
@@ -1068,6 +1071,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (!gyzjOld.getGhzt().equals(GhztEnum.sqgh.getValue())) {
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是申请归还状态，不能归还");
         }
+        if (!gyzjOld.getCczt().equals(CcztEnum.Qc.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】是暂存状态，请先将该物质从暂存处取出");
+        }
         gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2);
         // 台账
         gyzjTzService.saveTz(gyzjOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkl(), gyzjOld.getKcdw(),form.getRemark());
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
index 3bbb815..6aff12a 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
@@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.mjy.FfjlDetailDto;
 import com.hxhq.business.dto.mjy.FfjlListDto;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.mjy.*;
-import com.hxhq.business.service.IMjyFfjlJcgjService;
-import com.hxhq.business.service.IStudyMjyService;
+import com.hxhq.business.service.*;
 import com.hxhq.business.service.IStudyMjyService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
@@ -24,7 +24,6 @@ import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyFfjlMapper;
-import com.hxhq.business.service.IMjyFfjlService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -43,6 +42,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     private IMjyFfjlJcgjService mjyFfjlJcgjService;
     @Autowired
     private IStudyMjyService studyMjyService;
+    @Autowired
+    private IArchiveLogService archiveLogService;
 
     //region 发放记录
 
@@ -162,6 +163,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr,form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "申请借阅");
     }
 
     /**
@@ -204,6 +207,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "申请解档");
     }
 
     /**
@@ -236,6 +241,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
                 mjyFfjl.setDazt(DaztEnum.ygd.getValue());
                 // 稽查轨迹
                 mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
+                //保存日志
+                archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjl.getId(), mjyFfjl.getMc(), mjyFfjl.getBh(), mjyFfjl.getNd()+mjyFfjl.getNddw(), "申请解档");
             }
             this.updateBatchById(mjyFfjlList);
             mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
@@ -567,6 +574,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意归档");
 
     }
 
@@ -595,6 +604,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝归档");
 
     }
 
@@ -621,6 +632,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意解档");
 
     }
 
@@ -648,6 +661,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝解档");
 
     }
 
@@ -678,6 +693,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意借阅");
 
     }
 
@@ -709,6 +726,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝借阅");
 
     }
 
@@ -734,6 +753,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "确认归还");
 
     }
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
index ccd95c9..15716a6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.dto.mjy.ListDto;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.study.StudyTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.mjy.*;
@@ -49,6 +50,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     private IZcgService zcgService;
     @Autowired
     private IMjyTzService mjyTzService;
+    @Autowired
+    private IArchiveLogService archiveLogService;
 
     //region 资源库管理
 
@@ -158,6 +161,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请解档");
     }
 
     /**
@@ -194,6 +199,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请借阅");
     }
 
     /**
@@ -226,6 +233,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 mjy.setDazt(DaztEnum.ygd.getValue());
                 //稽查轨迹
                 mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
+                //保存日志
+                archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjy.getId(), mjy.getMc(), mjy.getBh(), mjy.getNd()+mjy.getNddw(), "申请归档");
             }
             this.updateBatchById(mjyList);
             mjyJcgjService.saveBatch(mjyJcgjList);
@@ -259,6 +268,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请归档");
     }
 
 
@@ -1024,6 +1035,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         if (!mjyOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
             throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能归还");
         }
+        if (!mjyOld.getCczt().equals(CcztEnum.Qc.getValue())) {
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】是暂存状态，请先将该物质从暂存处取出");
+        }
         BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl()));
         mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2);
         // 台账
@@ -1229,7 +1243,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
-
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意归档");
     }
 
     /**
@@ -1257,6 +1272,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝归档");
 
     }
 
@@ -1283,6 +1300,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意解档");
 
     }
 
@@ -1310,7 +1329,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
-
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝解档");
     }
 
     /**
@@ -1340,6 +1360,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意借阅");
 
     }
 
@@ -1371,7 +1393,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
-
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝借阅");
     }
 
     /**
@@ -1396,7 +1419,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
-
+        //保存日志
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "确认归还");
     }
 
     //endregion