fix：[资源库管理][麻精药管理]功能完善

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

@@ -2,8 +2,12 @@ package com.hxhq.business.controller;
 
 import java.util.List;
 
-import com.hxhq.business.dto.mjy.MjyDto;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.domain.MjyTz;
+import com.hxhq.business.dto.mjy.MjyListDto;
 import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IMjyJcgjService;
+import com.hxhq.business.service.IMjyTzService;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +30,10 @@ public class MjyController extends BaseController
 {
     @Autowired
     private IMjyService mjyService;
+    @Autowired
+    private IMjyTzService mjyTzService;
+    @Autowired
+    private IMjyJcgjService mjyJcgjService;
 
     /**
      * 查询麻精药列表
@@ -35,7 +43,31 @@ public class MjyController extends BaseController
     public TableDataInfo list(MjySearchForm form)
     {
         startPage();
-        List<MjyDto> list = mjyService.queryList(form);
+        List<MjyListDto> list = mjyService.queryList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询稽查轨迹列表
+     */
+    @RequiresPermissions("business:resource:mjy:list")
+    @GetMapping("/jcgjList")
+    public TableDataInfo jcgjList(MjyJcgj form)
+    {
+        startPage();
+        List<MjyJcgj> list = mjyJcgjService.queryList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询台账列表
+     */
+    @RequiresPermissions("business:resource:mjy:list")
+    @GetMapping("/tzList")
+    public TableDataInfo tzList(MjyTz form)
+    {
+        startPage();
+        List<MjyTz> list = mjyTzService.queryList(form);
         return getDataTable(list);
     }
 
@@ -204,4 +236,59 @@ public class MjyController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
+
+
+    /**
+     * 编辑
+     */
+    @PostMapping("bj")
+    @RequiresPermissions("business:resource:mjy:bj")
+    public AjaxResult bj(@RequestBody MjyBjForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.bj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 审核编辑
+     */
+    @PostMapping("shbj")
+    @RequiresPermissions("business:resource:mjy:shbj")
+    public AjaxResult shbj(@RequestBody MjyBjForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.shbj(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+
+    /**
+     * 修改库存
+     */
+    @PostMapping("xgkc")
+    @RequiresPermissions("business:resource:mjy:xgkc")
+    public AjaxResult xgkc(@RequestBody MjyXgkcForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.xgkc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 审核修改库存
+     */
+    @PostMapping("shxgkc")
+    @RequiresPermissions("business:resource:mjy:shxgkc")
+    public AjaxResult shxgkc(@RequestBody MjyXgkcForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.shxgkc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
 }

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

@@ -1,6 +1,9 @@
 package com.hxhq.business.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.hxhq.common.core.domain.MpBaseEntity;
@@ -45,7 +48,8 @@ public class Mjy extends MpBaseEntity
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
-    /** 关联钥匙 */
+    /** 关联暂存柜id */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long zcgId;
 
     /** 存储条件 */
@@ -57,32 +61,40 @@ public class Mjy extends MpBaseEntity
     /** 表单id */
     private Long bdId;
 
-    /** 目的id */
-    private Long mdId;
+    /** 项目id */
+    private Long xmId;
 
     /** 名称编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String mcBj;
 
     /** 浓度编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String ndBj;
 
     /** 浓度单位编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String nddwBj;
 
     /** 库存编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String kcBj;
 
     /** 库存单位编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String kcdwBj;
 
     /** 失效日期编辑 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date sxrqBj;
 
     /** 存储条件编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String cctjBj;
 
     /** 存储位置编辑 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String ccwzBj;
 
     /** 编辑状态 1:未编辑 3:审核中 */
@@ -91,216 +103,195 @@ public class Mjy extends MpBaseEntity
     /** 库存状态 1:未编辑 3:审核中 */
     private Integer kczt;
 
-    public Long getMdId() {
-        return mdId;
+    public String getMc() {
+        return mc;
     }
 
-    public void setMdId(Long mdId) {
-        this.mdId = mdId;
+    public void setMc(String mc) {
+        this.mc = mc;
     }
 
-    public String getNddwBj() {
-        return nddwBj;
+    public String getBh() {
+        return bh;
     }
 
-    public void setNddwBj(String nddwBj) {
-        this.nddwBj = nddwBj;
+    public void setBh(String bh) {
+        this.bh = bh;
     }
 
-    public String getKcdwBj() {
-        return kcdwBj;
+    public String getNd() {
+        return nd;
     }
 
-    public void setKcdwBj(String kcdwBj) {
-        this.kcdwBj = kcdwBj;
+    public void setNd(String nd) {
+        this.nd = nd;
     }
 
-    public String getMcBj() {
-        return mcBj;
+    public String getNddw() {
+        return nddw;
     }
 
-    public void setMcBj(String mcBj) {
-        this.mcBj = mcBj;
+    public void setNddw(String nddw) {
+        this.nddw = nddw;
     }
 
-    public String getNdBj() {
-        return ndBj;
+    public String getKc() {
+        return kc;
     }
 
-    public void setNdBj(String ndBj) {
-        this.ndBj = ndBj;
+    public void setKc(String kc) {
+        this.kc = kc;
     }
 
-    public String getKcBj() {
-        return kcBj;
+    public String getKcdw() {
+        return kcdw;
     }
 
-    public void setKcBj(String kcBj) {
-        this.kcBj = kcBj;
+    public void setKcdw(String kcdw) {
+        this.kcdw = kcdw;
     }
 
-    public Date getSxrqBj() {
-        return sxrqBj;
+    public Date getSxrq() {
+        return sxrq;
     }
 
-    public void setSxrqBj(Date sxrqBj) {
-        this.sxrqBj = sxrqBj;
+    public void setSxrq(Date sxrq) {
+        this.sxrq = sxrq;
     }
 
-    public String getCctjBj() {
-        return cctjBj;
+    public Integer getZjzt() {
+        return zjzt;
     }
 
-    public void setCctjBj(String cctjBj) {
-        this.cctjBj = cctjBj;
+    public void setZjzt(Integer zjzt) {
+        this.zjzt = zjzt;
     }
 
-    public String getCcwzBj() {
-        return ccwzBj;
+    public Integer getJyzt() {
+        return jyzt;
     }
 
-    public void setCcwzBj(String ccwzBj) {
-        this.ccwzBj = ccwzBj;
+    public void setJyzt(Integer jyzt) {
+        this.jyzt = jyzt;
     }
 
-    public Integer getBjzt() {
-        return bjzt;
+    public Long getZcgId() {
+        return zcgId;
     }
 
-    public void setBjzt(Integer bjzt) {
-        this.bjzt = bjzt;
+    public void setZcgId(Long zcgId) {
+        this.zcgId = zcgId;
     }
 
-    public Integer getKczt() {
-        return kczt;
+    public String getCctj() {
+        return cctj;
     }
 
-    public void setKczt(Integer kczt) {
-        this.kczt = kczt;
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
     }
 
-    public void setMc(String mc)
-    {
-        this.mc = mc;
+    public String getCcwz() {
+        return ccwz;
     }
 
-    public String getMc()
-    {
-        return mc;
+    public void setCcwz(String ccwz) {
+        this.ccwz = ccwz;
     }
 
-    public void setBh(String bh)
-    {
-        this.bh = bh;
+    public Long getBdId() {
+        return bdId;
     }
 
-    public String getBh()
-    {
-        return bh;
+    public void setBdId(Long bdId) {
+        this.bdId = bdId;
     }
 
-    public void setNd(String nd)
-    {
-        this.nd = nd;
+    public Long getXmId() {
+        return xmId;
     }
 
-    public String getNd()
-    {
-        return nd;
+    public void setXmId(Long xmId) {
+        this.xmId = xmId;
     }
 
-    public void setNddw(String nddw)
-    {
-        this.nddw = nddw;
+    public String getMcBj() {
+        return mcBj;
     }
 
-    public String getNddw()
-    {
-        return nddw;
+    public void setMcBj(String mcBj) {
+        this.mcBj = mcBj;
     }
 
-    public void setKc(String kc)
-    {
-        this.kc = kc;
+    public String getNdBj() {
+        return ndBj;
     }
 
-    public String getKc()
-    {
-        return kc;
+    public void setNdBj(String ndBj) {
+        this.ndBj = ndBj;
     }
 
-    public void setKcdw(String kcdw)
-    {
-        this.kcdw = kcdw;
+    public String getNddwBj() {
+        return nddwBj;
     }
 
-    public String getKcdw()
-    {
-        return kcdw;
+    public void setNddwBj(String nddwBj) {
+        this.nddwBj = nddwBj;
     }
 
-    public void setSxrq(Date sxrq)
-    {
-        this.sxrq = sxrq;
+    public String getKcBj() {
+        return kcBj;
     }
 
-    public Date getSxrq()
-    {
-        return sxrq;
+    public void setKcBj(String kcBj) {
+        this.kcBj = kcBj;
     }
 
-    public Integer getZjzt() {  return zjzt; }
-
-    public void setZjzt(Integer zjzt) { this.zjzt = zjzt; }
+    public String getKcdwBj() {
+        return kcdwBj;
+    }
 
-    public void setJyzt(Integer jyzt)
-    {
-        this.jyzt = jyzt;
+    public void setKcdwBj(String kcdwBj) {
+        this.kcdwBj = kcdwBj;
     }
 
-    public Integer getJyzt()
-    {
-        return jyzt;
+    public Date getSxrqBj() {
+        return sxrqBj;
     }
 
-    public void setZcgId(Long zcgId)
-    {
-        this.zcgId = zcgId;
+    public void setSxrqBj(Date sxrqBj) {
+        this.sxrqBj = sxrqBj;
     }
 
-    public Long getZcgId()
-    {
-        return zcgId;
+    public String getCctjBj() {
+        return cctjBj;
     }
 
-    public void setCctj(String cctj)
-    {
-        this.cctj = cctj;
+    public void setCctjBj(String cctjBj) {
+        this.cctjBj = cctjBj;
     }
 
-    public String getCctj()
-    {
-        return cctj;
+    public String getCcwzBj() {
+        return ccwzBj;
     }
 
-    public void setCcwz(String ccwz)
-    {
-        this.ccwz = ccwz;
+    public void setCcwzBj(String ccwzBj) {
+        this.ccwzBj = ccwzBj;
     }
 
-    public String getCcwz()
-    {
-        return ccwz;
+    public Integer getBjzt() {
+        return bjzt;
     }
 
-    public void setBdId(Long bdId)
-    {
-        this.bdId = bdId;
+    public void setBjzt(Integer bjzt) {
+        this.bjzt = bjzt;
     }
 
-    public Long getBdId()
-    {
-        return bdId;
+    public Integer getKczt() {
+        return kczt;
     }
 
+    public void setKczt(Integer kczt) {
+        this.kczt = kczt;
+    }
 }

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

@@ -39,8 +39,11 @@ public class MjyTz extends MpBaseEntity
     /** 签名意义 */
     private String qmyy;
 
-    /** 操作内容 */
-    private String cznr;
+    /** 操作量 */
+    private String czl;
+
+    /** 操作量单位 */
+    private String czldw;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -110,11 +113,19 @@ public class MjyTz extends MpBaseEntity
         this.qmyy = qmyy;
     }
 
-    public String getCznr() {
-        return cznr;
+    public String getCzl() {
+        return czl;
+    }
+
+    public void setCzl(String czl) {
+        this.czl = czl;
+    }
+
+    public String getCzldw() {
+        return czldw;
     }
 
-    public void setCznr(String cznr) {
-        this.cznr = cznr;
+    public void setCzldw(String czldw) {
+        this.czldw = czldw;
     }
 }

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

@@ -0,0 +1,45 @@
+package com.hxhq.business.dto.mjy;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hxhq.business.domain.Mjy;
+
+import java.util.Date;
+
+/**
+ * @author 15881
+ */
+public class MjyDetailDto  extends Mjy {
+
+    /** 表单名称 */
+    private String bdMc;
+
+    /** 项目名称 */
+    private String xmMc;
+
+    /** 表单所属人名称  */
+    private String bdssrMc;
+
+    public String getBdMc() {
+        return bdMc;
+    }
+
+    public void setBdMc(String bdMc) {
+        this.bdMc = bdMc;
+    }
+
+    public String getXmMc() {
+        return xmMc;
+    }
+
+    public void setXmMc(String xmMc) {
+        this.xmMc = xmMc;
+    }
+
+    public String getBdssrMc() {
+        return bdssrMc;
+    }
+
+    public void setBdssrMc(String bdssrMc) {
+        this.bdssrMc = bdssrMc;
+    }
+}

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

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

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/BjEnum.java

@@ -0,0 +1,51 @@
+package com.hxhq.business.enums.zykgl;
+
+/**
+ * 编辑状态 1:未编辑 3:审核中
+ * @author tanfei
+ */
+public enum BjEnum {
+
+    /**
+     * 未编辑
+     */
+    wbj(1, "未编辑"),
+
+    /**
+     * 审核中
+     */
+    shz(3, "审核中");
+
+    private int value;
+    private String text;
+
+    BjEnum(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 BjEnum getEnumByValue(int type) {
+        for (BjEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcEnum.java

@@ -0,0 +1,51 @@
+package com.hxhq.business.enums.zykgl;
+
+/**
+ * 库存状态 1:未编辑 3:审核中
+ * @author tanfei
+ */
+public enum KcEnum {
+
+    /**
+     * 未编辑
+     */
+    wbj(1, "未编辑"),
+
+    /**
+     * 审核中
+     */
+    shz(3, "审核中");
+
+    private int value;
+    private String text;
+
+    KcEnum(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 KcEnum getEnumByValue(int type) {
+        for (KcEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}

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

@@ -21,6 +21,12 @@ public class MjyBjForm {
     /** 浓度单位编辑 */
     private String nddwBj;
 
+    /** 库存编辑 */
+    private String kcBj;
+
+    /** 库存单位编辑 */
+    private String kcdwBj;
+
     /** 失效日期编辑 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sxrqBj;
@@ -35,19 +41,11 @@ public class MjyBjForm {
     private String remark;
 
     /** 签名人id */
-    private String qmrId;
+    private Long qmrId;
 
     /** 签名人密码 */
     private String qmrmm;
 
-    public String getNddwBj() {
-        return nddwBj;
-    }
-
-    public void setNddwBj(String nddwBj) {
-        this.nddwBj = nddwBj;
-    }
-
     public String getMcBj() {
         return mcBj;
     }
@@ -64,6 +62,30 @@ public class MjyBjForm {
         this.ndBj = ndBj;
     }
 
+    public String getNddwBj() {
+        return nddwBj;
+    }
+
+    public void setNddwBj(String nddwBj) {
+        this.nddwBj = nddwBj;
+    }
+
+    public String getKcBj() {
+        return kcBj;
+    }
+
+    public void setKcBj(String kcBj) {
+        this.kcBj = kcBj;
+    }
+
+    public String getKcdwBj() {
+        return kcdwBj;
+    }
+
+    public void setKcdwBj(String kcdwBj) {
+        this.kcdwBj = kcdwBj;
+    }
+
     public Date getSxrqBj() {
         return sxrqBj;
     }
@@ -104,11 +126,11 @@ public class MjyBjForm {
         this.remark = remark;
     }
 
-    public String getQmrId() {
+    public Long getQmrId() {
         return qmrId;
     }
 
-    public void setQmrId(String qmrId) {
+    public void setQmrId(Long qmrId) {
         this.qmrId = qmrId;
     }
 

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

@@ -13,12 +13,6 @@ public class MjyPlczrqForm {
     /** 麻精药ids */
     private Long[] ids;
 
-    /** 处置原因 */
-    private String czyy;
-
-    /** 处置方式 */
-    private String czfs;
-
     /** 处置人id */
     private Long clrId;
 
@@ -53,21 +47,7 @@ public class MjyPlczrqForm {
         this.ids = ids;
     }
 
-    public String getCzyy() {
-        return czyy;
-    }
-
-    public void setCzyy(String czyy) {
-        this.czyy = czyy;
-    }
-
-    public String getCzfs() {
-        return czfs;
-    }
 
-    public void setCzfs(String czfs) {
-        this.czfs = czfs;
-    }
 
     public Long getClrId() {
         return clrId;

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

@@ -18,7 +18,7 @@ public class MjyXgkcForm {
     private String remark;
 
     /** 签名人id */
-    private String qmrId;
+    private Long qmrId;
 
     /** 签名人密码 */
     private String qmrmm;
@@ -55,11 +55,11 @@ public class MjyXgkcForm {
         this.remark = remark;
     }
 
-    public String getQmrId() {
+    public Long getQmrId() {
         return qmrId;
     }
 
-    public void setQmrId(String qmrId) {
+    public void setQmrId(Long qmrId) {
         this.qmrId = qmrId;
     }
 

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

@@ -3,9 +3,8 @@ package com.hxhq.business.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.Mjy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxhq.business.domain.Zcg;
-import com.hxhq.business.dto.mjy.MjyDto;
-import com.hxhq.business.dto.zcg.ZcgDto;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyListDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,13 +22,13 @@ public interface MjyMapper extends BaseMapper
      * @param queryWrapper
      * @return
      */
-    List<MjyDto> queryList(@Param("ew") Wrapper<Mjy> queryWrapper);
+    List<MjyListDto> queryList(@Param("ew") Wrapper<Mjy> queryWrapper);
 
     /**
      *  查询暂存柜
      * @param id
      * @return
      */
-    Mjy queryInfo(@Param("id") Long id);
+    MjyDetailDto queryInfo(@Param("id") Long id);
 
 }

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

@@ -16,11 +16,10 @@ public interface IMjyJcgjService extends IService
 {
     /**
      * 查询稽查轨迹列表
-     * @param mjyId 麻精药id
-     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param mjyJcgj 麻精药
      * @return
      */
-    public List<MjyJcgj> queryListByMjyId(Long mjyId, Integer jcgjlx);
+    public List<MjyJcgj> queryList(MjyJcgj mjyJcgj);
 
     /**
      * 新增稽查轨迹

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

@@ -1,9 +1,11 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
 import com.hxhq.business.domain.Mjy;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxhq.business.dto.mjy.MjyDto;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyListDto;
 import com.hxhq.business.form.mjy.*;
 ;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,18 +21,18 @@ public interface IMjyService extends IService
     /**
      * 查询麻精药列表
      *
-     * @param form 暂存柜
-     * @return 暂存柜集合
+     * @param form 麻精药
+     * @return 麻精药集合
      */
-    public List<MjyDto> queryList(MjySearchForm form);
+    public List<MjyListDto> queryList(MjySearchForm form);
 
     /**
      * 查询麻精药
      *
      * @param id
-     * @return 暂存柜
+     * @return 麻精药
      */
-    public Mjy queryInfo(Long id);
+    public MjyDetailDto queryInfo(Long id);
 
     /**
      * 解档
@@ -127,4 +129,32 @@ public interface IMjyService extends IService
      */
     public void plff(@RequestBody MjyPlffForm form);
 
+    /**
+     * 编辑
+     *
+     * @param form
+     */
+    public void bj(@RequestBody MjyBjForm form);
+
+    /**
+     * 审核编辑
+     *
+     * @param form
+     */
+    public void shbj(@RequestBody MjyBjForm form);
+
+    /**
+     * 修改库存
+     *
+     * @param form
+     */
+    public void xgkc(@RequestBody MjyXgkcForm form);
+
+    /**
+     * 审核修改库存
+     *
+     * @param form
+     */
+    public void shxgkc(@RequestBody MjyXgkcForm form);
+
 }

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

@@ -17,13 +17,13 @@ public interface IMjyTzService extends IService
 
     /**
      * 查询台账列表
-     * @param mjyId 麻精药id
+     * @param mjyTz 麻精药
      * @return
      */
-    public List<MjyTz> queryListByMjyId(Long mjyId);
+    public List<MjyTz> queryList(MjyTz mjyTz);
 
     /**
-     * 新增稽查轨迹
+     * 新增台账
      * @param mjyId 麻精药id
      * @param lqrMc 领取人名称
      * @param ghrMc 归还人名称
@@ -32,7 +32,9 @@ public interface IMjyTzService extends IService
      * @param qmrId 签名人id
      * @param qmrMc 签名人名称
      * @param qmyy 签名意义
-     * @param cznr 操作内容
+     * @param czl 操作量
+     * @param czldw 操作量单位
+     * @param remark 备注
      */
-    public  void saveTz(Long  mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String cznr);
+    public  void saveTz(Long  mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.GyzjJcgj;
 import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.common.core.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyJcgjMapper;
 import com.hxhq.business.domain.MjyJcgj;
@@ -23,19 +24,22 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
 
     /**
      * 查询稽查轨迹列表
-     * @param mjyId 麻给药制剂id
-     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param mjyJcgj 麻给药
      * @return
      */
     @Override
-    public List<MjyJcgj> queryListByMjyId(Long mjyId, Integer jcgjlx){
+    public List<MjyJcgj> queryList(MjyJcgj mjyJcgj){
         QueryWrapper<MjyJcgj> queryWrapper = Wrappers.query();
-        if(mjyId==null){
+        if(mjyJcgj.getMjyId()==null||mjyJcgj.getMjyId().longValue()<0){
             throw new SecurityException("麻精药id不能为空");
         }
-        queryWrapper.eq("mjy_id",mjyId);
-        if(jcgjlx!=null&&jcgjlx.intValue()>0){
-            queryWrapper.eq("jcgjlx",jcgjlx);
+        queryWrapper.eq("mjy_id",mjyJcgj.getMjyId());
+        if(mjyJcgj.getJcgjlx()!=null&&mjyJcgj.getJcgjlx().intValue()>0){
+            queryWrapper.eq("jcgjlx",mjyJcgj.getJcgjlx());
+        }
+        if (StringUtils.isBlank(mjyJcgj.getJcrMc())) {
+            queryWrapper.and(p -> p.like("`jcmc`", mjyJcgj.getJcrMc())
+            .or().like("`jcnr`", mjyJcgj.getJcrMc()));
         }
         queryWrapper.orderByDesc("id");
         return this.list(queryWrapper);

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

@@ -1,22 +1,17 @@
 package com.hxhq.business.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
-import com.hxhq.business.dto.mjy.MjyDto;
-import com.hxhq.business.enums.zykgl.JcgjlxEnum;
-import com.hxhq.business.enums.zykgl.JcmcysEnum;
-import com.hxhq.business.enums.zykgl.ZjztEnum;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyListDto;
+import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.mjy.*;
-import com.hxhq.business.service.IMjyFfjlService;
-import com.hxhq.business.service.IMjyJcgjService;
-import com.hxhq.business.service.IZcgService;
+import com.hxhq.business.service.*;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.domain.SysUser;
@@ -25,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyMapper;
 import com.hxhq.business.domain.Mjy;
-import com.hxhq.business.service.IMjyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -46,6 +40,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
     private IMjyFfjlService mjyFfjlService;
     @Autowired
     private IZcgService zcgService;
+    @Autowired
+    private IMjyTzService mjyTzService;
 
     /**
      * 查询麻精药列表
@@ -55,7 +51,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<MjyDto> queryList(MjySearchForm form) {
+    public List<MjyListDto> queryList(MjySearchForm form) {
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
@@ -88,7 +84,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Mjy queryInfo(Long id) {
+    public MjyDetailDto queryInfo(Long id) {
         if (id == null || id.longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -345,11 +341,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new SecurityException("麻精药不是入库状态，不能处置药剂");
         }
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+        List<MjyTz> mjyTzList = new ArrayList<>();
+
         for (Mjy mjy : mjyList) {
             List<MjyPlczyjItem> mjyPlffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
             if (mjyPlffItemFilter.size() > 0) {
+                //region 验证
                 try {
                     if (StringUtils.isBlank(mjyPlffItemFilter.get(0).getCzl())) {
                         throw new SecurityException("处置量不能为空");
@@ -368,6 +367,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 } catch (Exception ex) {
                     throw new SecurityException("麻精药【" + mjy.getMc() + "】处置量不正确，请填写正确的数字");
                 }
+                //endregion
 
                 //region 稽查轨迹
                 MjyJcgj mjyJcgj = new MjyJcgj();
@@ -387,7 +387,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
 
-                //台账 todo
+                //region 台账
+                MjyTz mjyTz = new MjyTz();
+                mjyTz.setMjyId(mjy.getId());
+                mjyTz.setQmyy("处置药剂");
+                mjyTz.setQmrId(clr.getUserId());
+                mjyTz.setQmrMc(clr.getNickName());
+                mjyTz.setCzl(mjyPlffItemFilter.get(0).getCzl());
+                mjyTz.setCzldw(mjy.getKcdw());
+                mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy());
+                mjyTzList.add(mjyTz);
+                //endregion
 
             } else {
                 throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除");
@@ -395,6 +405,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         this.saveOrUpdateBatch(mjyList);
         mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyTzService.saveBatch(mjyTzList);
     }
 
 
@@ -459,8 +470,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
+        //region 台账
+        mjyTzService.saveTz(mjyOld.getId(), "", "",
+                "", "", clr.getUserId(), clr.getNickName(),
+                "处置药剂", form.getCzl(),  mjyOld.getKcdw(), form.getCzyy());
+        //endregion
+
         this.updateById(mjyOld);
-        //台账 todo
     }
 
 
@@ -493,6 +509,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         queryWrapper.eq("zjzt", ZjztEnum.rk.getValue());
         List<Mjy> mjyList = this.list(queryWrapper);
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+        List<MjyTz> mjyTzList = new ArrayList<>();
+
         if (mjyList.size() <= 0) {
             throw new SecurityException("麻精药不是入库状态，不能处置容器");
         }
@@ -508,8 +526,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 mjyJcgj.setJcmc("处置容器");
                 mjyJcgj.setJcmcys(JcmcysEnum.wsd.getValue());
-                String jcnr = "处置方式：" + form.getCzfs()
-                        + ";处置原因：" + form.getCzyy()
+                String jcnr = "处置方式：" + mjyPlffItemFilter.get(0).getCzfs()
+                        + ";处置原因：" + mjyPlffItemFilter.get(0).getCzyy()
                         + ";处置人：" + clr.getNickName()
                         + ";复核人：" + fhr.getNickName()
                         + ";监督人：" + jdr.getNickName();
@@ -519,12 +537,21 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
 
-                //台账 todo
+                //region 台账
+                MjyTz mjyTz = new MjyTz();
+                mjyTz.setMjyId(mjy.getId());
+                mjyTz.setQmyy("处置容器");
+                mjyTz.setQmrId(clr.getUserId());
+                mjyTz.setQmrMc(clr.getNickName());
+                mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy());
+                mjyTzList.add(mjyTz);
+                //endregion
             } else {
                 throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除");
             }
         }
         mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyTzService.saveBatch(mjyTzList);
     }
 
     /**
@@ -568,7 +595,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
-        //台账 todo
+        //region 台账
+        mjyTzService.saveTz(mjyOld.getId(), "", "",
+                "", "", clr.getUserId(), clr.getNickName(),
+                "处置容器", "", "", form.getCzyy());
+        //endregion
     }
 
 
@@ -727,11 +758,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 + ";出库毛重：" + form.getCkmz() + mjyOld.getKcdw()
                 + ";目的：" + form.getXmId()
                 + ";备注：" + form.getRemark();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.wsd.getValue(), jcnr,
+                SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
-        //region 台账 todo
-
+        //region 台账
+        mjyTzService.saveTz(mjyOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "",
+                ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "",
+                "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark());
         //endregion
 
         //更新状态为已发放，修改库存为0 是否关联最后一次发放记录？ todo
@@ -779,6 +813,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         List<Mjy> mjyList = this.list(queryWrapper);
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
         List<MjyFfjl> mjyFfjlList = new ArrayList<>();
+        List<MjyTz> mjyTzList = new ArrayList<>();
         if (mjyList.size() <= 0) {
             throw new SecurityException("麻精药不是入库状态，不能发放");
         }
@@ -842,7 +877,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
 
-                //台账 todo
+                //region 台账
+                MjyTz mjyTz = new MjyTz();
+                mjyTz.setMjyId(mjy.getId());
+                mjyTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName());
+                mjyTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName());
+                mjyTz.setQmyy("领取发放");
+                mjyTz.setCzl(mjy.getKc());
+                mjyTz.setCzldw(mjy.getKcdw());
+                mjyTz.setRemark(mjyPlffItemFilter.get(0).getRemark());
+                mjyTzList.add(mjyTz);
+                //endregion
 
                 //发放 是否关联最后一次发放记录？ todo
                 mjy.setZjzt(ZjztEnum.yff.getValue());
@@ -853,8 +898,479 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         mjyJcgjService.saveBatch(mjyJcgjList);
         mjyFfjlService.saveBatch(mjyFfjlList);
+        mjyTzService.saveBatch(mjyTzList);
         this.saveOrUpdateBatch(mjyList);
     }
 
+    /**
+     * 编辑 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bj(@RequestBody MjyBjForm form){
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new SecurityException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getBjzt().equals(BjEnum.wbj.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经提交编辑申请，请等待审核");
+        }
+        if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能编辑");
+        }
+        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+
+        //region 名称
+        if(!mjyOld.getMc().equals(form.getMcBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：名称"
+                    + ";原值：" + mjyOld.getMc()
+                    + ";新值：" + form.getMcBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setMcBj(form.getMcBj());
+        }
+        //endregion
+
+        //region 浓度
+        if(!mjyOld.getNd().equals(form.getNdBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：浓度"
+                    + ";原值：" + mjyOld.getNd()
+                    + ";新值：" + form.getNdBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setNdBj(form.getNdBj());
+        }
+        //endregion
+
+        //region 浓度单位
+        if(!mjyOld.getNddw().equals(form.getNddwBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：浓度单位"
+                    + ";原值：" + mjyOld.getNddw()
+                    + ";新值：" + form.getNddwBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setNddwBj(form.getNddwBj());
+        }
+        //endregion
+
+        //region 失效日期
+        if(!mjyOld.getSxrq().equals(form.getSxrqBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：失效日期"
+                    + ";原值：" + mjyOld.getSxrq()
+                    + ";新值：" + form.getSxrqBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setSxrqBj(form.getSxrqBj());
+        }
+        //endregion
+
+        //region 存储条件
+        if(!mjyOld.getCctj().equals(form.getCctjBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：存储条件"
+                    + ";原值：" + mjyOld.getCctj()
+                    + ";新值：" + form.getCctjBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setCctjBj(form.getCctjBj());
+        }
+        //endregion
+
+        //region 存储位置
+        if(!mjyOld.getCcwz().equals(form.getCcwzBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：存储位置"
+                    + ";原值：" + mjyOld.getCcwz()
+                    + ";新值：" + form.getCcwzBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+            mjyOld.setNdBj(form.getNdBj());
+
+            mjyOld.setCcwzBj(form.getCcwzBj());
+        }
+        //endregion
+
+        if(mjyJcgjList.size()>0){
+            mjyOld.setBjzt(BjEnum.shz.getValue());
+            this.updateById(mjyOld);
+            mjyJcgjService.saveBatch(mjyJcgjList);
+        }else{
+            throw new SecurityException("你没有修改任何内容");
+        }
+    }
+
+    /**
+     * 审核编辑 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void shbj(@RequestBody MjyBjForm form){
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new SecurityException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getBjzt().equals(BjEnum.shz.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】没有提交编辑申请，不能审核编辑");
+        }
+        if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核编辑");
+        }
+        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+
+        //region 名称
+        if(!mjyOld.getMc().equals(form.getMcBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：名称"
+                    + ";原值：" + mjyOld.getMc()
+                    + ";新值：" + form.getMcBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setMc(form.getMcBj());
+        }
+        //endregion
+
+        //region 浓度
+        if(!mjyOld.getNd().equals(form.getNdBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：浓度"
+                    + ";原值：" + mjyOld.getNd()
+                    + ";新值：" + form.getNdBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setNd(form.getNdBj());
+        }
+        //endregion
+
+        //region 浓度单位
+        if(!mjyOld.getNddw().equals(form.getNddwBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：浓度单位"
+                    + ";原值：" + mjyOld.getNddw()
+                    + ";新值：" + form.getNddwBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setNddw(form.getNddwBj());
+        }
+        //endregion
+
+        //region 失效日期
+        if(!mjyOld.getSxrq().equals(form.getSxrqBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：失效日期"
+                    + ";原值：" + mjyOld.getSxrq()
+                    + ";新值：" + form.getSxrqBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setSxrq(form.getSxrqBj());
+        }
+        //endregion
+
+        //region 存储条件
+        if(!mjyOld.getCctj().equals(form.getCctjBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：存储条件"
+                    + ";原值：" + mjyOld.getCctj()
+                    + ";新值：" + form.getCctjBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setCctj(form.getCctjBj());
+        }
+        //endregion
+
+        //region 存储位置
+        if(!mjyOld.getCcwz().equals(form.getCcwzBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核编辑");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：存储位置"
+                    + ";原值：" + mjyOld.getCcwz()
+                    + ";新值：" + form.getCcwzBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+            mjyOld.setNdBj(form.getNdBj());
+
+            mjyOld.setCcwz(form.getCcwzBj());
+        }
+        //endregion
+
+        mjyOld.setMcBj(null);
+        mjyOld.setNddwBj(null);
+        mjyOld.setNdBj(null);
+        mjyOld.setSxrqBj(null);
+        mjyOld.setCctjBj(null);
+        mjyOld.setCcwzBj(null);
+        mjyOld.setBjzt(BjEnum.wbj.getValue());
+        this.updateById(mjyOld);
+        if(mjyJcgjList.size()>0){
+            mjyJcgjService.saveBatch(mjyJcgjList);
+        }
+    }
+
+
+    /**
+     * 修改库存
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void xgkc(@RequestBody MjyXgkcForm form){
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new SecurityException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getKczt().equals(KcEnum.wbj.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经提交修改库存申请，请等待审核");
+        }
+        if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能修改库存");
+        }
+        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+
+        //region 库存
+        if(!mjyOld.getKc().equals(form.getKcBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("修改库存");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：库存"
+                    + ";原值：" + mjyOld.getKc()
+                    + ";新值：" + form.getKcBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setKcBj(form.getKcBj());
+        }
+        //endregion
+
+        //region 库存单位
+        if(!mjyOld.getKcdw().equals(form.getKcdwBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("修改库存");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：库存单位"
+                    + ";原值：" + mjyOld.getKcdw()
+                    + ";新值：" + form.getKcdwBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setKcdw(form.getKcdwBj());
+        }
+        //endregion
+
+        if(mjyJcgjList.size()>0){
+            mjyOld.setKczt(KcEnum.shz.getValue());
+            this.updateById(mjyOld);
+            mjyJcgjService.saveBatch(mjyJcgjList);
+        }else{
+            throw new SecurityException("你没有修改任何内容");
+        }
+    }
+
+
+    /**
+     * 审核修改库存
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void shxgkc(@RequestBody MjyXgkcForm form){
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new SecurityException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getKczt().equals(KcEnum.shz.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】没有提交修改库存申请，不能审核修改库存");
+        }
+        if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核修改库存");
+        }
+        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+
+        //region 库存
+        if(!mjyOld.getKc().equals(form.getKcBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核修改库存");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：库存"
+                    + ";原值：" + mjyOld.getKc()
+                    + ";新值：" + form.getKcBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setKc(form.getKcBj());
+        }
+        //endregion
+
+        //region 库存单位
+        if(!mjyOld.getKcdw().equals(form.getKcdwBj())){
+            MjyJcgj mjyJcgj = new MjyJcgj();
+            mjyJcgj.setMjyId(mjyOld.getId());
+            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyJcgj.setJcmc("审核修改库存");
+            mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue());
+            String jcnr = "字段名：库存单位"
+                    + ";原值：" + mjyOld.getKcdw()
+                    + ";新值：" + form.getKcdwBj()
+                    + ";备注：" + form.getRemark();
+            mjyJcgj.setJcnr(jcnr);
+            mjyJcgj.setJcrId(qmr.getUserId());
+            mjyJcgj.setJcrMc(qmr.getNickName());
+            mjyJcgjList.add(mjyJcgj);
+
+            mjyOld.setKcdw(form.getKcdwBj());
+        }
+        //endregion
+
+        mjyOld.setKcBj(null);
+        mjyOld.setKcdwBj(null);
+        mjyOld.setKczt(KcEnum.wbj.getValue());
+        this.updateById(mjyOld);
+
+        //region 台账
+        mjyTzService.saveTz(mjyOld.getId(), "", "",
+                "", "", qmr.getUserId(), qmr.getNickName(),
+                "修改库存", form.getKcBj(),  form.getKcdwBj(), form.getRemark());
+        //endregion
+
+        if(mjyJcgjList.size()>0){
+            mjyJcgjService.saveBatch(mjyJcgjList);
+        }
+    }
 
 }

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

@@ -22,22 +22,22 @@ public class MjyTzServiceImpl extends ServiceImpl implements
 
     /**
      * 查询台账列表
-     * @param mjyId 麻精药id
+     * @param mjyTz 麻精药
      * @return
      */
     @Override
-    public List<MjyTz> queryListByMjyId(Long mjyId){
+    public List<MjyTz> queryList(MjyTz mjyTz){
         QueryWrapper<MjyTz> queryWrapper = Wrappers.query();
-        if(mjyId==null){
+        if(mjyTz.getMjyId()==null||mjyTz.getMjyId().longValue()<0){
             throw new SecurityException("麻精药id不能为空");
         }
-        queryWrapper.eq("mjy_id",mjyId);
+        queryWrapper.eq("mjy_id",mjyTz.getMjyId());
         queryWrapper.orderByDesc("id");
         return this.list(queryWrapper);
     }
 
     /**
-     * 新增稽查轨迹
+     * 新增台账
      * @param mjyId 麻精药id
      * @param lqrMc 领取人名称
      * @param ghrMc 归还人名称
@@ -46,10 +46,12 @@ public class MjyTzServiceImpl extends ServiceImpl implements
      * @param qmrId 签名人id
      * @param qmrMc 签名人名称
      * @param qmyy 签名意义
-     * @param cznr 操作内容
+     * @param czl 操作量
+     * @param czldw 操作量单位
+     * @param remark 备注
      */
     @Override
-    public  void saveTz(Long  mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String cznr){
+    public  void saveTz(Long  mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark){
         MjyTz mjyTz = new MjyTz();
         mjyTz.setMjyId(mjyId);
         mjyTz.setLqrMc(lqrMc);
@@ -59,7 +61,9 @@ public class MjyTzServiceImpl extends ServiceImpl implements
         mjyTz.setQmrId(qmrId);
         mjyTz.setQmrMc(qmrMc);
         mjyTz.setQmyy(qmyy);
-        mjyTz.setCznr(cznr);
+        mjyTz.setCzldw(czldw);
+        mjyTz.setCzl(czl);
+        mjyTz.setRemark(remark);
         this.save(mjyTz);
     }
 }

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

@@ -4,13 +4,13 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.MjyMapper">
 
-    <select id="queryInfo" resultType="com.hxhq.business.domain.Mjy">
+    <select id="queryInfo" resultType="com.hxhq.business.dto.mjy.MjyDetailDto">
         select t.*
         FROM `t_mjy` t
         where t.id=#{id}
     </select>
 
-    <select id="queryList" resultType="com.hxhq.business.dto.mjy.MjyDto">
+    <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
         ,z.mc as zcgMc
         FROM `t_mjy` t