fix：[资源库管理][麻精药发放记录]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java

@@ -40,7 +40,7 @@ public class MjyController extends BaseController
      */
     @RequiresPermissions("business:resource:mjy:list")
     @GetMapping("/list")
-    public TableDataInfo list(MjySearchForm form)
+    public TableDataInfo list(SearchForm form)
     {
         startPage();
         List<MjyListDto> list = mjyService.queryList(form);
@@ -86,7 +86,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/jd")
     @RequiresPermissions("business:resource:mjy:jd")
-    public AjaxResult jd(@RequestBody MjyJdForm form)
+    public AjaxResult jd(@RequestBody JdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.jd(form);
@@ -98,7 +98,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/plgd")
     @RequiresPermissions("business:resource:mjy:gd")
-    public AjaxResult plgd(@RequestBody MjyGdForm form)
+    public AjaxResult plgd(@RequestBody GdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.plgd(form);
@@ -110,7 +110,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/gd")
     @RequiresPermissions("business:resource:mjy:gd")
-    public AjaxResult gd(@RequestBody MjyGdForm form)
+    public AjaxResult gd(@RequestBody GdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.gd(form);
@@ -123,7 +123,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/plsd")
     @RequiresPermissions("business:resource:mjy:sd")
-    public AjaxResult plsd(@RequestBody MjySdForm form)
+    public AjaxResult plsd(@RequestBody SdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.plsd(form);
@@ -135,7 +135,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/sd")
     @RequiresPermissions("business:resource:mjy:sd")
-    public AjaxResult sd(@RequestBody MjySdForm form)
+    public AjaxResult sd(@RequestBody SdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.sd(form);
@@ -148,7 +148,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/js")
     @RequiresPermissions("business:resource:mjy:js")
-    public AjaxResult js(@RequestBody MjyJsForm form)
+    public AjaxResult js(@RequestBody JsForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.js(form);
@@ -160,7 +160,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/plczyj")
     @RequiresPermissions("business:resource:mjy:czyj")
-    public AjaxResult plczyj(@RequestBody MjyPlczyjForm form)
+    public AjaxResult plczyj(@RequestBody PlczyjForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
         mjyService.plczyj(form);
@@ -172,7 +172,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/czyj")
     @RequiresPermissions("business:resource:mjy:czyj")
-    public AjaxResult czyj(@RequestBody MjyCzyjForm form)
+    public AjaxResult czyj(@RequestBody CzyjForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
         mjyService.czyj(form);
@@ -184,7 +184,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/plczrq")
     @RequiresPermissions("business:resource:mjy:czrq")
-    public AjaxResult plczrq(@RequestBody MjyPlczrqForm form)
+    public AjaxResult plczrq(@RequestBody PlczrqForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
         mjyService.plczrq(form);
@@ -196,7 +196,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("/czrq")
     @RequiresPermissions("business:resource:mjy:czrq")
-    public AjaxResult czrq(@RequestBody MjyCzrqForm form)
+    public AjaxResult czrq(@RequestBody CzrqForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
         mjyService.czrq(form);
@@ -209,7 +209,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("ysff")
     @RequiresPermissions("business:resource:mjy:ysff")
-    public AjaxResult ysff(@RequestBody MjyYsffForm form)
+    public AjaxResult ysff(@RequestBody YsffForm form)
     {
         form.setFfrId(SecurityUtils.getUserId());
         mjyService.ysff(form);
@@ -222,7 +222,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("ff")
     @RequiresPermissions("business:resource:mjy:ff")
-    public AjaxResult ff(@RequestBody MjyFfForm form)
+    public AjaxResult ff(@RequestBody FfForm form)
     {
         mjyService.ff(form);
         return AjaxResult.success("操作成功");
@@ -234,7 +234,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("plff")
     @RequiresPermissions("business:resource:mjy:ff")
-    public AjaxResult plff(@RequestBody MjyPlffForm form)
+    public AjaxResult plff(@RequestBody PlffForm form)
     {
         mjyService.plff(form);
         return AjaxResult.success("操作成功");
@@ -247,7 +247,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("bj")
     @RequiresPermissions("business:resource:mjy:bj")
-    public AjaxResult bj(@RequestBody MjyBjForm form)
+    public AjaxResult bj(@RequestBody BjForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.bj(form);
@@ -260,7 +260,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("shbj")
     @RequiresPermissions("business:resource:mjy:shbj")
-    public AjaxResult shbj(@RequestBody MjyShbjForm form)
+    public AjaxResult shbj(@RequestBody ShbjForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.shbj(form);
@@ -274,7 +274,7 @@ public class MjyController extends BaseController
      */
     @PostMapping("xgkc")
     @RequiresPermissions("business:resource:mjy:xgkc")
-    public AjaxResult xgkc(@RequestBody MjyXgkcForm form)
+    public AjaxResult xgkc(@RequestBody XgkcForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.xgkc(form);
@@ -287,12 +287,23 @@ public class MjyController extends BaseController
      */
     @PostMapping("shxgkc")
     @RequiresPermissions("business:resource:mjy:shxgkc")
-    public AjaxResult shxgkc(@RequestBody MjyShxgkcForm form)
+    public AjaxResult shxgkc(@RequestBody ShxgkcForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.shxgkc(form);
         return AjaxResult.success("操作成功");
     }
 
+    /**
+     * 归还
+     */
+    @PostMapping("gh")
+    @RequiresPermissions("business:resource:mjy:gh")
+    public AjaxResult gh(@RequestBody GhForm form)
+    {
+        //todo
+        return AjaxResult.error("todo");
+    }
+
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java

@@ -0,0 +1,115 @@
+package com.hxhq.business.controller;
+
+import com.hxhq.business.dto.mjy.MjyFfjlListDto;
+import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IMjyFfjlService;
+import com.hxhq.common.core.web.controller.BaseController;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.core.web.page.TableDataInfo;
+import com.hxhq.common.security.annotation.RequiresPermissions;
+import com.hxhq.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 麻精药发放记录Controller
+ *
+ * @author hxhq
+ * @date 2025-12-15
+ */
+@RestController
+@RequestMapping("/business/mjyFfjl")
+public class MjyFfjlController extends BaseController
+{
+    @Autowired
+    private IMjyFfjlService mjyFfjlService;
+
+    /**
+     * 查询列表
+     */
+    @GetMapping("/list")
+    @RequiresPermissions("business:resource:mjy:ffjllist")
+    public TableDataInfo list(FfjlSearchForm form)
+    {
+        startPage();
+        List<MjyFfjlListDto> list = mjyFfjlService.queryList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 解档
+     */
+    @PostMapping("/jd")
+    @RequiresPermissions("business:resource:mjy:ffjljd")
+    public AjaxResult jd(@RequestBody FfjlJdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.jd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 批量归档
+     */
+    @PostMapping("/plgd")
+    @RequiresPermissions("business:resource:mjy:ffjlgd")
+    public AjaxResult plgd(@RequestBody FfjlGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.plgd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 归档
+     */
+    @PostMapping("/gd")
+    @RequiresPermissions("business:resource:mjy:ffjlgd")
+    public AjaxResult gd(@RequestBody FfjlGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.gd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 批量锁定
+     */
+    @PostMapping("/plsd")
+    @RequiresPermissions("business:resource:mjy:ffjlsd")
+    public AjaxResult plsd(@RequestBody FfjlSdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.plsd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 锁定
+     */
+    @PostMapping("/sd")
+    @RequiresPermissions("business:resource:mjy:ffjlsd")
+    public AjaxResult sd(@RequestBody FfjlSdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.sd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 解锁
+     */
+    @PostMapping("/js")
+    @RequiresPermissions("business:resource:mjy:ffjljs")
+    public AjaxResult js(@RequestBody FfjlJsForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.js(form);
+        return AjaxResult.success("操作成功");
+    }
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java

@@ -18,10 +18,10 @@ public class GyzjFfjl extends MpBaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
-    private Long jlzt;
+    private Integer jlzt;
 
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
-    private Long jyzt;
+    private Integer jyzt;
 
     /** 麻精药id */
     private Long mjyId;
@@ -140,6 +140,39 @@ public class GyzjFfjl extends MpBaseEntity
     /** 归档申请人id */
     private Long gdsqrId;
 
+    /** 使用量 */
+    private String syl;
+
+    /** 使用量单位 */
+    private String syldw;
+
+    /** 暂存柜id */
+    private Long zcgId;
+
+    public String getSyl() {
+        return syl;
+    }
+
+    public void setSyl(String syl) {
+        this.syl = syl;
+    }
+
+    public String getSyldw() {
+        return syldw;
+    }
+
+    public void setSyldw(String syldw) {
+        this.syldw = syldw;
+    }
+
+    public Long getZcgId() {
+        return zcgId;
+    }
+
+    public void setZcgId(Long zcgId) {
+        this.zcgId = zcgId;
+    }
+
     public String getLqr1Mc() {
         return lqr1Mc;
     }
@@ -236,26 +269,22 @@ public class GyzjFfjl extends MpBaseEntity
         this.jsr2Id = jsr2Id;
     }
 
-    public void setJlzt(Long jlzt)
-    {
-        this.jlzt = jlzt;
-    }
-
-    public Long getJlzt()
-    {
+    public Integer getJlzt() {
         return jlzt;
     }
 
-    public void setJyzt(Long jyzt)
-    {
-        this.jyzt = jyzt;
+    public void setJlzt(Integer jlzt) {
+        this.jlzt = jlzt;
     }
 
-    public Long getJyzt()
-    {
+    public Integer getJyzt() {
         return jyzt;
     }
 
+    public void setJyzt(Integer jyzt) {
+        this.jyzt = jyzt;
+    }
+
     public void setMjyId(Long mjyId)
     {
         this.mjyId = mjyId;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java

@@ -18,106 +18,123 @@ public class GyzjTz extends MpBaseEntity
     /** 给药制剂id */
     private Long gyzjId;
 
-    /** 使用人id */
-    private Long syrId;
+    /** 领取人名称 */
+    private String lqrMc;
 
-    /** 领取人id */
-    private Long lqrId;
+    /** 归还人名称 */
+    private String ghrMc;
 
-    /** 发放人id */
-    private Long ffrId;
+    /** 发放人名称 */
+    private String ffrMc;
 
-    /** 归还人id */
-    private Long ghrId;
+    /** 接收人名称 */
+    private String jsrMc;
 
-    /** 接收人id */
-    private Long jsrId;
+    /** 操作量 */
+    private String czl;
 
-    /** 操作类型 */
-    private String czlx;
+    /** 操作量单位 */
+    private String czldw;
 
-    /** 操作量 */
-    private String cznr;
+    /** 签名意义 */
+    private String qmyy;
+
+    /** 签名人名称 */
+    private String qmrMc;
 
+    /** 签名人id */
+    private String qmrId;
 
-    public void setGyzjId(Long gyzjId)
-    {
+    /** 备注 */
+    private String remark;
+
+    public Long getGyzjId() {
+        return gyzjId;
+    }
+
+    public void setGyzjId(Long gyzjId) {
         this.gyzjId = gyzjId;
     }
 
-    public Long getGyzjId()
-    {
-        return gyzjId;
+    public String getLqrMc() {
+        return lqrMc;
     }
 
-    public void setSyrId(Long syrId)
-    {
-        this.syrId = syrId;
+    public void setLqrMc(String lqrMc) {
+        this.lqrMc = lqrMc;
     }
 
-    public Long getSyrId()
-    {
-        return syrId;
+    public String getGhrMc() {
+        return ghrMc;
     }
 
-    public void setLqrId(Long lqrId)
-    {
-        this.lqrId = lqrId;
+    public void setGhrMc(String ghrMc) {
+        this.ghrMc = ghrMc;
     }
 
-    public Long getLqrId()
-    {
-        return lqrId;
+    public String getFfrMc() {
+        return ffrMc;
     }
 
-    public void setFfrId(Long ffrId)
-    {
-        this.ffrId = ffrId;
+    public void setFfrMc(String ffrMc) {
+        this.ffrMc = ffrMc;
     }
 
-    public Long getFfrId()
-    {
-        return ffrId;
+    public String getJsrMc() {
+        return jsrMc;
     }
 
-    public void setGhrId(Long ghrId)
-    {
-        this.ghrId = ghrId;
+    public void setJsrMc(String jsrMc) {
+        this.jsrMc = jsrMc;
     }
 
-    public Long getGhrId()
-    {
-        return ghrId;
+    public String getCzl() {
+        return czl;
     }
 
-    public void setJsrId(Long jsrId)
-    {
-        this.jsrId = jsrId;
+    public void setCzl(String czl) {
+        this.czl = czl;
     }
 
-    public Long getJsrId()
-    {
-        return jsrId;
+    public String getCzldw() {
+        return czldw;
     }
 
-    public void setCzlx(String czlx)
-    {
-        this.czlx = czlx;
+    public void setCzldw(String czldw) {
+        this.czldw = czldw;
     }
 
-    public String getCzlx()
-    {
-        return czlx;
+    public String getQmyy() {
+        return qmyy;
     }
 
-    public void setCznr(String cznr)
-    {
-        this.cznr = cznr;
+    public void setQmyy(String qmyy) {
+        this.qmyy = qmyy;
     }
 
-    public String getCznr()
-    {
-        return cznr;
+    public String getQmrMc() {
+        return qmrMc;
     }
 
+    public void setQmrMc(String qmrMc) {
+        this.qmrMc = qmrMc;
+    }
+
+    public String getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(String qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java

@@ -79,8 +79,8 @@ public class Mjy extends MpBaseEntity
     /** 表单id */
     private Long bdId;
 
-    /** 项目id */
-    private Long xmId;
+    /** 目的id */
+    private Long mdId;
 
     /** 名称编辑 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -185,8 +185,16 @@ public class Mjy extends MpBaseEntity
     /** 发放备注 */
     private String ffbz;
 
-    /** 发放项目id */
-    private Long ffxmId;
+    /** 发放目的ids */
+    private String mdIds;
+
+    public String getMdIds() {
+        return mdIds;
+    }
+
+    public void setMdIds(String mdIds) {
+        this.mdIds = mdIds;
+    }
 
     public Date getFfrq() {
         return ffrq;
@@ -309,12 +317,12 @@ public class Mjy extends MpBaseEntity
         this.ffbz = ffbz;
     }
 
-    public Long getFfxmId() {
-        return ffxmId;
+    public Long getMdId() {
+        return mdId;
     }
 
-    public void setFfxmId(Long ffxmId) {
-        this.ffxmId = ffxmId;
+    public void setMdId(Long mdId) {
+        this.mdId = mdId;
     }
 
     public Long getBjrId() {
@@ -477,13 +485,7 @@ public class Mjy extends MpBaseEntity
         this.bdId = bdId;
     }
 
-    public Long getXmId() {
-        return xmId;
-    }
 
-    public void setXmId(Long xmId) {
-        this.xmId = xmId;
-    }
 
     public String getMcbj() {
         return mcbj;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java

@@ -18,10 +18,10 @@ public class MjyFfjl extends MpBaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
-    private Long jlzt;
+    private Integer jlzt;
 
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
-    private Long jyzt;
+    private Integer jyzt;
 
     /** 麻精药id */
     private Long mjyId;
@@ -94,8 +94,8 @@ public class MjyFfjl extends MpBaseEntity
     /** 发放备注 */
     private String ffbz;
 
-    /** 项目id */
-    private Long xmId;
+    /** 目的ids */
+    private String mdIds;
 
     /** 归还转移条件 */
     private String ghzytj;
@@ -140,12 +140,45 @@ public class MjyFfjl extends MpBaseEntity
     /** 归档申请人id */
     private Long gdsqrId;
 
-    public Long getXmId() {
-        return xmId;
+    /** 使用量 */
+    private String syl;
+
+    /** 使用量单位 */
+    private String syldw;
+
+    /** 暂存柜id */
+    private Long zcgId;
+
+    public String getMdIds() {
+        return mdIds;
+    }
+
+    public void setMdIds(String mdIds) {
+        this.mdIds = mdIds;
+    }
+
+    public String getSyl() {
+        return syl;
+    }
+
+    public void setSyl(String syl) {
+        this.syl = syl;
+    }
+
+    public String getSyldw() {
+        return syldw;
+    }
+
+    public void setSyldw(String syldw) {
+        this.syldw = syldw;
+    }
+
+    public Long getZcgId() {
+        return zcgId;
     }
 
-    public void setXmId(Long xmId) {
-        this.xmId = xmId;
+    public void setZcgId(Long zcgId) {
+        this.zcgId = zcgId;
     }
 
     public String getLqr1Mc() {
@@ -244,22 +277,22 @@ public class MjyFfjl extends MpBaseEntity
         this.jsr2Id = jsr2Id;
     }
 
-    public void setJlzt(Long jlzt)
+    public void setJlzt(Integer jlzt)
     {
         this.jlzt = jlzt;
     }
 
-    public Long getJlzt()
+    public Integer getJlzt()
     {
         return jlzt;
     }
 
-    public void setJyzt(Long jyzt)
+    public void setJyzt(Integer jyzt)
     {
         this.jyzt = jyzt;
     }
 
-    public Long getJyzt()
+    public Integer getJyzt()
     {
         return jyzt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyFfjlListDto.java

@@ -0,0 +1,254 @@
+package com.hxhq.business.dto.mjy;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * @author 15881
+ */
+public class MjyFfjlListDto {
+    /** id */
+    private Long id;
+
+    /** 名称 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 发放转移条件 */
+    private String ffzytj;
+
+    /** 发放日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ffrq;
+
+    /** 归还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ghrq;
+
+    /** 出库量 */
+    private String ckl;
+
+    /** 出库量单位 */
+    private String ckldw;
+
+    /** 入库量 */
+    private String rkl;
+
+    /** 入库单位 */
+    private String rkldw;
+
+    /** 出库毛重 */
+    private String ckmz;
+
+    /** 出库毛重单位 */
+    private String ckmzdw;
+
+    /** 领取人1名称 */
+    private String lqr1Mc;
+
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
+    /** 使用量 */
+    private String syl;
+
+    /** 使用量单位 */
+    private String syldw;
+
+    /** 暂存柜名称 */
+    private String zcgMc;
+
+    /** 目的名称 */
+    private String mdMc;
+
+    /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
+    private Long jlzt;
+
+    /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
+    private Long jyzt;
+
+    public String getMdMc() {
+        return mdMc;
+    }
+
+    public void setMdMc(String mdMc) {
+        this.mdMc = mdMc;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getFfzytj() {
+        return ffzytj;
+    }
+
+    public void setFfzytj(String ffzytj) {
+        this.ffzytj = ffzytj;
+    }
+
+    public Date getFfrq() {
+        return ffrq;
+    }
+
+    public void setFfrq(Date ffrq) {
+        this.ffrq = ffrq;
+    }
+
+    public Date getGhrq() {
+        return ghrq;
+    }
+
+    public void setGhrq(Date ghrq) {
+        this.ghrq = ghrq;
+    }
+
+    public String getCkl() {
+        return ckl;
+    }
+
+    public void setCkl(String ckl) {
+        this.ckl = ckl;
+    }
+
+    public String getCkldw() {
+        return ckldw;
+    }
+
+    public void setCkldw(String ckldw) {
+        this.ckldw = ckldw;
+    }
+
+    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 getCkmz() {
+        return ckmz;
+    }
+
+    public void setCkmz(String ckmz) {
+        this.ckmz = ckmz;
+    }
+
+    public String getCkmzdw() {
+        return ckmzdw;
+    }
+
+    public void setCkmzdw(String ckmzdw) {
+        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 getSyl() {
+        return syl;
+    }
+
+    public void setSyl(String syl) {
+        this.syl = syl;
+    }
+
+    public String getSyldw() {
+        return syldw;
+    }
+
+    public void setSyldw(String syldw) {
+        this.syldw = syldw;
+    }
+
+    public String getZcgMc() {
+        return zcgMc;
+    }
+
+    public void setZcgMc(String zcgMc) {
+        this.zcgMc = zcgMc;
+    }
+
+    public Long getJlzt() {
+        return jlzt;
+    }
+
+    public void setJlzt(Long jlzt) {
+        this.jlzt = jlzt;
+    }
+
+    public Long getJyzt() {
+        return jyzt;
+    }
+
+    public void setJyzt(Long jyzt) {
+        this.jyzt = jyzt;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java

@@ -91,8 +91,8 @@ public class MjyListDto {
     /** 发放备注 */
     private String ffbz;
 
-    /** 发放项目名称*/
-    private String ffxmMc;
+    /** 目的名称*/
+    private String mdMc;
 
     public String getCkl() {
         return ckl;
@@ -174,12 +174,12 @@ public class MjyListDto {
         this.ffbz = ffbz;
     }
 
-    public String getFfxmMc() {
-        return ffxmMc;
+    public String getMdMc() {
+        return mdMc;
     }
 
-    public void setFfxmMc(String ffxmMc) {
-        this.ffxmMc = ffxmMc;
+    public void setMdMc(String mdMc) {
+        this.mdMc = mdMc;
     }
 
     public Integer getRqzt() {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java

@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * @author 15881
  */
-public class MjyBjForm {
+public class BjForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzrqForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzrqForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyCzrqForm {
+public class CzrqForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyCzyjForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CzyjForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyCzyjForm {
+public class CzyjForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyFfForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyFfForm {
+public class FfForm {
 
     /** 麻精药id */
     private Long id;
@@ -14,8 +14,8 @@ public class MjyFfForm {
     /** 转移条件 */
     private String zytj;
 
-    /** 项目id */
-    private Long xmId;
+    /** 目的ids */
+    private String mdIds;
 
     /** 出库毛重 */
     private String ckmz;
@@ -79,12 +79,12 @@ public class MjyFfForm {
         this.zytj = zytj;
     }
 
-    public Long getXmId() {
-        return xmId;
+    public String getMdIds() {
+        return mdIds;
     }
 
-    public void setXmId(Long xmId) {
-        this.xmId = xmId;
+    public void setMdIds(String mdIds) {
+        this.mdIds = mdIds;
     }
 
     public String getCkmz() {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlGdForm.java

@@ -0,0 +1,62 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class FfjlGdForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /**  发放记录ids */
+    private Long[] ids;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJdForm.java

@@ -0,0 +1,52 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class FfjlJdForm {
+
+    /** 发放记录id */
+    private Long id;
+
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJsForm.java

@@ -0,0 +1,51 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class FfjlJsForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSdForm.java

@@ -0,0 +1,62 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class FfjlSdForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /**  发放记录ids */
+    private Long[] ids;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java

@@ -0,0 +1,106 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class FfjlSearchForm {
+
+    /** 名称 */
+    private String mc;
+
+    /** 编号 */
+    private String bh;
+
+    /** 入库日期开始 */
+    private String startDateRk;
+
+    /** 入库日期结束 */
+    private String endDateRk;
+
+    /** 出库日期开始 */
+    private String startDateCk;
+
+    /** 出库日期结束 */
+    private String endDateCk;
+
+    /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
+    private Integer jlzt;
+
+    /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
+    private Integer jyzt;
+
+    /** 目的id */
+    private Long mdId;
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
+    public String getStartDateRk() {
+        return startDateRk;
+    }
+
+    public void setStartDateRk(String startDateRk) {
+        this.startDateRk = startDateRk;
+    }
+
+    public String getEndDateRk() {
+        return endDateRk;
+    }
+
+    public void setEndDateRk(String endDateRk) {
+        this.endDateRk = endDateRk;
+    }
+
+    public String getStartDateCk() {
+        return startDateCk;
+    }
+
+    public void setStartDateCk(String startDateCk) {
+        this.startDateCk = startDateCk;
+    }
+
+    public String getEndDateCk() {
+        return endDateCk;
+    }
+
+    public void setEndDateCk(String endDateCk) {
+        this.endDateCk = endDateCk;
+    }
+
+    public Integer getJlzt() {
+        return jlzt;
+    }
+
+    public void setJlzt(Integer jlzt) {
+        this.jlzt = jlzt;
+    }
+
+    public Integer getJyzt() {
+        return jyzt;
+    }
+
+    public void setJyzt(Integer jyzt) {
+        this.jyzt = jyzt;
+    }
+
+    public Long getMdId() {
+        return mdId;
+    }
+
+    public void setMdId(Long mdId) {
+        this.mdId = mdId;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyGdForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GdForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyGdForm {
+public class GdForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java

@@ -0,0 +1,62 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class GhForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /**  发放记录ids */
+    private Long[] ids;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJdForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JdForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyJdForm {
+public class JdForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyJsForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/JsForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyJsForm {
+public class JsForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqForm.java

@@ -5,10 +5,10 @@ import java.util.List;
 /**
  * @author 15881
  */
-public class MjyPlczrqForm {
+public class PlczrqForm {
 
     /** 麻精药列表 */
-    private List<MjyPlczrqItem> list;
+    private List<PlczrqItem> list;
 
     /** 麻精药ids */
     private Long[] ids;
@@ -31,11 +31,11 @@ public class MjyPlczrqForm {
     /** 监督人密码 */
     private String jdrmm;
 
-    public List<MjyPlczrqItem> getList() {
+    public List<PlczrqItem> getList() {
         return list;
     }
 
-    public void setList(List<MjyPlczrqItem> list) {
+    public void setList(List<PlczrqItem> list) {
         this.list = list;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczrqItem.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczrqItem.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyPlczrqItem {
+public class PlczrqItem {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjForm.java

@@ -5,10 +5,10 @@ import java.util.List;
 /**
  * @author 15881
  */
-public class MjyPlczyjForm {
+public class PlczyjForm {
 
     /** 麻精药列表 */
-    private List<MjyPlczyjItem> list;
+    private List<PlczyjItem> list;
 
     /** 麻精药ids */
     private Long[] ids;
@@ -39,11 +39,11 @@ public class MjyPlczyjForm {
         this.ids = ids;
     }
 
-    public List<MjyPlczyjItem> getList() {
+    public List<PlczyjItem> getList() {
         return list;
     }
 
-    public void setList(List<MjyPlczyjItem> list) {
+    public void setList(List<PlczyjItem> list) {
         this.list = list;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlczyjItem.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlczyjItem.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyPlczyjItem {
+public class PlczyjItem {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffForm.java

@@ -5,10 +5,10 @@ import java.util.List;
 /**
  * @author 15881
  */
-public class MjyPlffForm {
+public class PlffForm {
 
     /** 麻精药列表 */
-    private List<MjyPlffItem> list;
+    private List<PlffItem> list;
 
     /** 麻精药ids */
     private Long[] ids;
@@ -45,11 +45,11 @@ public class MjyPlffForm {
         this.ids = ids;
     }
 
-    public List<MjyPlffItem> getList() {
+    public List<PlffItem> getList() {
         return list;
     }
 
-    public void setList(List<MjyPlffItem> list) {
+    public void setList(List<PlffItem> list) {
         this.list = list;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyPlffItem.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/PlffItem.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyPlffItem {
+public class PlffItem {
 
     /** 麻精药id */
     private Long id;
@@ -14,8 +14,8 @@ public class MjyPlffItem {
     /** 转移条件 */
     private String zytj;
 
-    /** 项目id */
-    private Long xmId;
+    /** 目的ids */
+    private String mdIds;
 
     /** 出库毛重 */
     private String ckmz;
@@ -55,12 +55,12 @@ public class MjyPlffItem {
         this.zytj = zytj;
     }
 
-    public Long getXmId() {
-        return xmId;
+    public String getMdIds() {
+        return mdIds;
     }
 
-    public void setXmId(Long xmId) {
-        this.xmId = xmId;
+    public void setMdIds(String mdIds) {
+        this.mdIds = mdIds;
     }
 
     public String getCkmz() {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySdForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SdForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjySdForm {
+public class SdForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjySearchForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java

@@ -7,7 +7,7 @@ import java.util.Date;
 /**
  * @author 15881
  */
-public class MjySearchForm {
+public class SearchForm {
 
     /** 名称 */
     private String mc;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java

@@ -7,7 +7,7 @@ import java.util.Date;
 /**
  * @author 15881
  */
-public class MjyShbjForm {
+public class ShbjForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyShxgkcForm {
+public class ShxgkcForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/XgkcForm.java

@@ -5,7 +5,7 @@ import com.hxhq.common.core.annotation.Excel;
 /**
  * @author 15881
  */
-public class MjyXgkcForm {
+public class XgkcForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyYsffForm.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/YsffForm.java

@@ -3,7 +3,7 @@ package com.hxhq.business.form.mjy;
 /**
  * @author 15881
  */
-public class MjyYsffForm {
+public class YsffForm {
 
     /** 麻精药id */
     private Long id;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyFfjlMapper.java

@@ -1,7 +1,15 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.MjyFfjl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.dto.mjy.MjyFfjlListDto;
+import com.hxhq.business.dto.mjy.MjyListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 麻精药-发放记录Mapper接口
  *
@@ -10,5 +18,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MjyFfjlMapper extends BaseMapper<MjyFfjl>
 {
-
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<MjyFfjlListDto> queryList(@Param("ew") Wrapper<MjyFfjl> queryWrapper);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java

@@ -18,14 +18,14 @@ import java.util.List;
 public interface MjyMapper extends BaseMapper<Mjy>
 {
     /**
-     * 查询暂存柜列表
+     * 查询列表
      * @param queryWrapper
      * @return
      */
     List<MjyListDto> queryList(@Param("ew") Wrapper<Mjy> queryWrapper);
 
     /**
-     *  查询暂存柜
+     *  查询详情
      * @param id
      * @return
      */

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java

@@ -3,6 +3,9 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.MjyFfjl;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.mjy.MjyFfjlListDto;
+import com.hxhq.business.form.mjy.*;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 麻精药-发放记录Service接口
@@ -15,9 +18,51 @@ public interface IMjyFfjlService extends IService
     /**
      * 查询麻精药-发放记录列表
      *
-     * @param mjyFfjl 麻精药-发放记录
+     * @param form 麻精药-发放记录
      * @return 麻精药-发放记录集合
      */
-    public List<MjyFfjl> queryList(MjyFfjl mjyFfjl);
+    public List<MjyFfjlListDto> queryList(FfjlSearchForm form);
 
+    /**
+     * 解档
+     *
+     * @param form
+     */
+    public void  jd(@RequestBody FfjlJdForm form);
+
+    /**
+     * 批量归档
+     *
+     * @param form
+     */
+    public void plgd(@RequestBody FfjlGdForm form);
+
+    /**
+     * 归档
+     *
+     * @param form
+     */
+    public void gd(@RequestBody FfjlGdForm form);
+
+
+    /**
+     * 批量锁定
+     *
+     * @param form
+     */
+    public void plsd(@RequestBody FfjlSdForm form);
+
+    /**
+     * 锁定
+     *
+     * @param form
+     */
+    public void sd(@RequestBody FfjlSdForm form);
+
+    /**
+     * 解锁
+     *
+     * @param form
+     */
+    public void js(@RequestBody FfjlJsForm form);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java

@@ -24,7 +24,7 @@ public interface IMjyService extends IService
      * @param form 麻精药
      * @return 麻精药集合
      */
-    public List<MjyListDto> queryList(MjySearchForm form);
+    public List<MjyListDto> queryList(SearchForm form);
 
     /**
      * 查询麻精药
@@ -39,21 +39,21 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void  jd(@RequestBody MjyJdForm form);
+    public void  jd(@RequestBody JdForm form);
 
     /**
      * 批量归档
      *
      * @param form
      */
-    public void plgd(@RequestBody MjyGdForm form);
+    public void plgd(@RequestBody GdForm form);
 
     /**
      * 归档
      *
      * @param form
      */
-    public void gd(@RequestBody MjyGdForm form);
+    public void gd(@RequestBody GdForm form);
 
 
     /**
@@ -61,49 +61,49 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void plsd(@RequestBody MjySdForm form);
+    public void plsd(@RequestBody SdForm form);
 
     /**
      * 锁定
      *
      * @param form
      */
-    public void sd(@RequestBody MjySdForm form);
+    public void sd(@RequestBody SdForm form);
 
     /**
      * 解锁
      *
      * @param form
      */
-    public void js(@RequestBody MjyJsForm form);
+    public void js(@RequestBody JsForm form);
 
     /**
      * 批量处置药剂
      *
      * @param form
      */
-    public void plczyj(@RequestBody MjyPlczyjForm form);
+    public void plczyj(@RequestBody PlczyjForm form);
 
     /**
      * 处置药剂
      *
      * @param form
      */
-    public void czyj(@RequestBody MjyCzyjForm form);
+    public void czyj(@RequestBody CzyjForm form);
 
     /**
      * 批量处置容器
      *
      * @param form
      */
-    public void plczrq(@RequestBody MjyPlczrqForm form);
+    public void plczrq(@RequestBody PlczrqForm form);
 
     /**
      * 处置容器
      *
      * @param form
      */
-    public void czrq(@RequestBody MjyCzrqForm form);
+    public void czrq(@RequestBody CzrqForm form);
 
 
     /**
@@ -111,7 +111,7 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void ysff(@RequestBody MjyYsffForm form);
+    public void ysff(@RequestBody YsffForm form);
 
 
     /**
@@ -119,7 +119,7 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void ff(@RequestBody MjyFfForm form);
+    public void ff(@RequestBody FfForm form);
 
 
     /**
@@ -127,34 +127,34 @@ public interface IMjyService extends IService
      *
      * @param form
      */
-    public void plff(@RequestBody MjyPlffForm form);
+    public void plff(@RequestBody PlffForm form);
 
     /**
      * 编辑
      *
      * @param form
      */
-    public void bj(@RequestBody MjyBjForm form);
+    public void bj(@RequestBody BjForm form);
 
     /**
      * 审核编辑
      *
      * @param form
      */
-    public void shbj(@RequestBody MjyShbjForm form);
+    public void shbj(@RequestBody ShbjForm form);
 
     /**
      * 修改库存
      *
      * @param form
      */
-    public void xgkc(@RequestBody MjyXgkcForm form);
+    public void xgkc(@RequestBody XgkcForm form);
 
     /**
      * 审核修改库存
      *
      * @param form
      */
-    public void shxgkc(@RequestBody MjyShxgkcForm form);
+    public void shxgkc(@RequestBody ShxgkcForm form);
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -1,13 +1,29 @@
 package com.hxhq.business.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.dto.mjy.MjyFfjlListDto;
+import com.hxhq.business.enums.zykgl.JcgjlxEnum;
+import com.hxhq.business.enums.zykgl.JcmcysEnum;
+import com.hxhq.business.enums.zykgl.JlztEnum;
+import com.hxhq.business.enums.zykgl.JlztEnum;
+import com.hxhq.business.form.mjy.*;
+import com.hxhq.common.core.utils.StringUtils;
+import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysUser;
+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.domain.MjyFfjl;
 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;
 
 /**
  * 麻精药-发放记录Service业务层处理
@@ -18,17 +34,268 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> implements IMjyFfjlService
 {
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
-     * 查询麻精药-发放记录列表
+     * 查询列表
      *
-     * @param mjyFfjl 麻精药-发放记录
-     * @return 麻精药-发放记录
+     * @param form 麻精药发放记录
+     * @return 麻精药发放记录
      */
     @Override
-    public List<MjyFfjl> queryList(MjyFfjl mjyFfjl)
+    public List<MjyFfjlListDto> queryList(FfjlSearchForm form)
     {
         QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
-        return this.list(queryWrapper);
+        queryWrapper.eq("t.del_flag", "0");
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getJlzt() != null && form.getJlzt().intValue() > 0) {
+            queryWrapper.eq("t.jlzt", form.getJlzt());
+        }
+        if (StringUtils.isNoneBlank(form.getMc())) {
+            queryWrapper.and(p -> p.like("t.`mc`", form.getMc()));
+        }
+        if (StringUtils.isNoneBlank(form.getBh())) {
+            queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateCk())) {
+            queryWrapper.and(p->p.apply("t.ffrq>={0}", form.getStartDateCk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateCk())) {
+            queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk());
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateRk())) {
+            queryWrapper.and(p->p.apply("t.rkrq>={0}", form.getStartDateRk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
+            queryWrapper.apply("t.rkrq>={0}", form.getEndDateRk());
+        }
+        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
+            queryWrapper.and(p->p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        }
+        queryWrapper.orderByDesc("t.id");
+        return baseMapper.queryList(queryWrapper);
+    }
+
+    /**
+     * 解档 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void jd(@RequestBody FfjlJdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("麻精药发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) {
+            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】未归档，不能解档");
+        }
+        //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作；
+        mjyFfjlOld.setJlzt(JlztEnum.djd.getValue());
+        this.updateById(mjyFfjlOld);
+//        //稽查轨迹 todo
+//        String jcnr = "备注：" + form.getRemark()
+//                + ";签名意义：申请解档"
+//                + ";签名人：" + qmr.getNickName();
+//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+//
+    }
+
+    /**
+     * 批量归档 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void plgd(@RequestBody FfjlGdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getIds().length < 0) {
+            throw new SecurityException("参数ids不正确");
+        }
+        QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
+        queryWrapper.in("id", form.getIds());
+        List<MjyFfjl> mjyFfjlList = this.list(queryWrapper);
+        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+        if (mjyFfjlList.size() > 0) {
+            for (MjyFfjl mjy : mjyFfjlList) {
+                if (!mjy.getJlzt().equals(JlztEnum.ysd.getValue())) {
+                    throw new SecurityException("麻精药发放记录【" + mjy.getMc() + "】不是锁定状态，不能归档");
+                }
+            }
+            for (MjyFfjl mjyFfjl : mjyFfjlList) {
+                //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
+                mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
+
+//                //region 稽查轨迹
+//                MjyJcgj mjyJcgj = new MjyJcgj();
+//                mjyJcgj.setMjyId(mjy.getId());
+//                mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+//                mjyJcgj.setJcmc("申请归档");
+//                mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
+//                String jcnr = "备注：" + form.getRemark()
+//                        + ";签名意义：申请归档"
+//                        + ";签名人：" + qmr.getNickName();
+//                mjyJcgj.setJcnr(jcnr);
+//                mjyJcgj.setQmrId(SecurityUtils.getUserId());
+//                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+//                mjyJcgjList.add(mjyJcgj);
+//                //endregion
+
+            }
+            this.saveOrUpdateBatch(mjyFfjlList);
+//            mjyJcgjService.saveBatch(mjyJcgjList);
+        }
+    }
+
+    /**
+     * 归档 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void gd(@RequestBody FfjlGdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("麻精药发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
+            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是锁定状态，不能归档");
+        }
+        //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
+        mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
+        this.updateById(mjyFfjlOld);
+//        //稽查轨迹
+//        String jcnr = "备注：" + form.getRemark()
+//                + ";签名意义：申请归档"
+//                + ";签名人：" + qmr.getNickName();
+//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+//
+    }
+
+
+    /**
+     * 批量锁定 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void plsd(@RequestBody FfjlSdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getIds().length < 0) {
+            throw new SecurityException("参数ids不正确");
+        }
+        QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
+        queryWrapper.in("id", form.getIds());
+        queryWrapper.eq("jlzt", JlztEnum.wsd.getValue());
+        List<MjyFfjl> mjyFfjlList = this.list(queryWrapper);
+//        List<MjyFfjlJcgj> mjyJcgjList = new ArrayList<>();
+        if (mjyFfjlList.size() <= 0) {
+            throw new SecurityException("麻精药发放记录不是未锁定状态，不能锁定");
+        }
+        for (MjyFfjl mjyFfjl : mjyFfjlList) {
+            //锁定
+            mjyFfjl.setJlzt(JlztEnum.ysd.getValue());
+
+//            //region 稽查轨迹
+//            MjyJcgj mjyJcgj = new MjyJcgj();
+//            mjyJcgj.setMjyId(mjy.getId());
+//            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+//            mjyJcgj.setJcmc("锁定麻精药发放记录");
+//            mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
+//            String jcnr = "备注：" + form.getRemark()
+//                    + ";签名意义：锁定麻精药发放记录"
+//                    + ";签名人：" + qmr.getNickName();
+//            mjyJcgj.setJcnr(jcnr);
+//            mjyJcgj.setQmrId(SecurityUtils.getUserId());
+//            mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+//            mjyJcgjList.add(mjyJcgj);
+//            //endregion
+
+        }
+        this.saveOrUpdateBatch(mjyFfjlList);
+//        mjyJcgjService.saveBatch(mjyJcgjList);
+
+    }
+
+    /**
+     * 锁定 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sd(@RequestBody FfjlSdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("麻精药发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) {
+            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能锁定");
+        }
+        mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
+        this.updateById(mjyFfjlOld);
+//        //稽查轨迹
+//        String jcnr = "备注：" + form.getRemark()
+//                + ";签名意义：锁定麻精药发放记录"
+//                + ";签名人：" + qmr.getNickName();
+//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+//
+    }
+
+
+    /**
+     * 解锁 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void js(@RequestBody FfjlJsForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("麻精药发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
+            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是已锁定状态，不能解锁");
+        }
+        //点击解锁，状态更新为入库；
+        mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue());
+        this.updateById(mjyFfjlOld);
+//        //稽查轨迹
+//        String jcnr = "备注：" + form.getRemark()
+//                + ";签名意义：解锁麻精药发放记录"
+//                + ";签名人：" + qmr.getNickName();
+//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+//
     }
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -4,7 +4,6 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
@@ -56,7 +55,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<MjyListDto> queryList(MjySearchForm form) {
+    public List<MjyListDto> queryList(SearchForm form) {
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
@@ -77,6 +76,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         if (StringUtils.isNoneBlank(form.getEndDate())) {
             queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
         }
+        queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
     }
 
@@ -103,7 +103,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void jd(@RequestBody MjyJdForm form) {
+    public void jd(@RequestBody JdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -133,7 +133,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plgd(@RequestBody MjyGdForm form) {
+    public void plgd(@RequestBody GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -181,7 +181,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gd(@RequestBody MjyGdForm form) {
+    public void gd(@RequestBody GdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -212,7 +212,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plsd(@RequestBody MjySdForm form) {
+    public void plsd(@RequestBody SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getIds().length < 0) {
@@ -258,7 +258,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sd(@RequestBody MjySdForm form) {
+    public void sd(@RequestBody SdForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -288,7 +288,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void js(@RequestBody MjyJsForm form) {
+    public void js(@RequestBody JsForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -318,7 +318,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczyj(@RequestBody MjyPlczyjForm form) {
+    public void plczyj(@RequestBody PlczyjForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -349,7 +349,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         List<MjyTz> mjyTzList = new ArrayList<>();
 
         for (Mjy mjy : mjyList) {
-            List<MjyPlczyjItem> mjyPlffItemFilter = form.getList().stream()
+            List<PlczyjItem> mjyPlffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
             if (mjyPlffItemFilter.size() > 0) {
@@ -424,7 +424,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czyj(@RequestBody MjyCzyjForm form) {
+    public void czyj(@RequestBody CzyjForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -497,7 +497,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plczrq(@RequestBody MjyPlczrqForm form) {
+    public void plczrq(@RequestBody PlczrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -526,7 +526,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new SecurityException("麻精药已经处置过容器了，不能重复操作");
         }
         for (Mjy mjy : mjyList) {
-            List<MjyPlczrqItem> mjyPlffItemFilter = form.getList().stream()
+            List<PlczrqItem> mjyPlffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
             if (mjyPlffItemFilter.size() > 0) {
@@ -576,7 +576,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void czrq(@RequestBody MjyCzrqForm form) {
+    public void czrq(@RequestBody CzrqForm form) {
         SysUser clr = sysUserService.selectUserById(form.getClrId());
         if (clr == null) {
             throw new SecurityException("处理人不存在");
@@ -629,7 +629,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ysff(@RequestBody MjyYsffForm form) {
+    public void ysff(@RequestBody YsffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         if (lqr1 == null) {
             throw new SecurityException("领取人1不存在");
@@ -709,7 +709,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(@RequestBody MjyFfForm form) {
+    public void ff(@RequestBody FfForm form) {
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -768,7 +768,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyFfjl.setFfzytj(form.getZytj());
         mjyFfjl.setFfrq(now);
         mjyFfjl.setFfbz(form.getRemark());
-        mjyFfjl.setXmId(form.getXmId());
+        mjyFfjl.setMdIds(form.getMdIds());
 
 
         mjyFfjlService.save(mjyFfjl);
@@ -779,7 +779,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         String jcnr = "出库量：" + mjyOld.getKc()
                 + ";转移条件：" + form.getZytj()
                 + ";出库毛重：" + form.getCkmz() + mjyOld.getKcdw()
-                + ";目的：" + form.getXmId()
+                + ";目的：" + form.getMdIds()
                 + ";备注：" + form.getRemark();
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), jcnr,
                 SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -809,7 +809,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setFfr2Mc(ffr2.getNickName());
         mjyOld.setFfrq(now);
         mjyOld.setFfbz(form.getRemark());
-        mjyOld.setFfxmId(form.getXmId());
+        mjyOld.setMdIds(form.getMdIds());
         mjyOld.setZjzt(ZjztEnum.yff.getValue());
         //endregion
 
@@ -825,7 +825,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plff(@RequestBody MjyPlffForm form) {
+    public void plff(@RequestBody PlffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         if (lqr1 == null) {
             throw new SecurityException("领取人1不存在");
@@ -866,10 +866,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             if (kc.compareTo(BigDecimal.ZERO) <= 0) {
                 throw new SecurityException("麻精药【" + mjy.getMc() + "】库存不足，不能发放");
             }
-            List<MjyPlffItem> mjyPlffItemFilter = form.getList().stream()
+            List<PlffItem> plffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
-            if (mjyPlffItemFilter.size() > 0) {
+            if (plffItemFilter.size() > 0) {
 
                 //region 发放记录
                 MjyFfjl mjyFfjl = new MjyFfjl();
@@ -885,8 +885,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyFfjl.setCkl(mjy.getKc());
 
                 mjyFfjl.setCkldw(mjy.getKcdw());
-                mjyFfjl.setCkmz(mjyPlffItemFilter.get(0).getCkmz());
-                mjyFfjl.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw());
+                mjyFfjl.setCkmz(plffItemFilter.get(0).getCkmz());
+                mjyFfjl.setCkmzdw(plffItemFilter.get(0).getCkmzdw());
                 mjyFfjl.setLqr1Id(lqr1.getUserId());
                 mjyFfjl.setLqr2Id(lqr2.getUserId());
                 mjyFfjl.setFfr1Id(ffr1.getUserId());
@@ -895,10 +895,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyFfjl.setLqr2Mc(lqr2.getNickName());
                 mjyFfjl.setFfr1Mc(ffr1.getNickName());
                 mjyFfjl.setFfr2Mc(ffr2.getNickName());
-                mjyFfjl.setFfzytj(mjyPlffItemFilter.get(0).getZytj());
+                mjyFfjl.setFfzytj(plffItemFilter.get(0).getZytj());
                 mjyFfjl.setFfrq(now);
-                mjyFfjl.setFfbz(mjyPlffItemFilter.get(0).getRemark());
-                mjyFfjl.setXmId(mjyPlffItemFilter.get(0).getXmId());
+                mjyFfjl.setFfbz(plffItemFilter.get(0).getRemark());
+                mjyFfjl.setMdIds(plffItemFilter.get(0).getMdIds());
 
                 mjyFfjlList.add(mjyFfjl);
                 //endregion
@@ -910,10 +910,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcmc("领取发放");
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
                 String jcnr = "出库量：" + mjy.getKc()
-                        + ";转移条件：" + mjyPlffItemFilter.get(0).getZytj()
-                        + ";出库毛重：" + mjyPlffItemFilter.get(0).getCkmz() + mjy.getKcdw()
-                        + ";目的：" + mjyPlffItemFilter.get(0).getXmId()
-                        + ";备注：" + mjyPlffItemFilter.get(0).getRemark();
+                        + ";转移条件：" + plffItemFilter.get(0).getZytj()
+                        + ";出库毛重：" + plffItemFilter.get(0).getCkmz() + mjy.getKcdw()
+                        + ";目的：" + plffItemFilter.get(0).getMdIds()
+                        + ";备注：" + plffItemFilter.get(0).getRemark();
                 mjyJcgj.setJcnr(jcnr);
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -928,16 +928,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyTz.setQmyy("领取发放");
                 mjyTz.setCzl(mjy.getKc());
                 mjyTz.setCzldw(mjy.getKcdw());
-                mjyTz.setRemark(mjyPlffItemFilter.get(0).getRemark());
+                mjyTz.setRemark(plffItemFilter.get(0).getRemark());
                 mjyTzList.add(mjyTz);
                 //endregion
 
                 //region 更新发放信息
                 mjy.setCkl(mjy.getKc());
                 mjy.setCkldw(mjy.getKcdw());
-                mjy.setFfzytj(mjyPlffItemFilter.get(0).getZytj());
-                mjy.setCkmz(mjyPlffItemFilter.get(0).getCkmz());
-                mjy.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw());
+                mjy.setFfzytj(plffItemFilter.get(0).getZytj());
+                mjy.setCkmz(plffItemFilter.get(0).getCkmz());
+                mjy.setCkmzdw(plffItemFilter.get(0).getCkmzdw());
                 mjy.setLqr1Id(lqr1.getUserId());
                 mjy.setLqr2Id(lqr2.getUserId());
                 mjy.setFfr1Id(ffr1.getUserId());
@@ -948,8 +948,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjy.setFfr2Mc(ffr2.getNickName());
                 mjy.setFfr2Mc(ffr2.getNickName());
                 mjy.setFfrq(now);
-                mjy.setFfbz(mjyPlffItemFilter.get(0).getRemark());
-                mjy.setFfxmId(mjyPlffItemFilter.get(0).getXmId());
+                mjy.setFfbz(plffItemFilter.get(0).getRemark());
+                mjy.setMdIds(plffItemFilter.get(0).getMdIds());
                 mjy.setZjzt(ZjztEnum.yff.getValue());
                 //endregion
 
@@ -970,7 +970,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void bj(@RequestBody MjyBjForm form) {
+    public void bj(@RequestBody BjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1025,7 +1025,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shbj(@RequestBody MjyShbjForm form) {
+    public void shbj(@RequestBody ShbjForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1090,7 +1090,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void xgkc(@RequestBody MjyXgkcForm form) {
+    public void xgkc(@RequestBody XgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {
@@ -1144,7 +1144,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void shxgkc(@RequestBody MjyShxgkcForm form) {
+    public void shxgkc(@RequestBody ShxgkcForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         //验证签名人密码 todo
         if (form.getId() == null || form.getId().longValue() < 0) {

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml

@@ -3,4 +3,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.MjyFfjlMapper">
+    <select id="queryList" resultType="com.hxhq.business.dto.mjy.MjyFfjlListDto">
+        select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc
+        ,z.mc as zcgMc
+        FROM `t_mjy_ffjl` t
+        left join  `t_zcg` z on z.id=t.zcg_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml

@@ -12,7 +12,7 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.MjyListDto">
         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.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as ffxmMc
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as mdMc
         ,z.mc as zcgMc
         FROM `t_mjy` t
         left join  `t_zcg` z on z.id=t.zcg_id