diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java index ce3a285..f3549a1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java @@ -301,8 +301,9 @@ public class GyzjController extends BaseController @RequiresPermissions("business:resource:gyzj:gh") public AjaxResult gh(@RequestBody GhForm form) { - //todo - return AjaxResult.error("todo"); + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.gh(form); + return AjaxResult.success("操作成功"); } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java index 3e6e227..cd49ac8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java @@ -301,8 +301,9 @@ public class MjyController extends BaseController @RequiresPermissions("business:resource:mjy:gh") public AjaxResult gh(@RequestBody GhForm form) { - //todo - return AjaxResult.error("todo"); + form.setQmrId(SecurityUtils.getUserId()); + mjyService.gh(form); + return AjaxResult.success("操作成功"); } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index 8f7d85a..0e39ad2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -66,6 +66,9 @@ public class Gyzj extends MpBaseEntity /** 容器状态：1:未处置 3:已处置 */ private Integer rqzt; + /** 归还状态：1：未申请；3：申请归还 */ + private Integer ghzt; + /** 关联暂存柜id */ @TableField(updateStrategy = FieldStrategy.IGNORED) private Long zcgId; @@ -198,6 +201,14 @@ public class Gyzj extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public Integer getGhzt() { + return ghzt; + } + + public void setGhzt(Integer ghzt) { + this.ghzt = ghzt; + } + public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index 9e2bd6f..cb9900f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -15,6 +15,7 @@ import com.hxhq.common.core.domain.MpBaseEntity; @TableName("t_gyzj_ffjl") public class GyzjFfjl extends MpBaseEntity { + private static final long serialVersionUID = 1L; /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ @@ -97,15 +98,40 @@ public class GyzjFfjl extends MpBaseEntity /** 目的ids */ private String mdIds; + /** 入库位置 */ + private String rkwz; + + /** 入库条件 */ + private String rktj; + /** 归还转移条件 */ private String ghzytj; + + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 入库量 */ private String rkl; /** 入库单位 */ private String rkldw; + /** 减少量 */ + private String jsl; + + /** 减少量单位 */ + private String jsldw; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + /** 归还人1id */ private Long ghr1Id; @@ -140,11 +166,6 @@ public class GyzjFfjl extends MpBaseEntity /** 归档申请人id */ private Long gdsqrId; - /** 使用量 */ - private String syl; - - /** 使用量单位 */ - private String syldw; /** 暂存柜id */ private Long zcgId; @@ -157,6 +178,54 @@ public class GyzjFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public String getRkmz() { + return rkmz; + } + + public void setRkmz(String rkmz) { + this.rkmz = rkmz; + } + + public String getRkmzdw() { + return rkmzdw; + } + + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; + } + + public String getRkwz() { + return rkwz; + } + + public void setRkwz(String rkwz) { + this.rkwz = rkwz; + } + + public String getRktj() { + return rktj; + } + + public void setRktj(String rktj) { + this.rktj = rktj; + } + + public String getJsl() { + return jsl; + } + + public void setJsl(String jsl) { + this.jsl = jsl; + } + + public String getJsldw() { + return jsldw; + } + + public void setJsldw(String jsldw) { + this.jsldw = jsldw; + } + public Date getJyksrq() { return jyksrq; } @@ -321,14 +390,12 @@ public class GyzjFfjl extends MpBaseEntity return jyzt; } - public void setGyzjId(Long gyzjId) - { - this.gyzjId = gyzjId; + public Long getGyzjId() { + return gyzjId; } - public Long getGyzjId() - { - return gyzjId; + public void setGyzjId(Long gyzjId) { + this.gyzjId = gyzjId; } public void setMc(String mc) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 5539efe..3ae6fad 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -64,6 +64,9 @@ public class Mjy extends MpBaseEntity /** 容器状态：1:未处置 3:已处置 */ private Integer rqzt; + /** 归还状态：1：未申请；3：申请归还 */ + private Integer ghzt; + /** 关联暂存柜id */ @TableField(updateStrategy = FieldStrategy.IGNORED) private Long zcgId; @@ -196,6 +199,14 @@ public class Mjy extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public Integer getGhzt() { + return ghzt; + } + + public void setGhzt(Integer ghzt) { + this.ghzt = ghzt; + } + public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java index 94151c9..dd1448c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java @@ -88,7 +88,7 @@ public class MjyFfjl extends MpBaseEntity private String ffr2Mc; /** 发放日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date ffrq; /** 发放备注 */ @@ -97,15 +97,39 @@ public class MjyFfjl extends MpBaseEntity /** 目的ids */ private String mdIds; + /** 入库位置 */ + private String rkwz; + + /** 入库条件 */ + private String rktj; + /** 归还转移条件 */ private String ghzytj; + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 入库量 */ private String rkl; /** 入库单位 */ private String rkldw; + /** 减少量 */ + private String jsl; + + /** 减少量单位 */ + private String jsldw; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + /** 归还人1id */ private Long ghr1Id; @@ -140,11 +164,6 @@ public class MjyFfjl extends MpBaseEntity /** 归档申请人id */ private Long gdsqrId; - /** 使用量 */ - private String syl; - - /** 使用量单位 */ - private String syldw; /** 暂存柜id */ private Long zcgId; @@ -157,6 +176,54 @@ public class MjyFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public String getRkmz() { + return rkmz; + } + + public void setRkmz(String rkmz) { + this.rkmz = rkmz; + } + + public String getRkmzdw() { + return rkmzdw; + } + + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; + } + + public String getRkwz() { + return rkwz; + } + + public void setRkwz(String rkwz) { + this.rkwz = rkwz; + } + + public String getRktj() { + return rktj; + } + + public void setRktj(String rktj) { + this.rktj = rktj; + } + + public String getJsl() { + return jsl; + } + + public void setJsl(String jsl) { + this.jsl = jsl; + } + + public String getJsldw() { + return jsldw; + } + + public void setJsldw(String jsldw) { + this.jsldw = jsldw; + } + public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java index 69d7dde..3bde553 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java @@ -48,6 +48,9 @@ public class ListDto { /** 容器状态：1:未处置 3:已处置 */ private Integer rqzt; + /** 归还状态：1：未申请；3：申请归还 */ + private Integer ghzt; + /** 暂存柜 */ private String zcgMc; @@ -94,6 +97,14 @@ public class ListDto { /** 目的名称*/ private String mdMc; + public Integer getGhzt() { + return ghzt; + } + + public void setGhzt(Integer ghzt) { + this.ghzt = ghzt; + } + public String getCkl() { return ckl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java index d6b357d..98c736c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java @@ -40,6 +40,12 @@ public class FfjlListDto { /** 入库单位 */ private String rkldw; + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 出库毛重 */ private String ckmz; @@ -70,12 +76,50 @@ public class FfjlListDto { /** 目的名称 */ private String mdMc; + /** 接收人1名称 */ + private String jsr1Mc; + + /** 接收人2名称 */ + private String jsr2Mc; + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ private Long jlzt; /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Long jyzt; + public String getRkmz() { + return rkmz; + } + + public void setRkmz(String rkmz) { + this.rkmz = rkmz; + } + + public String getRkmzdw() { + return rkmzdw; + } + + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; + } + + public String getJsr1Mc() { + return jsr1Mc; + } + + public void setJsr1Mc(String jsr1Mc) { + this.jsr1Mc = jsr1Mc; + } + + public String getJsr2Mc() { + return jsr2Mc; + } + + public void setJsr2Mc(String jsr2Mc) { + this.jsr2Mc = jsr2Mc; + } + public String getMdMc() { return mdMc; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java index 97d24b8..b76dfc9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java @@ -48,6 +48,9 @@ public class ListDto { /** 容器状态：1:未处置 3:已处置 */ private Integer rqzt; + /** 归还状态：1：未申请；3：申请归还 */ + private Integer ghzt; + /** 暂存柜 */ private String zcgMc; @@ -94,6 +97,14 @@ public class ListDto { /** 目的名称*/ private String mdMc; + public Integer getGhzt() { + return ghzt; + } + + public void setGhzt(Integer ghzt) { + this.ghzt = ghzt; + } + public String getCkl() { return ckl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/GhztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/GhztEnum.java new file mode 100644 index 0000000..b799efb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/GhztEnum.java @@ -0,0 +1,51 @@ +package com.hxhq.business.enums.zykgl; + +/** + * 归还状态：1：未申请；3：申请归还 + * @author tanfei + */ +public enum GhztEnum { + + /** + * 未申请 + */ + wsq(1, "未申请"), + + /** + * 申请归还 + */ + sqgh(3, "申请归还"); + + private int value; + private String text; + + GhztEnum(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 GhztEnum getEnumByValue(int type) { + for (GhztEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShGhEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShGhEnum.java new file mode 100644 index 0000000..e4e6e9e --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShGhEnum.java @@ -0,0 +1,51 @@ +package com.hxhq.business.enums.zykgl; + +/** + * 是否同意归还：1：拒绝归还；10：同意归还 + * @author tanfei + */ +public enum ShGhEnum { + + /** + * 拒绝归还 + */ + jj(1, "拒绝归还"), + + /** + * 同意归还 + */ + ty(10, "同意归还"); + + private int value; + private String text; + + ShGhEnum(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 ShGhEnum getEnumByValue(int type) { + for (ShGhEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShXgkcEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShXgkcEnum.java index 83bec3d..60f442b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShXgkcEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShXgkcEnum.java @@ -14,9 +14,7 @@ public enum ShXgkcEnum { /** * 同意修改库存 */ - ty(10, "同意修改库存"), - - ; + ty(10, "同意修改库存"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java index 498cd30..0e2b2ec 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java @@ -5,43 +5,101 @@ package com.hxhq.business.form.gyzj; */ public class GhForm { - /** 发放记录id */ + /** 给药制剂id */ private Long id; - /** 发放记录ids */ - private Long[] ids; + /** 入库位置 */ + private String rkwz; + + /** 入库条件 */ + private String rktj; + + /** 归还转移条件 */ + private String ghzytj; + + + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 减少量 */ + private String jsl; + + /** 减少量单位 */ + private String jsldw; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 归还人1id */ + private Long ghr1Id; + + /** 归还人1密码 */ + private String ghr1mm; + + /** 归还人2id */ + private Long ghr2Id; + + /** 归还人2密码 */ + private String ghr2mm; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人1密码 */ + private String jsr1mm; + + /** 接收人2id */ + private Long jsr2Id; + + /** 接收人2密码 */ + private String jsr2mm; /** 备注 */ private String remark; + /** 签名人id */ private Long qmrId; /** 签名人密码 */ private String qmrmm; - public Long[] getIds() { - return ids; + /** 签名人意义 */ + private String qmyy; + + public String getRkmz() { + return rkmz; } - public void setIds(Long[] ids) { - this.ids = ids; + public void setRkmz(String rkmz) { + this.rkmz = rkmz; } - public Long getId() { - return id; + public String getRkmzdw() { + return rkmzdw; } - public void setId(Long id) { - this.id = id; + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; } - public String getRemark() { - return remark; + public String getQmyy() { + return qmyy; } - public void setRemark(String remark) { - this.remark = remark; + public void setQmyy(String qmyy) { + this.qmyy = qmyy; } public Long getQmrId() { @@ -59,4 +117,156 @@ public class GhForm { public void setQmrmm(String qmrmm) { this.qmrmm = qmrmm; } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRkwz() { + return rkwz; + } + + public void setRkwz(String rkwz) { + this.rkwz = rkwz; + } + + public String getRktj() { + return rktj; + } + + public void setRktj(String rktj) { + this.rktj = rktj; + } + + public String getGhzytj() { + return ghzytj; + } + + public void setGhzytj(String ghzytj) { + this.ghzytj = ghzytj; + } + + 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 getJsl() { + return jsl; + } + + public void setJsl(String jsl) { + this.jsl = jsl; + } + + public String getJsldw() { + return jsldw; + } + + public void setJsldw(String jsldw) { + this.jsldw = jsldw; + } + + 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 getGhr1Id() { + return ghr1Id; + } + + public void setGhr1Id(Long ghr1Id) { + this.ghr1Id = ghr1Id; + } + + public String getGhr1mm() { + return ghr1mm; + } + + public void setGhr1mm(String ghr1mm) { + this.ghr1mm = ghr1mm; + } + + public Long getGhr2Id() { + return ghr2Id; + } + + public void setGhr2Id(Long ghr2Id) { + this.ghr2Id = ghr2Id; + } + + public String getGhr2mm() { + return ghr2mm; + } + + public void setGhr2mm(String ghr2mm) { + this.ghr2mm = ghr2mm; + } + + public Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public String getJsr1mm() { + return jsr1mm; + } + + public void setJsr1mm(String jsr1mm) { + this.jsr1mm = jsr1mm; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public String getJsr2mm() { + return jsr2mm; + } + + public void setJsr2mm(String jsr2mm) { + this.jsr2mm = jsr2mm; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java index b529b56..976b3b2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/GhForm.java @@ -5,11 +5,66 @@ package com.hxhq.business.form.mjy; */ public class GhForm { - /** 发放记录id */ + /** 麻精药id */ private Long id; - /** 发放记录ids */ - private Long[] ids; + /** 入库位置 */ + private String rkwz; + + /** 入库条件 */ + private String rktj; + + /** 归还转移条件 */ + private String ghzytj; + + + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 减少量 */ + private String jsl; + + /** 减少量单位 */ + private String jsldw; + + /** 使用量 */ + private String syl; + + /** 使用量单位 */ + private String syldw; + + /** 归还人1id */ + private Long ghr1Id; + + /** 归还人1密码 */ + private String ghr1mm; + + /** 归还人2id */ + private Long ghr2Id; + + /** 归还人2密码 */ + private String ghr2mm; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人1密码 */ + private String jsr1mm; + + /** 接收人2id */ + private Long jsr2Id; + + /** 接收人2密码 */ + private String jsr2mm; /** 备注 */ private String remark; @@ -20,28 +75,28 @@ public class GhForm { /** 签名人密码 */ private String qmrmm; - public Long[] getIds() { - return ids; + public String getRkmz() { + return rkmz; } - public void setIds(Long[] ids) { - this.ids = ids; + public void setRkmz(String rkmz) { + this.rkmz = rkmz; } - public Long getId() { - return id; + public String getRkmzdw() { + return rkmzdw; } - public void setId(Long id) { - this.id = id; + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; } - public String getRemark() { - return remark; + public String getQmrmm() { + return qmrmm; } - public void setRemark(String remark) { - this.remark = remark; + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; } public Long getQmrId() { @@ -52,11 +107,155 @@ public class GhForm { this.qmrId = qmrId; } - public String getQmrmm() { - return qmrmm; + public Long getId() { + return id; } - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; + public void setId(Long id) { + this.id = id; + } + + public String getRkwz() { + return rkwz; + } + + public void setRkwz(String rkwz) { + this.rkwz = rkwz; + } + + public String getRktj() { + return rktj; + } + + public void setRktj(String rktj) { + this.rktj = rktj; + } + + public String getGhzytj() { + return ghzytj; + } + + public void setGhzytj(String ghzytj) { + this.ghzytj = ghzytj; + } + + 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 getJsl() { + return jsl; + } + + public void setJsl(String jsl) { + this.jsl = jsl; + } + + public String getJsldw() { + return jsldw; + } + + public void setJsldw(String jsldw) { + this.jsldw = jsldw; + } + + 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 getGhr1Id() { + return ghr1Id; + } + + public void setGhr1Id(Long ghr1Id) { + this.ghr1Id = ghr1Id; + } + + public String getGhr1mm() { + return ghr1mm; + } + + public void setGhr1mm(String ghr1mm) { + this.ghr1mm = ghr1mm; + } + + public Long getGhr2Id() { + return ghr2Id; + } + + public void setGhr2Id(Long ghr2Id) { + this.ghr2Id = ghr2Id; + } + + public String getGhr2mm() { + return ghr2mm; + } + + public void setGhr2mm(String ghr2mm) { + this.ghr2mm = ghr2mm; + } + + public Long getJsr1Id() { + return jsr1Id; + } + + public void setJsr1Id(Long jsr1Id) { + this.jsr1Id = jsr1Id; + } + + public String getJsr1mm() { + return jsr1mm; + } + + public void setJsr1mm(String jsr1mm) { + this.jsr1mm = jsr1mm; + } + + public Long getJsr2Id() { + return jsr2Id; + } + + public void setJsr2Id(Long jsr2Id) { + this.jsr2Id = jsr2Id; + } + + public String getJsr2mm() { + return jsr2mm; + } + + public void setJsr2mm(String jsr2mm) { + this.jsr2mm = jsr2mm; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 047be51..781eaec 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -17,6 +17,13 @@ import org.springframework.web.bind.annotation.RequestBody; public interface IGyzjFfjlService extends IService { /** + * 详情 + * + * @param mjyId + * @return + */ + public GyzjFfjl queryLastInfoByGyzjId(Long mjyId); + /** * 列表 * * @param form 麻精药-发放记录 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java index 4af0414..9a272b1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java @@ -164,4 +164,11 @@ public interface IGyzjService extends IService * @param form */ public void jy(@RequestBody JyForm form); + + /** + * 归还 + * + * @param form + */ + public void gh(@RequestBody GhForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java index 8949fae..68fe792 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java @@ -1,11 +1,15 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; + +import com.hxhq.business.domain.Mjy; import com.hxhq.business.domain.MjyFfjl; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.mjy.FfjlDetailDto; import com.hxhq.business.dto.mjy.FfjlListDto; import com.hxhq.business.form.mjy.*; +import com.hxhq.system.api.domain.SysUser; import org.springframework.web.bind.annotation.RequestBody; /** @@ -17,6 +21,14 @@ import org.springframework.web.bind.annotation.RequestBody; public interface IMjyFfjlService extends IService { /** + * 详情 + * + * @param mjyId + * @return + */ + public MjyFfjl queryLastInfoByMjyId(Long mjyId); + + /** * 列表 * * @param form 麻精药-发放记录 @@ -90,4 +102,19 @@ public interface IMjyFfjlService extends IService * @param form */ public void jq(@RequestBody FfjlJqForm form); -} + + + /** + * 归还 + * + * @param form + */ + public void gh(@RequestBody GhForm form, Mjy mjy, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2); + + /** + * 发放 + * + */ + public void ff(String ckmz,String ckmzdw,String zytj,String remark,String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index 984efa8..82a1182 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java @@ -164,4 +164,11 @@ public interface IMjyService extends IService * @param form */ public void jy(@RequestBody JyForm form); + + /** + * 归还 + * + * @param form + */ + public void gh(@RequestBody GhForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 6ea65d3..e31d30f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -14,7 +14,7 @@ import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.enums.zykgl.JlztEnum; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.IGyzjFfjlJcgjService; -import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.business.utils.JctUtil; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -43,6 +43,21 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i @Autowired private IGyzjFfjlJcgjService gyzjFfjlJcgjService; + + /** + * 详情 + * + * @param mjyId + * @return + */ + @Override + public GyzjFfjl queryLastInfoByGyzjId(Long mjyId){ + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("dyzj_id",mjyId); + queryWrapper.orderByDesc("id"); + return this.getOne(queryWrapper,false); + } + /** * 列表 * @@ -110,7 +125,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "补充说明"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -148,7 +163,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "申请借阅"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -193,7 +208,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "申请解档"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -234,7 +249,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjFfjlJcgjList.add(gyzjFfjlJcgj); @@ -274,7 +289,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -315,7 +330,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("签名意义", "锁定发放记录"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjFfjlJcgjList.add(gyzjFfjlJcgj); @@ -354,7 +369,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定发放记录"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -387,7 +402,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("备注", form.getRemark()); formData.put("签名意义", "解锁发放记录"); formData.put("签名人", qmr.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index c564a6f..bf8724e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -12,7 +12,7 @@ import com.hxhq.business.dto.gyzj.ListDto; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; -import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; @@ -30,7 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; /** - * 麻精药Service业务层处理 + * 给药制剂Service业务层处理 * * @author hxhq * @date 2025-12-18 @@ -111,10 +111,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】未归档，不能解档"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】未归档，不能解档"); } //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； gyzjOld.setZjzt(ZjztEnum.djd.getValue()); @@ -124,7 +124,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("备注", form.getRemark()); formData.put("签名意义", "申请解档"); formData.put("签名人", qmr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -142,13 +142,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是归档状态，不能借阅"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是归档状态，不能借阅"); } if (!gyzjOld.getJyzt().equals(JyztEnum.wjy.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是未借阅状态，不能借阅"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是未借阅状态，不能借阅"); } //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； gyzjOld.setJyzt(JyztEnum.djy.getValue()); @@ -162,7 +162,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("备注", form.getRemark()); formData.put("签名意义", "申请借阅"); formData.put("签名人", qmr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -185,7 +185,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjList.size() > 0) { for (Gyzj gyzj : gyzjList) { if (!gyzj.getZjzt().equals(ZjztEnum.ysd.getValue())) { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】不是锁定状态，不能归档"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不是锁定状态，不能归档"); } } for (Gyzj gyzj : gyzjList) { @@ -228,10 +228,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是锁定状态，不能归档"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是锁定状态，不能归档"); } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gyzjOld.setZjzt(ZjztEnum.dgd.getValue()); @@ -241,7 +241,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); formData.put("签名人", qmr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -264,7 +264,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG List gyzjList = this.list(queryWrapper); List gyzjJcgjList = new ArrayList<>(); if (gyzjList.size() <= 0) { - throw new SecurityException("麻精药不是入库状态，不能锁定"); + throw new SecurityException("给药制剂不是入库状态，不能锁定"); } for (Gyzj gyzj : gyzjList) { //锁定 @@ -274,14 +274,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzj.getId()); gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("锁定麻精药"); + gyzjJcgj.setJcmc("锁定给药制剂"); gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定麻精药"); + formData.put("签名意义", "锁定给药制剂"); formData.put("签名人", qmr.getNickName()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); @@ -308,19 +308,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能锁定"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能锁定"); } gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(gyzjOld); //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定麻精药"); + formData.put("签名意义", "锁定给药制剂"); formData.put("签名人", qmr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -339,10 +339,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是已锁定状态，不能解锁"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是已锁定状态，不能解锁"); } //点击解锁，状态更新为入库； gyzjOld.setZjzt(ZjztEnum.rk.getValue()); @@ -350,9 +350,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "解锁麻精药"); + formData.put("签名意义", "解锁给药制剂"); formData.put("签名人", qmr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -387,7 +387,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); List gyzjList = this.list(queryWrapper); if (gyzjList.size() <= 0) { - throw new SecurityException("麻精药不是入库状态，不能处置药剂"); + throw new SecurityException("给药制剂不是入库状态，不能处置药剂"); } List gyzjJcgjList = new ArrayList<>(); List gyzjTzList = new ArrayList<>(); @@ -410,10 +410,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //验证库存 BigDecimal kc = new BigDecimal(gyzj.getKc()); if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】库存不足，不能处置"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】库存不足，不能处置"); } if (kc.compareTo(czl) < 0) { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】处置量大于库存量"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】处置量大于库存量"); } //更新库存 gyzj.setKc(kc.subtract(czl).toString()); @@ -435,7 +435,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); @@ -454,7 +454,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //endregion } else { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } this.saveOrUpdateBatch(gyzjList); @@ -490,10 +490,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能处置药剂"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能处置药剂"); } if (StringUtils.isBlank(form.getCzl())) { throw new SecurityException("处置量不能为空"); @@ -507,10 +507,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //验证库存 BigDecimal kc = new BigDecimal(gyzjOld.getKc()); if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】库存不足，不能处置"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】库存不足，不能处置"); } if (kc.compareTo(czl) < 0) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】处置量大于库存量"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】处置量大于库存量"); } //更新库存 gyzjOld.setKc(kc.subtract(czl).toString()); @@ -526,7 +526,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion //region 台账 @@ -572,7 +572,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG List gyzjTzList = new ArrayList<>(); if (gyzjList.size() <= 0) { - throw new SecurityException("麻精药已经处置过容器了，不能重复操作"); + throw new SecurityException("给药制剂已经处置过容器了，不能重复操作"); } for (Gyzj gyzj : gyzjList) { List gyzjPlffItemFilter = form.getList().stream() @@ -594,7 +594,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); @@ -612,7 +612,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setRqzt(RqztEnum.ycz.getValue()); } else { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } @@ -647,13 +647,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能处置容器"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能处置容器"); } if (!gyzjOld.getRqzt().equals(RqztEnum.wcz.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经处置过容器了，不能重复操作"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】已经处置过容器了，不能重复操作"); } //region 稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -663,7 +663,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion //region 台账 @@ -739,7 +739,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("钥匙2领取人", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); @@ -771,10 +771,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库状态，不能发放"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能发放"); } SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); if (lqr1 == null) { @@ -839,7 +839,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("目的", form.getMdIds()); formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(),JcgjUtil.formatStr(formData), + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion @@ -915,14 +915,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG List gyzjFfjlList = new ArrayList<>(); List gyzjTzList = new ArrayList<>(); if (gyzjList.size() <= 0) { - throw new SecurityException("麻精药不是入库状态，不能发放"); + throw new SecurityException("给药制剂不是入库状态，不能发放"); } Date now = new Date(); for (Gyzj gyzj : gyzjList) { //验证库存 BigDecimal kc = new BigDecimal(gyzj.getKc()); if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】库存不足，不能发放"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放"); } List plffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(gyzj.getId())) @@ -975,7 +975,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("目的", plffItemFilter.get(0).getMdIds()); formData.put("备注", plffItemFilter.get(0).getRemark()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); @@ -1015,7 +1015,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //endregion } else { - throw new SecurityException("麻精药【" + gyzj.getMc() + "】不存在或已删除"); + throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -1039,13 +1039,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getBjzt().equals(BjEnum.wbj.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经提交编辑申请，请等待审核"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】已经提交编辑申请，请等待审核"); } if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能编辑"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能编辑"); } List gyzjJcgjList = new ArrayList<>(); @@ -1094,13 +1094,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getBjzt().equals(BjEnum.shz.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】没有提交编辑申请，不能审核编辑"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】没有提交编辑申请，不能审核编辑"); } if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); } //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); @@ -1159,13 +1159,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getKcbjzt().equals(KcbjEnum.wbj.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】已经提交修改库存申请，请等待审核"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】已经提交修改库存申请，请等待审核"); } if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能修改库存"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能修改库存"); } List fieldChanges = ObjectCompareUtil.compareObjects(gyzjOld, form); if (fieldChanges.size() == 0) { @@ -1213,13 +1213,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { - throw new SecurityException("麻精药不存在或已删除"); + throw new SecurityException("给药制剂不存在或已删除"); } if (!gyzjOld.getKcbjzt().equals(KcbjEnum.shz.getValue())) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】没有提交修改库存申请，不能审核修改库存"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】没有提交修改库存申请，不能审核修改库存"); } if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { - throw new SecurityException("麻精药【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); } //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); @@ -1234,7 +1234,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("申请备注", gyzjOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); - gyzjJcgj.setJcnr(JcgjUtil.formatStr(formData)); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(qmr.getUserId()); gyzjJcgj.setQmrMc(qmr.getNickName()); gyzjJcgjService.save(gyzjJcgj); @@ -1262,4 +1262,107 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } + /** + * 归还 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gh(@RequestBody GhForm form) { + SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); + SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); + SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); + //验证密码 todo + + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gyzj gyzjOld = this.getById(form.getId()); + if (gyzjOld == null) { + throw new SecurityException("给药制剂不存在或已删除"); + } + if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) { + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还"); + } + if (!gyzjOld.getGhzt().equals(GhztEnum.sqgh.getValue())) { + throw new SecurityException("给药制剂【" + gyzjOld.getMc() + "】不是申请归还状态，不用确认"); + } + BigDecimal kc = new BigDecimal(gyzjOld.getKc()); + BigDecimal syl = new BigDecimal(form.getSyl()); + if (syl.compareTo(kc) > 0) { + throw new SecurityException("使用量不能大于出库量"); + } + BigDecimal leftKc = new BigDecimal(gyzjOld.getKc()).subtract(new BigDecimal(form.getSyl())); + GyzjFfjl gyzjFfjl=gyzjFfjlService.queryLastInfoByGyzjId(gyzjOld.getId()); + if (gyzjFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (form.getQmyy().equals(ShGhEnum.ty.getValue())) { + + //region 更新发放回收记录 + gyzjFfjl.setFfzytj(form.getGhzytj()); + gyzjFfjl.setRkwz(form.getRkwz()); + gyzjFfjl.setRktj(form.getRktj()); + gyzjFfjl.setRkl(form.getRkl()); + gyzjFfjl.setRkldw(gyzjOld.getKcdw()); + gyzjFfjl.setJsl(form.getJsl()); + gyzjFfjl.setJsldw(gyzjOld.getKcdw()); + gyzjFfjl.setSyl(form.getSyl()); + gyzjFfjl.setSyldw(gyzjOld.getKcdw()); + gyzjFfjl.setGhr1Id(ghr1.getUserId()); + gyzjFfjl.setGhr1Mc(ghr1.getNickName()); + gyzjFfjl.setGhr2Id(ghr2.getUserId()); + gyzjFfjl.setGhr2Mc(ghr2.getNickName()); + gyzjFfjl.setJsr1Id(jsr1.getUserId()); + gyzjFfjl.setJsr1Mc(jsr1.getNickName()); + gyzjFfjl.setJsr2Id(jsr2.getUserId()); + gyzjFfjl.setJsr2Mc(jsr2.getNickName()); + gyzjFfjlService.updateById(gyzjFfjl); + //endregion + + //region 台账 + + gyzjTzService.saveTz(gyzjOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(), + "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null, + "归还", form.getRkl(), gyzjOld.getKcdw(), form.getRemark()); + //endregion + + //扣减库存 + gyzjOld.setKc(leftKc.toString()); + gyzjOld.setZjzt(ZjztEnum.rk.getValue()); + gyzjOld.setGhzt(GhztEnum.wsq.getValue()); + this.updateById(gyzjOld); + + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("入库位置", form.getRkwz()); + formData.put("入库条件", form.getRktj()); + formData.put("转移条件", form.getGhzytj()); + formData.put("入库毛重", form.getRkl()+gyzjOld.getKcdw()); + formData.put("减少量", form.getJsl()); + formData.put("使用量", form.getSyl()+gyzjOld.getKcdw()); + formData.put("归还人1", ghr1.getNickName()); + formData.put("归还人2", ghr2.getNickName()); + formData.put("库管员1", jsr1.getNickName()); + formData.put("库管员2", jsr2.getNickName()); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "同意归还"); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + + }else{ + gyzjOld.setGhzt(GhztEnum.wsq.getValue()); + this.updateById(gyzjOld); + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "拒绝归还"); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归还", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + } + + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 8a8f426..a15d230 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -1,12 +1,10 @@ package com.hxhq.business.service.impl; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; 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.MjyFfjlJcgj; import com.hxhq.business.dto.mjy.FfjlDetailDto; import com.hxhq.business.dto.mjy.FfjlListDto; @@ -14,7 +12,7 @@ import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.enums.zykgl.JlztEnum; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.IMjyFfjlJcgjService; -import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.business.utils.JctUtil; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -44,6 +42,20 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl private IMjyFfjlJcgjService mjyFfjlJcgjService; /** + * 详情 + * + * @param mjyId + * @return + */ + @Override + public MjyFfjl queryLastInfoByMjyId(Long mjyId){ + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("mjy_id",mjyId); + queryWrapper.orderByDesc("id"); + return this.getOne(queryWrapper,false); + } + + /** * 列表 * * @param form 发放记录发放记录 @@ -110,7 +122,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "补充说明"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -148,7 +160,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "申请借阅"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -193,7 +205,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "申请解档"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -234,7 +246,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId()); mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyFfjlJcgjList.add(mjyFfjlJcgj); @@ -274,7 +286,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -315,7 +327,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("签名意义", "锁定发放记录"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId()); mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyFfjlJcgjList.add(mjyFfjlJcgj); @@ -354,7 +366,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定发放记录"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -387,8 +399,108 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl formData.put("备注", form.getRemark()); formData.put("签名意义", "解锁发放记录"); formData.put("签名人", qmr.getNickName()); - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } + /** + * 归还 + * + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gh(@RequestBody GhForm form, Mjy mjy,SysUser ghr1,SysUser ghr2,SysUser jsr1,SysUser jsr2){ + MjyFfjl mjyFfjl=this.queryLastInfoByMjyId(mjy.getId()); + if (mjyFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + mjyFfjl.setFfzytj(form.getGhzytj()); + mjyFfjl.setRkwz(form.getRkwz()); + mjyFfjl.setRktj(form.getRktj()); + mjyFfjl.setGhzytj(form.getGhzytj()); + mjyFfjl.setRkmz(form.getRkmz()); + mjyFfjl.setRkmzdw(mjy.getKcdw()); + + mjyFfjl.setJsl(form.getJsl()); + mjyFfjl.setJsldw(mjy.getKcdw()); + mjyFfjl.setSyl(form.getSyl()); + mjyFfjl.setSyldw(mjy.getKcdw()); + mjyFfjl.setGhr1Id(ghr1.getUserId()); + mjyFfjl.setGhr1Mc(ghr1.getNickName()); + mjyFfjl.setGhrq(new Date()); + mjyFfjl.setGhr2Id(ghr2.getUserId()); + mjyFfjl.setGhr2Mc(ghr2.getNickName()); + mjyFfjl.setJsr1Id(jsr1.getUserId()); + mjyFfjl.setJsr1Mc(jsr1.getNickName()); + mjyFfjl.setJsr2Id(jsr2.getUserId()); + mjyFfjl.setJsr2Mc(jsr2.getNickName()); + mjyFfjl.setGhbz(form.getRemark()); + this.updateById(mjyFfjl); + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("入库位置", form.getRkwz()); + formData.put("入库条件", form.getRktj()); + formData.put("转移条件", form.getGhzytj()); + formData.put("入库毛重", form.getRkmz()+mjy.getKcdw()); + formData.put("减少量", form.getJsl()+mjy.getKcdw()); + formData.put("使用量", form.getSyl()+mjy.getKcdw()); + formData.put("归还人1", ghr1.getNickName()); + formData.put("归还人2", ghr2.getNickName()); + formData.put("库管员1", jsr1.getNickName()); + formData.put("库管员2", jsr2.getNickName()); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "归还"); + mjyFfjlJcgjService.saveJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + } + + + + /** + * 发放 + * + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void ff(String ckmz,String ckmzdw,String zytj,String remark,String mdIds, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time){ + + MjyFfjl mjyFfjl = new MjyFfjl(); + mjyFfjl.setMjyId(mjy.getId()); + mjyFfjl.setMc(mjy.getMc()); + mjyFfjl.setBh(mjy.getBh()); + mjyFfjl.setNd(mjy.getNd()); + mjyFfjl.setNddw(mjy.getNddw()); + mjyFfjl.setCctj(mjy.getCctj()); + mjyFfjl.setCcwz(mjy.getCcwz()); + mjyFfjl.setSxrq(mjy.getSxrq()); + mjyFfjl.setCctj(mjy.getCctj()); + mjyFfjl.setCkl(mjy.getKc()); + mjyFfjl.setCkldw(mjy.getKcdw()); + mjyFfjl.setCkmz(ckmz); + mjyFfjl.setCkmzdw(ckmzdw); + mjyFfjl.setLqr1Id(lqr1.getUserId()); + mjyFfjl.setLqr2Id(lqr2.getUserId()); + mjyFfjl.setFfr1Id(ffr1.getUserId()); + mjyFfjl.setFfr2Id(ffr2.getUserId()); + mjyFfjl.setLqr1Mc(lqr1.getNickName()); + mjyFfjl.setLqr2Mc(lqr2.getNickName()); + mjyFfjl.setFfr1Mc(ffr1.getNickName()); + mjyFfjl.setFfr2Mc(ffr2.getNickName()); + mjyFfjl.setFfzytj(zytj); + mjyFfjl.setFfrq(time); + mjyFfjl.setFfbz(remark); + mjyFfjl.setMdIds(mdIds); + this.save(mjyFfjl); + + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("出库量", mjy.getKc()+ mjy.getKcdw()); + formData.put("转移条件", zytj); + formData.put("出库毛重", ckmz + mjy.getKcdw()); + formData.put("目的", mdIds); + formData.put("备注", remark); + mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), + SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index acdd752..ff81ee8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -12,7 +12,7 @@ import com.hxhq.business.dto.mjy.ListDto; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.*; -import com.hxhq.business.utils.JcgjUtil; +import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; @@ -123,8 +123,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请解档"); - formData.put("签名人", qmr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("签名人", qmr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -161,8 +161,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请借阅"); - formData.put("签名人", qmr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("签名人", qmr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -240,8 +240,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("签名人", qmr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -279,9 +279,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定麻精药"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); @@ -319,8 +319,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定麻精药"); - formData.put("签名人", qmr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("签名人", qmr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -351,8 +351,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "解锁麻精药"); - formData.put("签名人", qmr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("签名人", qmr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } /** @@ -364,24 +364,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Transactional(rollbackFor = Exception.class) public void plczyj(@RequestBody PlczyjForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new SecurityException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new SecurityException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new SecurityException("监督人不存在"); - } //验证处理人，复核人，监督人密码 todo - if (form.getIds().length < 0) { - throw new SecurityException("参数ids不正确"); - } - if (form.getList().size() < 0) { - throw new SecurityException("参数list不正确"); - } QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -391,7 +376,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } List mjyJcgjList = new ArrayList<>(); List mjyTzList = new ArrayList<>(); - for (Mjy mjy : mjyList) { List mjyPlffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) @@ -415,12 +399,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (kc.compareTo(czl) < 0) { throw new SecurityException("麻精药【" + mjy.getMc() + "】处置量大于库存量"); } - //更新库存 mjy.setKc(kc.subtract(czl).toString()); - - - //endregion - //region 稽查轨迹 MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjy.getId()); @@ -430,17 +409,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", mjyPlffItemFilter.get(0).getCzyy()); - formData.put("处置量", mjyPlffItemFilter.get(0).getCzl() + mjy.getKcdw()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); - - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + formData.put("处置量", mjyPlffItemFilter.get(0).getCzl() + mjy.getKcdw()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); + + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion - //region 台账 MjyTz mjyTz = new MjyTz(); mjyTz.setMjyId(mjy.getId()); @@ -452,7 +430,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy()); mjyTzList.add(mjyTz); //endregion - } else { throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } @@ -521,12 +498,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); - formData.put("处置量", form.getCzl() + mjyOld.getKcdw()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); + formData.put("处置量", form.getCzl() + mjyOld.getKcdw()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion //region 台账 @@ -590,11 +567,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", mjyPlffItemFilter.get(0).getCzyy()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); @@ -659,11 +636,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); + formData.put("处置人", clr.getNickName()); + formData.put("复核人", fhr.getNickName()); + formData.put("监督人", jdr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion //region 台账 @@ -685,24 +662,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Transactional(rollbackFor = Exception.class) public void ysff(@RequestBody YsffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - if (lqr1 == null) { - throw new SecurityException("领取人1不存在"); - } SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - if (lqr2 == null) { - throw new SecurityException("领取人2不存在"); - } SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); - if (ffr1 == null) { - throw new SecurityException("发放人不存在"); - } //验证领取人1,领取人2,发放人密码 todo - if (form.getIds().length < 0) { - throw new SecurityException("参数ids不正确"); - } - if (form.getZcgId() == null || form.getZcgId().longValue() < 0) { - throw new SecurityException("暂存柜id不正确"); - } Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new SecurityException("暂存柜不存在或已删除"); @@ -736,10 +698,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("钥匙1领取人", lqr1.getNickName()); - formData.put("钥匙2领取人", lqr2.getNickName()); - formData.put("发放人", ffr1.getNickName()); + formData.put("钥匙2领取人", lqr2.getNickName()); + formData.put("发放人", ffr1.getNickName()); - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); @@ -777,79 +739,27 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能发放"); } SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - if (lqr1 == null) { - throw new SecurityException("领取人1不存在"); - } SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - if (lqr2 == null) { - throw new SecurityException("领取人2不存在"); - } SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - if (ffr1 == null) { - throw new SecurityException("发放人1不存在"); - } SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - if (ffr2 == null) { - throw new SecurityException("发放人2不存在"); - } //验证领取人1、领取人2、发放人1、发放人2密码 todo - Date now = new Date(); - - //region 发放记录 - - MjyFfjl mjyFfjl = new MjyFfjl(); - mjyFfjl.setMjyId(mjyOld.getId()); - mjyFfjl.setMc(mjyOld.getMc()); - mjyFfjl.setBh(mjyOld.getBh()); - mjyFfjl.setNd(mjyOld.getNd()); - mjyFfjl.setNddw(mjyOld.getNddw()); - mjyFfjl.setCctj(mjyOld.getCctj()); - mjyFfjl.setCcwz(mjyOld.getCcwz()); - mjyFfjl.setSxrq(mjyOld.getSxrq()); - mjyFfjl.setCctj(mjyOld.getCctj()); - mjyFfjl.setCkl(mjyOld.getKc()); - - mjyFfjl.setCkldw(mjyOld.getKcdw()); - mjyFfjl.setCkmz(form.getCkmz()); - mjyFfjl.setCkmzdw(form.getCkmzdw()); - mjyFfjl.setLqr1Id(lqr1.getUserId()); - mjyFfjl.setLqr2Id(lqr2.getUserId()); - mjyFfjl.setFfr1Id(ffr1.getUserId()); - mjyFfjl.setFfr2Id(ffr2.getUserId()); - mjyFfjl.setLqr1Mc(lqr1.getNickName()); - mjyFfjl.setLqr2Mc(lqr2.getNickName()); - mjyFfjl.setFfr1Mc(ffr1.getNickName()); - mjyFfjl.setFfr2Mc(ffr2.getNickName()); - mjyFfjl.setFfzytj(form.getZytj()); - mjyFfjl.setFfrq(now); - mjyFfjl.setFfbz(form.getRemark()); - mjyFfjl.setMdIds(form.getMdIds()); - - - mjyFfjlService.save(mjyFfjl); - - //endregion - + mjyFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),mjyOld,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 Map formData = new LinkedHashMap<>(); - formData.put("出库量", mjyOld.getKc()); + formData.put("出库量", mjyOld.getKc()+ mjyOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库毛重", form.getCkmz() + mjyOld.getKcdw()); - formData.put("目的", form.getMdIds()); - formData.put("备注", form.getRemark()); - - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(),JcgjUtil.formatStr(formData), + formData.put("出库毛重", form.getCkmz() + mjyOld.getKcdw()); + formData.put("目的", form.getMdIds()); + formData.put("备注", form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion - //region 台账 mjyTzService.saveTz(mjyOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); //endregion - - //region 更新发放信息 mjyOld.setCkl(mjyOld.getKc()); mjyOld.setCkldw(mjyOld.getKcdw()); @@ -870,9 +780,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setMdIds(form.getMdIds()); mjyOld.setZjzt(ZjztEnum.yff.getValue()); //endregion - this.updateById(mjyOld); - } @@ -885,34 +793,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Transactional(rollbackFor = Exception.class) public void plff(@RequestBody PlffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - if (lqr1 == null) { - throw new SecurityException("领取人1不存在"); - } SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - if (lqr2 == null) { - throw new SecurityException("领取人2不存在"); - } SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - if (ffr1 == null) { - throw new SecurityException("发放人1不存在"); - } SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - if (ffr2 == null) { - throw new SecurityException("发放人2不存在"); - } //验证领取人1、领取人2、发放人1、发放人2密码 todo - if (form.getIds().length < 0) { - throw new SecurityException("参数ids不正确"); - } - if (form.getList().size() < 0) { - throw new SecurityException("参数list不正确"); - } QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); List mjyList = this.list(queryWrapper); List mjyJcgjList = new ArrayList<>(); - List mjyFfjlList = new ArrayList<>(); List mjyTzList = new ArrayList<>(); if (mjyList.size() <= 0) { throw new SecurityException("麻精药不是入库状态，不能发放"); @@ -928,59 +817,24 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { - - //region 发放记录 - MjyFfjl mjyFfjl = new MjyFfjl(); - mjyFfjl.setMjyId(mjy.getId()); - mjyFfjl.setMc(mjy.getMc()); - mjyFfjl.setBh(mjy.getBh()); - mjyFfjl.setNd(mjy.getNd()); - mjyFfjl.setNddw(mjy.getNddw()); - mjyFfjl.setCctj(mjy.getCctj()); - mjyFfjl.setCcwz(mjy.getCcwz()); - mjyFfjl.setSxrq(mjy.getSxrq()); - mjyFfjl.setCctj(mjy.getCctj()); - mjyFfjl.setCkl(mjy.getKc()); - - mjyFfjl.setCkldw(mjy.getKcdw()); - mjyFfjl.setCkmz(plffItemFilter.get(0).getCkmz()); - mjyFfjl.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); - mjyFfjl.setLqr1Id(lqr1.getUserId()); - mjyFfjl.setLqr2Id(lqr2.getUserId()); - mjyFfjl.setFfr1Id(ffr1.getUserId()); - mjyFfjl.setFfr2Id(ffr2.getUserId()); - mjyFfjl.setLqr1Mc(lqr1.getNickName()); - mjyFfjl.setLqr2Mc(lqr2.getNickName()); - mjyFfjl.setFfr1Mc(ffr1.getNickName()); - mjyFfjl.setFfr2Mc(ffr2.getNickName()); - mjyFfjl.setFfzytj(plffItemFilter.get(0).getZytj()); - mjyFfjl.setFfrq(now); - mjyFfjl.setFfbz(plffItemFilter.get(0).getRemark()); - mjyFfjl.setMdIds(plffItemFilter.get(0).getMdIds()); - - mjyFfjlList.add(mjyFfjl); - //endregion - + mjyFfjlService.ff(plffItemFilter.get(0).getCkmz(),plffItemFilter.get(0).getCkmzdw(),plffItemFilter.get(0).getZytj(),plffItemFilter.get(0).getRemark(),plffItemFilter.get(0).getMdIds(),mjy,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjy.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); mjyJcgj.setJcmc("领取发放"); mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("出库量", mjy.getKc()); + formData.put("出库量", mjy.getKc()+ mjy.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); - formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getKcdw()); - formData.put("目的", plffItemFilter.get(0).getMdIds()); - formData.put("备注", plffItemFilter.get(0).getRemark()); - - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getKcdw()); + formData.put("目的", plffItemFilter.get(0).getMdIds()); + formData.put("备注", plffItemFilter.get(0).getRemark()); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(SecurityUtils.getUserId()); mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion - //region 台账 MjyTz mjyTz = new MjyTz(); mjyTz.setMjyId(mjy.getId()); @@ -992,7 +846,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTz.setRemark(plffItemFilter.get(0).getRemark()); mjyTzList.add(mjyTz); //endregion - //region 更新发放信息 mjy.setCkl(mjy.getKc()); mjy.setCkldw(mjy.getKcdw()); @@ -1013,13 +866,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjy.setMdIds(plffItemFilter.get(0).getMdIds()); mjy.setZjzt(ZjztEnum.yff.getValue()); //endregion - } else { throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } } mjyJcgjService.saveBatch(mjyJcgjList); - mjyFfjlService.saveBatch(mjyFfjlList); mjyTzService.saveBatch(mjyTzList); this.saveOrUpdateBatch(mjyList); } @@ -1185,7 +1036,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgjList.add(mjyJcgj); } //endregion - + mjyOld.setKcdwbj(form.getKcdw()); mjyOld.setKcbj(form.getKc()); mjyOld.setKcbjrId(qmr.getUserId()); @@ -1234,7 +1085,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("申请备注", mjyOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); - mjyJcgj.setJcnr(JcgjUtil.formatStr(formData)); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(qmr.getUserId()); mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjService.save(mjyJcgj); @@ -1262,4 +1113,62 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } + /** + * 归还 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gh(@RequestBody GhForm form) { + SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); + SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); + SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); + 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.getZjzt().equals(ZjztEnum.yff.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能归还"); + } + BigDecimal kc = new BigDecimal(mjyOld.getKc()); + BigDecimal syl = new BigDecimal(form.getSyl()); + if (syl.compareTo(kc) > 0) { + throw new SecurityException("使用量不能大于出库量"); + } + BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); + mjyFfjlService.gh(form,mjyOld,ghr1,ghr2,jsr1,jsr2); + //region 台账 + mjyTzService.saveTz(mjyOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(), + "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null, + "归还", form.getRkmz(), mjyOld.getKcdw(), form.getRemark()); + //endregion + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("入库位置", form.getRkwz()); + formData.put("入库条件", form.getRktj()); + formData.put("转移条件", form.getGhzytj()); + formData.put("入库毛重", form.getRkmz()+mjyOld.getKcdw()); + formData.put("减少量", form.getJsl()+mjyOld.getKcdw()); + formData.put("使用量", form.getSyl()+mjyOld.getKcdw()); + formData.put("归还人1", ghr1.getNickName()); + formData.put("归还人2", ghr2.getNickName()); + formData.put("库管员1", jsr1.getNickName()); + formData.put("库管员2", jsr2.getNickName()); + formData.put("备注", form.getRemark()); + formData.put("签名意义", "归还"); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); + //endregion + mjyOld.setKc(leftKc.toString()); + mjyOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(mjyOld); + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JcgjUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JctUtil.java similarity index 87% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JcgjUtil.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JctUtil.java index 82952c7..0f7c908 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JcgjUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JctUtil.java @@ -8,9 +8,11 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - -public class JcgjUtil { - private static final Logger LOG = LoggerFactory.getLogger(JcgjUtil.class.getName()); +/** + * @author tanfei + */ +public class JctUtil { + private static final Logger LOG = LoggerFactory.getLogger(JctUtil.class.getName()); public static void main(String[] args) { Map formData = new LinkedHashMap<>(); @@ -20,12 +22,12 @@ public class JcgjUtil { } public static String formatStr(Map map) { - List result=new ArrayList<>(); + List result=new ArrayList<>(); // 遍历键值对 for (Map.Entry entry : map.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); - jcgj jcgj=new jcgj(); + Jcgj jcgj=new Jcgj(); jcgj.setName(key); jcgj.setValue(value); result.add(jcgj); @@ -33,7 +35,7 @@ public class JcgjUtil { return JSONObject.toJSONString(result); } - public static class jcgj { + public static class Jcgj { private String name; private String value; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java index 99a75aa..af0f436 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java @@ -2,7 +2,6 @@ package com.hxhq.business.utils; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -236,7 +235,7 @@ public class ObjectCompareUtil { map.put("字段名", fieldLabel); map.put("原值", oldValue); map.put("新值", newValue); - return JcgjUtil.formatStr(map); + return JctUtil.formatStr(map); } } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml index d5a01da..f2ce87e 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml @@ -11,7 +11,7 @@ - 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 + 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.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc ,z.mc as zcgMc FROM `t_mjy_ffjl` t diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml index e018789..3025e81 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml @@ -11,7 +11,7 @@