diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
index b6c068c..0d5019d 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
@@ -333,6 +333,31 @@ public class GyzjController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
+
+    /**
+     * 申请入库
+     */
+    @PostMapping("sqrk")
+    @RequiresPermissions({"business:studyGyzj:rk","business:nonTrialGyzj:rk","business:drugGyzj:rk"})
+    public AjaxResult sqrk(@RequestBody RkForm form)
+    {
+        form.setJsr1Id(SecurityUtils.getUserId());
+        gyzjService.sqrk(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 确认入库
+     */
+    @PostMapping("rk")
+    @RequiresPermissions({"business:resource:gyzj:rk"})
+    public AjaxResult rk(@RequestBody RkForm form)
+    {
+        form.setJsr1Id(SecurityUtils.getUserId());
+        gyzjService.rk(form);
+        return AjaxResult.success("操作成功");
+    }
+
     /**
      * 借阅
      */
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
index a2c268b..b028e8f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
@@ -70,6 +70,10 @@ public class Gyzj extends MpBaseEntity
     /** 归还状态：1：未申请；3：申请归还 */
     private Integer ghzt;
 
+    /** 入库申请状态：1：未申请；3：申请入库*/
+    private Integer rksqzt;
+
+
     /** 关联暂存柜id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long zcgId;
@@ -165,30 +169,6 @@ public class Gyzj extends MpBaseEntity
     /** 出库毛重单位 */
     private String ckmzdw;
 
-    /** 领取人1id */
-    private Long lqr1Id;
-
-    /** 领取人2id */
-    private Long lqr2Id;
-
-    /** 发放人1id */
-    private Long ffr1Id;
-
-    /** 发放人2id */
-    private Long ffr2Id;
-
-    /** 领取人1名称 */
-    private String lqr1Mc;
-
-    /** 领取人2名称 */
-    private String lqr2Mc;
-
-    /** 发放人1名称 */
-    private String ffr1Mc;
-
-    /** 发放人2名称 */
-    private String ffr2Mc;
-
     /** 发放日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ffrq;
@@ -227,124 +207,163 @@ public class Gyzj extends MpBaseEntity
     private String rkwz;
 
     /** 入库条件 */
-
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String rktj;
 
-    /** 转移条件 */
+    /** 归还转移条件 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String ghzytj;
 
-    public String getBjrMcEn() {
-        return bjrMcEn;
+    /** 入库转移条件 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String rkzytj;
+
+    /** 入库备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String rkbz;
+
+    /** 签名人1id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long qmr1Id;
+
+    /** 签名人2id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long qmr2Id;
+
+    /** 签名人1名称 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String qmr1Mc;
+
+    /** 签名人2名称 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String qmr2Mc;
+
+    /** 签名人1名称-英文 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String qmr1McEn;
+
+    /** 签名人2名称-英文 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String qmr2McEn;
+
+    public String getRkbz() {
+        return rkbz;
     }
 
-    public void setBjrMcEn(String bjrMcEn) {
-        this.bjrMcEn = bjrMcEn;
+    public void setRkbz(String rkbz) {
+        this.rkbz = rkbz;
     }
 
-    public String getKcbjrMcEn() {
-        return kcbjrMcEn;
+    public Integer getRksqzt() {
+        return rksqzt;
     }
 
-    public void setKcbjrMcEn(String kcbjrMcEn) {
-        this.kcbjrMcEn = kcbjrMcEn;
+    public void setRksqzt(Integer rksqzt) {
+        this.rksqzt = rksqzt;
     }
 
-    public String getCkmz() {
-        return ckmz;
+    public String getRkzytj() {
+        return rkzytj;
     }
 
-    public void setCkmz(String ckmz) {
-        this.ckmz = ckmz;
+    public void setRkzytj(String rkzytj) {
+        this.rkzytj = rkzytj;
     }
 
-    public String getCkmzdw() {
-        return ckmzdw;
+    public Long getQmr1Id() {
+        return qmr1Id;
     }
 
-    public void setCkmzdw(String ckmzdw) {
-        this.ckmzdw = ckmzdw;
+    public void setQmr1Id(Long qmr1Id) {
+        this.qmr1Id = qmr1Id;
     }
 
-    public String getCkl() {
-        return ckl;
+    public Long getQmr2Id() {
+        return qmr2Id;
     }
 
-    public void setCkl(String ckl) {
-        this.ckl = ckl;
+    public void setQmr2Id(Long qmr2Id) {
+        this.qmr2Id = qmr2Id;
     }
 
-    public String getCkldw() {
-        return ckldw;
+    public String getQmr1Mc() {
+        return qmr1Mc;
     }
 
-    public void setCkldw(String ckldw) {
-        this.ckldw = ckldw;
+    public void setQmr1Mc(String qmr1Mc) {
+        this.qmr1Mc = qmr1Mc;
     }
 
-    public Long getLqr1Id() {
-        return lqr1Id;
+    public String getQmr2Mc() {
+        return qmr2Mc;
     }
 
-    public void setLqr1Id(Long lqr1Id) {
-        this.lqr1Id = lqr1Id;
+    public void setQmr2Mc(String qmr2Mc) {
+        this.qmr2Mc = qmr2Mc;
     }
 
-    public Long getLqr2Id() {
-        return lqr2Id;
+    public String getQmr1McEn() {
+        return qmr1McEn;
     }
 
-    public void setLqr2Id(Long lqr2Id) {
-        this.lqr2Id = lqr2Id;
+    public void setQmr1McEn(String qmr1McEn) {
+        this.qmr1McEn = qmr1McEn;
     }
 
-    public Long getFfr1Id() {
-        return ffr1Id;
+    public String getQmr2McEn() {
+        return qmr2McEn;
     }
 
-    public void setFfr1Id(Long ffr1Id) {
-        this.ffr1Id = ffr1Id;
+    public void setQmr2McEn(String qmr2McEn) {
+        this.qmr2McEn = qmr2McEn;
     }
 
-    public Long getFfr2Id() {
-        return ffr2Id;
+    public String getBjrMcEn() {
+        return bjrMcEn;
     }
 
-    public void setFfr2Id(Long ffr2Id) {
-        this.ffr2Id = ffr2Id;
+    public void setBjrMcEn(String bjrMcEn) {
+        this.bjrMcEn = bjrMcEn;
     }
 
-    public String getLqr1Mc() {
-        return lqr1Mc;
+    public String getKcbjrMcEn() {
+        return kcbjrMcEn;
     }
 
-    public void setLqr1Mc(String lqr1Mc) {
-        this.lqr1Mc = lqr1Mc;
+    public void setKcbjrMcEn(String kcbjrMcEn) {
+        this.kcbjrMcEn = kcbjrMcEn;
     }
 
-    public String getLqr2Mc() {
-        return lqr2Mc;
+    public String getCkmz() {
+        return ckmz;
     }
 
-    public void setLqr2Mc(String lqr2Mc) {
-        this.lqr2Mc = lqr2Mc;
+    public void setCkmz(String ckmz) {
+        this.ckmz = ckmz;
     }
 
-    public String getFfr1Mc() {
-        return ffr1Mc;
+    public String getCkmzdw() {
+        return ckmzdw;
     }
 
-    public void setFfr1Mc(String ffr1Mc) {
-        this.ffr1Mc = ffr1Mc;
+    public void setCkmzdw(String ckmzdw) {
+        this.ckmzdw = ckmzdw;
     }
 
-    public String getFfr2Mc() {
-        return ffr2Mc;
+    public String getCkl() {
+        return ckl;
     }
 
-    public void setFfr2Mc(String ffr2Mc) {
-        this.ffr2Mc = ffr2Mc;
+    public void setCkl(String ckl) {
+        this.ckl = ckl;
+    }
+
+    public String getCkldw() {
+        return ckldw;
+    }
+
+    public void setCkldw(String ckldw) {
+        this.ckldw = ckldw;
     }
 
     public Date getFfrq() {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
index 43d5fdb..b52ed9f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
@@ -51,6 +51,9 @@ public class ListDto {
     /** 归还状态：1：未申请；3：申请归还 */
     private Integer ghzt;
 
+    /** 入库申请状态：1：未申请；3：申请入库*/
+    private Integer rksqzt;
+
     /** 暂存柜 */
     private String zcgMc;
 
@@ -79,17 +82,6 @@ public class ListDto {
     /** 出库毛重单位 */
     private String ckmzdw;
 
-    /** 领取人1名称 */
-    private String lqr1Mc;
-
-    /** 领取人2名称 */
-    private String lqr2Mc;
-
-    /** 发放人1名称 */
-    private String ffr1Mc;
-
-    /** 发放人2名称 */
-    private String ffr2Mc;
 
     /** 发放备注 */
     private String ffbz;
@@ -103,6 +95,14 @@ public class ListDto {
     /** 发放目的其他 */
     private String mdOther;
 
+    public Integer getRksqzt() {
+        return rksqzt;
+    }
+
+    public void setRksqzt(Integer rksqzt) {
+        this.rksqzt = rksqzt;
+    }
+
     public String getMdMcs() {
         return mdMcs;
     }
@@ -175,37 +175,7 @@ public class ListDto {
         this.ckmzdw = ckmzdw;
     }
 
-    public String getLqr1Mc() {
-        return lqr1Mc;
-    }
-
-    public void setLqr1Mc(String lqr1Mc) {
-        this.lqr1Mc = lqr1Mc;
-    }
-
-    public String getLqr2Mc() {
-        return lqr2Mc;
-    }
-
-    public void setLqr2Mc(String lqr2Mc) {
-        this.lqr2Mc = lqr2Mc;
-    }
-
-    public String getFfr1Mc() {
-        return ffr1Mc;
-    }
 
-    public void setFfr1Mc(String ffr1Mc) {
-        this.ffr1Mc = ffr1Mc;
-    }
-
-    public String getFfr2Mc() {
-        return ffr2Mc;
-    }
-
-    public void setFfr2Mc(String ffr2Mc) {
-        this.ffr2Mc = ffr2Mc;
-    }
 
     public String getFfbz() {
         return ffbz;
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RksqztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RksqztEnum.java
new file mode 100644
index 0000000..7cd80eb
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RksqztEnum.java
@@ -0,0 +1,51 @@
+package com.hxhq.business.enums.zykgl;
+
+/**
+ * 入库申请状态：1：未申请；3：申请入库
+ * @author tanfei
+ */
+public enum RksqztEnum {
+
+    /**
+     * 未申请
+     */
+    wsq(1, "未申请"),
+
+    /**
+     * 申请入库
+     */
+    sqrk(3, "申请入库");
+
+    private int value;
+    private String text;
+
+    RksqztEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static RksqztEnum getEnumByValue(int type) {
+        for (RksqztEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/RkForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/RkForm.java
new file mode 100644
index 0000000..e3857ad
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/RkForm.java
@@ -0,0 +1,216 @@
+package com.hxhq.business.form.gyzj;
+
+/**
+ * @author 15881
+ */
+public class RkForm {
+
+    /** 给药制剂id */
+    private Long id;
+
+    /** 入库位置 */
+    private String rkwz;
+
+    /** 入库条件 */
+    private String rktj;
+
+    /** 归还转移条件 */
+    private String rkzytj;
+
+    /** 入库量 */
+    private String rkl;
+
+    /** 入库单位 */
+    private String rkldw;
+
+    /** 入库毛重 */
+    private String rkmz;
+
+    /** 入库毛重单位 */
+    private String rkmzdw;
+
+    /** 归还人1id */
+    private Long ghr1Id;
+
+    /** 接收人1id */
+    private Long jsr1Id;
+
+    /** 接收人1密码 */
+    private String jsr1mm;
+
+    /** 接收人2id */
+    private Long jsr2Id;
+
+    /** 接收人2密码 */
+    private String jsr2mm;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人1id */
+    private Long qmr1Id;
+
+    /** 签名人1密码 */
+    private String qmr1mm;
+
+    /** 签名人2id */
+    private Long qmr2Id;
+
+    /** 签名人2密码 */
+    private String qmr2mm;
+
+    /** 签名意义 */
+    private Integer qmyy;
+
+    public Integer getQmyy() {
+        return qmyy;
+    }
+
+    public void setQmyy(Integer qmyy) {
+        this.qmyy = qmyy;
+    }
+
+    public String getQmr1mm() {
+        return qmr1mm;
+    }
+
+    public void setQmr1mm(String qmr1mm) {
+        this.qmr1mm = qmr1mm;
+    }
+
+    public String getQmr2mm() {
+        return qmr2mm;
+    }
+
+    public void setQmr2mm(String qmr2mm) {
+        this.qmr2mm = qmr2mm;
+    }
+
+    public Long getQmr1Id() {
+        return qmr1Id;
+    }
+
+    public void setQmr1Id(Long qmr1Id) {
+        this.qmr1Id = qmr1Id;
+    }
+
+    public Long getQmr2Id() {
+        return qmr2Id;
+    }
+
+    public void setQmr2Id(Long qmr2Id) {
+        this.qmr2Id = qmr2Id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRkwz() {
+        return rkwz;
+    }
+
+    public void setRkwz(String rkwz) {
+        this.rkwz = rkwz;
+    }
+
+    public String getRktj() {
+        return rktj;
+    }
+
+    public void setRktj(String rktj) {
+        this.rktj = rktj;
+    }
+
+    public String getRkzytj() {
+        return rkzytj;
+    }
+
+    public void setRkzytj(String rkzytj) {
+        this.rkzytj = rkzytj;
+    }
+
+    public String getRkl() {
+        return rkl;
+    }
+
+    public void setRkl(String rkl) {
+        this.rkl = rkl;
+    }
+
+    public String getRkldw() {
+        return rkldw;
+    }
+
+    public void setRkldw(String rkldw) {
+        this.rkldw = rkldw;
+    }
+
+    public String getRkmz() {
+        return rkmz;
+    }
+
+    public void setRkmz(String rkmz) {
+        this.rkmz = rkmz;
+    }
+
+    public String getRkmzdw() {
+        return rkmzdw;
+    }
+
+    public void setRkmzdw(String rkmzdw) {
+        this.rkmzdw = rkmzdw;
+    }
+
+    public Long getGhr1Id() {
+        return ghr1Id;
+    }
+
+    public void setGhr1Id(Long ghr1Id) {
+        this.ghr1Id = ghr1Id;
+    }
+
+    public Long getJsr1Id() {
+        return jsr1Id;
+    }
+
+    public void setJsr1Id(Long jsr1Id) {
+        this.jsr1Id = jsr1Id;
+    }
+
+    public String getJsr1mm() {
+        return jsr1mm;
+    }
+
+    public void setJsr1mm(String jsr1mm) {
+        this.jsr1mm = jsr1mm;
+    }
+
+    public Long getJsr2Id() {
+        return jsr2Id;
+    }
+
+    public void setJsr2Id(Long jsr2Id) {
+        this.jsr2Id = jsr2Id;
+    }
+
+    public String getJsr2mm() {
+        return jsr2mm;
+    }
+
+    public void setJsr2mm(String jsr2mm) {
+        this.jsr2mm = jsr2mm;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
index 5735e29..c29bce2 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
@@ -181,9 +181,24 @@ public interface IGyzjService extends IService<Gyzj>
     public void sqgh(@RequestBody GhForm form);
 
     /**
-     * 申请归还
+     * 确认归还
      *
      * @param form
      */
     public void gh(@RequestBody GhForm form);
+
+
+    /**
+     * 申请入库
+     *
+     * @param form
+     */
+    public void sqrk(@RequestBody RkForm form);
+
+    /**
+     * 确认入库
+     *
+     * @param form
+     */
+    public void rk(@RequestBody RkForm form);
 }
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 632b6fb..e37acb9 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
@@ -133,7 +133,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 解档 ok
+     * 解档 
      *
      * @param form
      */
@@ -161,7 +161,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 借阅 ok
+     * 借阅 
      *
      * @param form
      */
@@ -196,7 +196,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 批量归档 ok
+     * 批量归档 
      *
      * @param form
      */
@@ -230,7 +230,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 归档 ok
+     * 归档 
      *
      * @param form
      */
@@ -258,7 +258,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 批量锁定 ok
+     * 批量锁定 
      *
      * @param form
      */
@@ -290,7 +290,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 锁定 ok
+     * 锁定 
      *
      * @param form
      */
@@ -317,7 +317,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 解锁 ok
+     * 解锁 
      *
      * @param form
      */
@@ -344,7 +344,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 批量处置药剂 ok
+     * 批量处置药剂 
      *
      * @param form
      */
@@ -404,7 +404,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 处置药剂 ok
+     * 处置药剂 
      *
      * @param form
      */
@@ -458,7 +458,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 批量处置容器 ok
+     * 批量处置容器 
      *
      * @param form
      */
@@ -506,7 +506,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 处置容器 ok
+     * 处置容器 
      *
      * @param form
      */
@@ -551,7 +551,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 钥匙发放 ok
+     * 钥匙发放 
      *
      * @param form
      */
@@ -613,7 +613,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 发放 ok
+     * 发放 
      *
      * @param form
      */
@@ -645,7 +645,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         Date now = new Date();
 
         //region 发放记录，试验物资 todo
-        gyzjFfjlService.ff( form,gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
+        gyzjFfjlService.ff(form,gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
         //endregion
 
         //稽查轨迹
@@ -661,15 +661,6 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         //region 更新发放信息
         gyzjOld.setCkl(gyzjOld.getKc());
         gyzjOld.setCkldw(gyzjOld.getKcdw());
-        gyzjOld.setLqr1Id(lqr1.getUserId());
-        gyzjOld.setLqr2Id(lqr2.getUserId());
-        gyzjOld.setFfr1Id(ffr1.getUserId());
-        gyzjOld.setFfr2Id(ffr2.getUserId());
-        gyzjOld.setLqr1Mc(lqr1.getNickName());
-        gyzjOld.setLqr2Mc(lqr2.getNickName());
-        gyzjOld.setFfr1Mc(ffr1.getNickName());
-        gyzjOld.setFfr2Mc(ffr2.getNickName());
-        gyzjOld.setFfr2Mc(ffr2.getNickName());
         gyzjOld.setFfrq(now);
         gyzjOld.setFfbz(form.getRemark());
         gyzjOld.setMdIds(form.getMdIds());
@@ -682,7 +673,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 批量发放 ok
+     * 批量发放 
      *
      * @param form
      */
@@ -735,15 +726,6 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
                 //region 更新发放信息
                 gyzj.setCkl(gyzj.getKc());
                 gyzj.setCkldw(gyzj.getKcdw());
-                gyzj.setLqr1Id(lqr1.getUserId());
-                gyzj.setLqr2Id(lqr2.getUserId());
-                gyzj.setFfr1Id(ffr1.getUserId());
-                gyzj.setFfr2Id(ffr2.getUserId());
-                gyzj.setLqr1Mc(lqr1.getNickName());
-                gyzj.setLqr2Mc(lqr2.getNickName());
-                gyzj.setFfr1Mc(ffr1.getNickName());
-                gyzj.setFfr2Mc(ffr2.getNickName());
-                gyzj.setFfr2Mc(ffr2.getNickName());
                 gyzj.setFfrq(now);
                 gyzj.setFfbz(plffItemFilter.get(0).getRemark());
                 gyzj.setMdIds(plffItemFilter.get(0).getMdIds());
@@ -761,7 +743,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 编辑 ok
+     * 编辑 
      *
      * @param form
      */
@@ -809,7 +791,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 审核编辑 ok
+     * 审核编辑 
      *
      * @param form
      */
@@ -863,7 +845,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 修改库存 ok
+     * 修改库存 
      *
      * @param form
      */
@@ -910,7 +892,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 审核修改库存 ok
+     * 审核修改库存 
      *
      * @param form
      */
@@ -955,7 +937,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
 
 
     /**
-     * 申请归还 ok
+     * 申请归还 
      *
      * @param form
      */
@@ -988,7 +970,6 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         formData.put("转移条件", form.getGhzytj());
         formData.put("归还人1", SecurityUtils.getNickName());
         formData.put("归还人2", ghr2.getNickName());
-        formData.put("备注", form.getRemark());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
         //endregion
 
@@ -1008,7 +989,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     }
 
     /**
-     * 确认归还 ok
+     * 确认归还 
      *
      * @param form
      */
@@ -1064,6 +1045,115 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         this.updateById(gyzjOld);
     }
 
+
+    /**
+     * 申请入库 
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sqrk(RkForm form) {
+        SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id());
+        SysUser qmr2 = sysUserService.selectUserById(form.getQmr1Id());
+        //验证签名人1密码
+        checkPassword(qmr1,form.getQmr1mm());
+        //验证签名人2密码
+        checkPassword(qmr2,form.getQmr2mm());
+
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Gyzj gyzjOld = this.getById(form.getId());
+        if (gyzjOld == null) {
+            throw new ServiceException("给药制剂不存在或已删除");
+        }
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还");
+        }
+        if (!gyzjOld.getGhzt().equals(GhztEnum.wsq.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是未申请归还状态，不能归还");
+        }
+        //region 稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("入库位置", form.getRkwz());
+        formData.put("入库条件", form.getRktj());
+        formData.put("转移条件", form.getRkzytj());
+        formData.put("签名人1", qmr1.getNickName());
+        formData.put("签名人2", qmr2.getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "给药制剂入库", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        //endregion
+
+        gyzjOld.setRkzytj(form.getRkzytj());
+        gyzjOld.setRkwz(form.getRkwz());
+        gyzjOld.setRkbz(form.getRemark());
+        gyzjOld.setRktj(form.getRktj());
+        gyzjOld.setQmr1Id(qmr1.getUserId());
+        gyzjOld.setQmr1Mc(qmr1.getNickName());
+        gyzjOld.setQmr1McEn(qmr1.getUserName());
+        gyzjOld.setQmr2Id(qmr2.getUserId());
+        gyzjOld.setQmr2Mc(qmr2.getNickName());
+        gyzjOld.setQmr2McEn(qmr2.getUserName());
+        gyzjOld.setRksqzt(RksqztEnum.sqrk.getValue());
+        this.updateById(gyzjOld);
+    }
+
+    /**
+     * 确认入库 
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void rk(RkForm form) {
+        SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
+        SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
+        //验证接收人1密码
+        checkPassword(jsr1,form.getJsr1mm());
+        //验证接收人2密码
+        checkPassword(jsr2,form.getJsr2mm());
+
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Gyzj gyzjOld = this.getById(form.getId());
+        if (gyzjOld == null) {
+            throw new ServiceException("给药制剂不存在或已删除");
+        }
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.wrk.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是未入库状态，不能归还");
+        }
+        if (!gyzjOld.getRksqzt().equals(RksqztEnum.sqrk.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库申请状态，不能归还");
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("申请备注", gyzjOld.getRkbz());
+        formData.put("审核备注", form.getRemark());
+        if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
+            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+            gyzjOld.setKc(form.getRkl());
+            gyzjOld.setZjzt(ZjztEnum.rk.getValue());
+        } else {
+            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+        }
+        //台账
+        gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,null,"给药制剂入库",form.getRkl(),gyzjOld.getKcdw(),form.getRemark());
+
+        // 更新
+        gyzjOld.setGhzytj(null);
+        gyzjOld.setRkwz(null);
+        gyzjOld.setRktj(null);
+        gyzjOld.setQmr1Id(null);
+        gyzjOld.setQmr1Mc(null);
+        gyzjOld.setQmr1McEn(null);
+        gyzjOld.setQmr2Id(null);
+        gyzjOld.setQmr2Mc(null);
+        gyzjOld.setQmr2McEn(null);
+        gyzjOld.setRksqzt(RksqztEnum.wsq.getValue());
+        this.updateById(gyzjOld);
+    }
+
     /**
      * 验证密码
      * @param user
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
index 3ec861c..1eedca2 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
@@ -44,6 +44,8 @@ public class GyzjJcnrUtil {
         mapJcnr.put("库管员1","todo库管员1");
         mapJcnr.put("库管员2","todo库管员2");
         mapJcnr.put("入库净重","todo入库净重");
+        mapJcnr.put("签名人1","todo签名人1");
+        mapJcnr.put("签名人2","todo签名人2");
         //endregion
 
         //region 稽查名称
@@ -67,6 +69,9 @@ public class GyzjJcnrUtil {
         mapQmyy.put("锁定发放记录","todo锁定发放记录");
         mapQmyy.put("解锁发放记录","todo解锁发放记录");
         mapQmyy.put("领取发放","todo领取发放");
+        mapQmyy.put("给药制剂入库","todo给药制剂入库");
+        mapQmyy.put("同意入库","todo同意入库");
+        mapQmyy.put("拒绝入库","todo拒绝入库");
 
 
 
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
index 365496a..4c35f53 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.ListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt
-        ,t.ckl,t.ckldw,t.ffzytj,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz
+        ,t.ckl,t.ckldw,t.ffzytj,t.ffbz,t.rksqzt
         ,z.mc as zcgMc,t.md_other,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gyzj` t
@@ -28,7 +28,7 @@
     </select>
 
     <select id="queryStudyList" resultType="com.hxhq.business.dto.gyzj.ListDto">
-        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,ts.syghzt
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,ts.syghzt,t.rksqzt
         FROM `t_study_gyzj` ts
         join  `t_gyzj` t on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">