From f54f9e846d9e1463f1cf36d3cbb1dfc99571cbac Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 22 Dec 2025 20:29:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/MjyController.java | 8 +- .../java/com/hxhq/business/domain/GyzjJcgj.java | 4 +- .../main/java/com/hxhq/business/domain/Mjy.java | 367 +++++++++++++--- .../java/com/hxhq/business/domain/MjyFfjl.java | 34 +- .../java/com/hxhq/business/domain/MjyJcgj.java | 24 +- .../java/com/hxhq/business/dto/mjy/MjyListDto.java | 43 ++ .../java/com/hxhq/business/enums/zykgl/KcEnum.java | 51 --- .../com/hxhq/business/enums/zykgl/KcbjEnum.java | 51 +++ .../com/hxhq/business/enums/zykgl/RqztEnum.java | 51 +++ .../java/com/hxhq/business/form/mjy/MjyBjForm.java | 113 ++--- .../com/hxhq/business/form/mjy/MjyShbjForm.java | 85 ++-- .../com/hxhq/business/form/mjy/MjyShxgkcForm.java | 61 +-- .../com/hxhq/business/form/mjy/MjyXgkcForm.java | 41 +- .../com/hxhq/business/service/IMjyService.java | 4 +- .../business/service/impl/GyzjJcgjServiceImpl.java | 4 +- .../business/service/impl/MjyJcgjServiceImpl.java | 10 +- .../hxhq/business/service/impl/MjyServiceImpl.java | 477 ++++++++++++--------- .../main/resources/mapper/business/MjyMapper.xml | 2 +- 18 files changed, 952 insertions(+), 478 deletions(-) delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcEnum.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcbjEnum.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RqztEnum.java 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 799cf2b..19393ea 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 @@ -162,6 +162,7 @@ public class MjyController extends BaseController @RequiresPermissions("business:resource:mjy:czyj") public AjaxResult plczyj(@RequestBody MjyPlczyjForm form) { + form.setClrId(SecurityUtils.getUserId()); mjyService.plczyj(form); return AjaxResult.success("操作成功"); } @@ -173,6 +174,7 @@ public class MjyController extends BaseController @RequiresPermissions("business:resource:mjy:czyj") public AjaxResult czyj(@RequestBody MjyCzyjForm form) { + form.setClrId(SecurityUtils.getUserId()); mjyService.czyj(form); return AjaxResult.success("操作成功"); } @@ -184,6 +186,7 @@ public class MjyController extends BaseController @RequiresPermissions("business:resource:mjy:czrq") public AjaxResult plczrq(@RequestBody MjyPlczrqForm form) { + form.setClrId(SecurityUtils.getUserId()); mjyService.plczrq(form); return AjaxResult.success("操作成功"); } @@ -195,6 +198,7 @@ public class MjyController extends BaseController @RequiresPermissions("business:resource:mjy:czrq") public AjaxResult czrq(@RequestBody MjyCzrqForm form) { + form.setClrId(SecurityUtils.getUserId()); mjyService.czrq(form); return AjaxResult.success("操作成功"); } @@ -256,7 +260,7 @@ public class MjyController extends BaseController */ @PostMapping("shbj") @RequiresPermissions("business:resource:mjy:shbj") - public AjaxResult shbj(@RequestBody MjyBjForm form) + public AjaxResult shbj(@RequestBody MjyShbjForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.shbj(form); @@ -283,7 +287,7 @@ public class MjyController extends BaseController */ @PostMapping("shxgkc") @RequiresPermissions("business:resource:mjy:shxgkc") - public AjaxResult shxgkc(@RequestBody MjyXgkcForm form) + public AjaxResult shxgkc(@RequestBody MjyShxgkcForm form) { form.setQmrId(SecurityUtils.getUserId()); mjyService.shxgkc(form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java index 348c39e..e8a9d3e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java @@ -81,7 +81,7 @@ public class GyzjJcgj extends MpBaseEntity return jcrId; } - public void setJcrId(Long jcrId) { + public void setQmrId(Long jcrId) { this.jcrId = jcrId; } @@ -89,7 +89,7 @@ public class GyzjJcgj extends MpBaseEntity return jcrMc; } - public void setJcrMc(String jcrMc) { + public void setQmrMc(String jcrMc) { this.jcrMc = jcrMc; } } 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 4f99c6c..a259ff0 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 @@ -45,9 +45,18 @@ public class Mjy extends MpBaseEntity /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ private Integer zjzt; - /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + /** 借阅状态：1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; + /** 编辑状态：1:未编辑 3:审核中 */ + private Integer bjzt; + + /** 库存编辑状态：1:未编辑 3:审核中 */ + private Integer kcbjzt; + + /** 容器状态：1:未处置 3:已处置 */ + private Integer rqzt; + /** 关联暂存柜id */ @TableField(updateStrategy = FieldStrategy.IGNORED) private Long zcgId; @@ -66,42 +75,270 @@ public class Mjy extends MpBaseEntity /** 名称编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String mcBj; + private String mcbj; /** 浓度编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String ndBj; + private String ndbj; /** 浓度单位编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String nddwBj; + private String nddwbj; /** 库存编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String kcBj; + private String kcbj; /** 库存单位编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String kcdwBj; + private String kcdwbj; /** 失效日期编辑 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private Date sxrqBj; + private Date sxrqbj; /** 存储条件编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String cctjBj; + private String cctjbj; /** 存储位置编辑 */ @TableField(updateStrategy = FieldStrategy.IGNORED) - private String ccwzBj; + private String ccwzbj; - /** 编辑状态 1:未编辑 3:审核中 */ - private Integer bjzt; + /** 编辑备注 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjbz; + + /** 库存备注 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjbz; + + /** 编辑人id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long bjrId; + + /** 编辑人名称 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjrMc; + + /** 库存编辑人id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long kcbjrId; + + /** 库存编辑人名称 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjrMc; + + /** 出库量 */ + private String ckl; - /** 库存状态 1:未编辑 3:审核中 */ - private Integer kczt; + /** 出库量单位 */ + private String ckldw; + + /** 发放转移条件 */ + private String ffzytj; + + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + /** 领取人1id */ + private Long lqr1Id; + + /** 领取人2id */ + private Long lqr2Id; + + /** 发放人1id */ + private Long ffr1Id; + + /** 发放人2id */ + private Long ffr2Id; + + /** 领取人1名称 */ + private String lqr1Mc; + + /** 领取人2名称 */ + private String lqr2Mc; + + /** 发放人1名称 */ + private String ffr1Mc; + + /** 发放人2名称 */ + private String ffr2Mc; + + /** 发放日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ffrq; + + /** 发放备注 */ + private String ffbz; + + /** 发放项目id */ + private Long ffxmId; + + public Date getFfrq() { + return ffrq; + } + + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; + } + + public String getCkl() { + return ckl; + } + + public void setCkl(String ckl) { + this.ckl = ckl; + } + + public String getCkldw() { + return ckldw; + } + + public void setCkldw(String ckldw) { + this.ckldw = ckldw; + } + + public String getFfzytj() { + return ffzytj; + } + + public void setFfzytj(String ffzytj) { + this.ffzytj = ffzytj; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + public Long getLqr1Id() { + return lqr1Id; + } + + public void setLqr1Id(Long lqr1Id) { + this.lqr1Id = lqr1Id; + } + + public Long getLqr2Id() { + return lqr2Id; + } + + public void setLqr2Id(Long lqr2Id) { + this.lqr2Id = lqr2Id; + } + + public Long getFfr1Id() { + return ffr1Id; + } + + public void setFfr1Id(Long ffr1Id) { + this.ffr1Id = ffr1Id; + } + + public Long getFfr2Id() { + return ffr2Id; + } + + public void setFfr2Id(Long ffr2Id) { + this.ffr2Id = ffr2Id; + } + + public String getLqr1Mc() { + return lqr1Mc; + } + + public void setLqr1Mc(String lqr1Mc) { + this.lqr1Mc = lqr1Mc; + } + + public String getLqr2Mc() { + return lqr2Mc; + } + + public void setLqr2Mc(String lqr2Mc) { + this.lqr2Mc = lqr2Mc; + } + + public String getFfr1Mc() { + return ffr1Mc; + } + + public void setFfr1Mc(String ffr1Mc) { + this.ffr1Mc = ffr1Mc; + } + + public String getFfr2Mc() { + return ffr2Mc; + } + + public void setFfr2Mc(String ffr2Mc) { + this.ffr2Mc = ffr2Mc; + } + + + public String getFfbz() { + return ffbz; + } + + public void setFfbz(String ffbz) { + this.ffbz = ffbz; + } + + public Long getFfxmId() { + return ffxmId; + } + + public void setFfxmId(Long ffxmId) { + this.ffxmId = ffxmId; + } + + public Long getBjrId() { + return bjrId; + } + + public void setBjrId(Long bjrId) { + this.bjrId = bjrId; + } + + public String getBjrMc() { + return bjrMc; + } + + public void setBjrMc(String bjrMc) { + this.bjrMc = bjrMc; + } + + public Long getKcbjrId() { + return kcbjrId; + } + + public void setKcbjrId(Long kcbjrId) { + this.kcbjrId = kcbjrId; + } + + public String getKcbjrMc() { + return kcbjrMc; + } + + public void setKcbjrMc(String kcbjrMc) { + this.kcbjrMc = kcbjrMc; + } public String getMc() { return mc; @@ -175,6 +412,30 @@ public class Mjy extends MpBaseEntity this.jyzt = jyzt; } + public Integer getBjzt() { + return bjzt; + } + + public void setBjzt(Integer bjzt) { + this.bjzt = bjzt; + } + + public Integer getKcbjzt() { + return kcbjzt; + } + + public void setKcbjzt(Integer kcbjzt) { + this.kcbjzt = kcbjzt; + } + + public Integer getRqzt() { + return rqzt; + } + + public void setRqzt(Integer rqzt) { + this.rqzt = rqzt; + } + public Long getZcgId() { return zcgId; } @@ -215,83 +476,83 @@ public class Mjy extends MpBaseEntity this.xmId = xmId; } - public String getMcBj() { - return mcBj; + public String getMcbj() { + return mcbj; } - public void setMcBj(String mcBj) { - this.mcBj = mcBj; + public void setMcbj(String mcbj) { + this.mcbj = mcbj; } - public String getNdBj() { - return ndBj; + public String getNdbj() { + return ndbj; } - public void setNdBj(String ndBj) { - this.ndBj = ndBj; + public void setNdbj(String ndbj) { + this.ndbj = ndbj; } - public String getNddwBj() { - return nddwBj; + public String getNddwbj() { + return nddwbj; } - public void setNddwBj(String nddwBj) { - this.nddwBj = nddwBj; + public void setNddwbj(String nddwbj) { + this.nddwbj = nddwbj; } - public String getKcBj() { - return kcBj; + public String getKcbj() { + return kcbj; } - public void setKcBj(String kcBj) { - this.kcBj = kcBj; + public void setKcbj(String kcbj) { + this.kcbj = kcbj; } - public String getKcdwBj() { - return kcdwBj; + public String getKcdwbj() { + return kcdwbj; } - public void setKcdwBj(String kcdwBj) { - this.kcdwBj = kcdwBj; + public void setKcdwbj(String kcdwbj) { + this.kcdwbj = kcdwbj; } - public Date getSxrqBj() { - return sxrqBj; + public Date getSxrqbj() { + return sxrqbj; } - public void setSxrqBj(Date sxrqBj) { - this.sxrqBj = sxrqBj; + public void setSxrqbj(Date sxrqbj) { + this.sxrqbj = sxrqbj; } - public String getCctjBj() { - return cctjBj; + public String getCctjbj() { + return cctjbj; } - public void setCctjBj(String cctjBj) { - this.cctjBj = cctjBj; + public void setCctjbj(String cctjbj) { + this.cctjbj = cctjbj; } - public String getCcwzBj() { - return ccwzBj; + public String getCcwzbj() { + return ccwzbj; } - public void setCcwzBj(String ccwzBj) { - this.ccwzBj = ccwzBj; + public void setCcwzbj(String ccwzbj) { + this.ccwzbj = ccwzbj; } - public Integer getBjzt() { - return bjzt; + public String getBjbz() { + return bjbz; } - public void setBjzt(Integer bjzt) { - this.bjzt = bjzt; + public void setBjbz(String bjbz) { + this.bjbz = bjbz; } - public Integer getKczt() { - return kczt; + public String getKcbjbz() { + return kcbjbz; } - public void setKczt(Integer kczt) { - this.kczt = kczt; + public void setKcbjbz(String kcbjbz) { + this.kcbjbz = kcbjbz; } } 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 780431f..1b90e79 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 @@ -90,9 +90,9 @@ public class MjyFfjl extends MpBaseEntity /** 发放人2名称 */ private String ffr2Mc; - /** 领取日期 */ + /** 发放日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date lqrq; + private Date ffrq; /** 发放备注 */ private String ffbz; @@ -130,9 +130,9 @@ public class MjyFfjl extends MpBaseEntity /** 接收人2名称 */ private String jsr2Mc; - /** 接收日期 */ + /** 归还日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date jsrq; + private Date ghrq; /** 归还备注 */ private String ghbz; @@ -415,15 +415,6 @@ public class MjyFfjl extends MpBaseEntity } - public void setLqrq(Date lqrq) - { - this.lqrq = lqrq; - } - - public Date getLqrq() - { - return lqrq; - } public void setFfbz(String ffbz) { @@ -485,15 +476,20 @@ public class MjyFfjl extends MpBaseEntity return ghr2Id; } + public Date getFfrq() { + return ffrq; + } - public void setJsrq(Date jsrq) - { - this.jsrq = jsrq; + public void setFfrq(Date ffrq) { + this.ffrq = ffrq; } - public Date getJsrq() - { - return jsrq; + public Date getGhrq() { + return ghrq; + } + + public void setGhrq(Date ghrq) { + this.ghrq = ghrq; } public void setGhbz(String ghbz) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java index aff1877..fa7a476 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java @@ -30,11 +30,11 @@ public class MjyJcgj extends MpBaseEntity /** 稽查内容 */ private String jcnr; - /** 稽查人id */ - private Long jcrId; + /** 签名人id */ + private Long qmrId; - /** 稽查人名称 */ - private String jcrMc; + /** 签名人名称 */ + private String qmrMc; public Long getMjyId() { return mjyId; @@ -76,19 +76,19 @@ public class MjyJcgj extends MpBaseEntity this.jcnr = jcnr; } - public Long getJcrId() { - return jcrId; + public Long getQmrId() { + return qmrId; } - public void setJcrId(Long jcrId) { - this.jcrId = jcrId; + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; } - public String getJcrMc() { - return jcrMc; + public String getQmrMc() { + return qmrMc; } - public void setJcrMc(String jcrMc) { - this.jcrMc = jcrMc; + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java index 8269a8d..66ca6fb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java @@ -8,6 +8,8 @@ import java.util.Date; * @author 15881 */ public class MjyListDto { + /** id */ + private Long id; /** 名称 */ private String mc; @@ -37,6 +39,15 @@ public class MjyListDto { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; + /** 编辑状态 1:未编辑 3:审核中 */ + private Integer bjzt; + + /** 库存编辑状态 1:未编辑 3:审核中 */ + private Integer kcbjzt; + + /** 容器状态：1:未处置 3:已处置 */ + private Integer rqzt; + /** 暂存柜 */ private String zcgMc; @@ -50,6 +61,38 @@ public class MjyListDto { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + public Integer getRqzt() { + return rqzt; + } + + public void setRqzt(Integer rqzt) { + this.rqzt = rqzt; + } + + public Integer getBjzt() { + return bjzt; + } + + public void setBjzt(Integer bjzt) { + this.bjzt = bjzt; + } + + public Integer getKcbjzt() { + return kcbjzt; + } + + public void setKcbjzt(Integer kcbjzt) { + this.kcbjzt = kcbjzt; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public Date getCreateTime() { return createTime; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcEnum.java deleted file mode 100644 index b78080b..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hxhq.business.enums.zykgl; - -/** - * 库存状态 1:未编辑 3:审核中 - * @author tanfei - */ -public enum KcEnum { - - /** - * 未编辑 - */ - wbj(1, "未编辑"), - - /** - * 审核中 - */ - shz(3, "审核中"); - - private int value; - private String text; - - KcEnum(int value, String text) { - this.value = value; - this.text = text; - } - - public int getValue() { - return value; - } - - public void setValue(int value) { - this.value = value; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public static KcEnum getEnumByValue(int type) { - for (KcEnum bt : values()) { - if (bt.value == type) { - return bt; - } - } - return null; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcbjEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcbjEnum.java new file mode 100644 index 0000000..6d2a227 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/KcbjEnum.java @@ -0,0 +1,51 @@ +package com.hxhq.business.enums.zykgl; + +/** + * 库存编辑状态 1:未编辑 3:审核中 + * @author tanfei + */ +public enum KcbjEnum { + + /** + * 未编辑 + */ + wbj(1, "未编辑"), + + /** + * 审核中 + */ + shz(3, "审核中"); + + private int value; + private String text; + + KcbjEnum(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 KcbjEnum getEnumByValue(int type) { + for (KcbjEnum 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/RqztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RqztEnum.java new file mode 100644 index 0000000..7b41e54 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/RqztEnum.java @@ -0,0 +1,51 @@ +package com.hxhq.business.enums.zykgl; + +/** + * 容器状态：1:未处置 3:已处置 + * @author tanfei + */ +public enum RqztEnum { + + /** + * 未处置 + */ + wcz(1, "未处置"), + + /** + * 已处置 + */ + ycz(3, "已处置"); + + private int value; + private String text; + + RqztEnum(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 RqztEnum getEnumByValue(int type) { + for (RqztEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java index 1ebe9b0..e4346d7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyBjForm.java @@ -13,32 +13,32 @@ public class MjyBjForm { private Long id; /** 名称编辑 */ - private String mcBj; + private String mcbj; /** 浓度编辑 */ - private String ndBj; + private String ndbj; /** 浓度单位编辑 */ - private String nddwBj; + private String nddwbj; /** 库存编辑 */ - private String kcBj; + private String kcbj; /** 库存单位编辑 */ - private String kcdwBj; + private String kcdwbj; /** 失效日期编辑 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date sxrqBj; + private Date sxrqbj; /** 存储条件编辑 */ - private String cctjBj; + private String cctjbj; /** 存储位置编辑 */ - private String ccwzBj; + private String ccwzbj; - /** 备注 */ - private String remark; + /** 编辑备注 */ + private String bjbz; /** 签名人id */ private Long qmrId; @@ -46,84 +46,95 @@ public class MjyBjForm { /** 签名人密码 */ private String qmrmm; - public String getMcBj() { - return mcBj; + /** 项目id */ + private Long xmId; + + public Long getXmId() { + return xmId; } - public void setMcBj(String mcBj) { - this.mcBj = mcBj; + public void setXmId(Long xmId) { + this.xmId = xmId; } - public String getNdBj() { - return ndBj; + public Long getId() { + return id; } - public void setNdBj(String ndBj) { - this.ndBj = ndBj; + public void setId(Long id) { + this.id = id; } - public String getNddwBj() { - return nddwBj; + public String getMcbj() { + return mcbj; } - public void setNddwBj(String nddwBj) { - this.nddwBj = nddwBj; + public void setMcbj(String mcbj) { + this.mcbj = mcbj; } - public String getKcBj() { - return kcBj; + public String getNdbj() { + return ndbj; } - public void setKcBj(String kcBj) { - this.kcBj = kcBj; + public void setNdbj(String ndbj) { + this.ndbj = ndbj; } - public String getKcdwBj() { - return kcdwBj; + public String getNddwbj() { + return nddwbj; } - public void setKcdwBj(String kcdwBj) { - this.kcdwBj = kcdwBj; + public void setNddwbj(String nddwbj) { + this.nddwbj = nddwbj; } - public Date getSxrqBj() { - return sxrqBj; + public String getKcbj() { + return kcbj; } - public void setSxrqBj(Date sxrqBj) { - this.sxrqBj = sxrqBj; + public void setKcbj(String kcbj) { + this.kcbj = kcbj; } - public String getCctjBj() { - return cctjBj; + public String getKcdwbj() { + return kcdwbj; } - public void setCctjBj(String cctjBj) { - this.cctjBj = cctjBj; + public void setKcdwbj(String kcdwbj) { + this.kcdwbj = kcdwbj; } - public String getCcwzBj() { - return ccwzBj; + public Date getSxrqbj() { + return sxrqbj; } - public void setCcwzBj(String ccwzBj) { - this.ccwzBj = ccwzBj; + public void setSxrqbj(Date sxrqbj) { + this.sxrqbj = sxrqbj; } - public Long getId() { - return id; + public String getCctjbj() { + return cctjbj; } - public void setId(Long id) { - this.id = id; + public void setCctjbj(String cctjbj) { + this.cctjbj = cctjbj; + } + + public String getCcwzbj() { + return ccwzbj; } - public String getRemark() { - return remark; + public void setCcwzbj(String ccwzbj) { + this.ccwzbj = ccwzbj; } - public void setRemark(String remark) { - this.remark = remark; + public String getBjbz() { + return bjbz; + } + + public void setBjbz(String bjbz) { + this.bjbz = bjbz; } public Long getQmrId() { @@ -141,4 +152,6 @@ public class MjyBjForm { public void setQmrmm(String qmrmm) { this.qmrmm = qmrmm; } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java index 6158b44..ce62f4c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShbjForm.java @@ -13,87 +13,98 @@ public class MjyShbjForm { private Long id; /** 名称编辑 */ - private String mcBj; + private String mcbj; /** 浓度编辑 */ - private String ndBj; + private String ndbj; /** 浓度单位编辑 */ - private String nddwBj; + private String nddwbj; /** 失效日期编辑 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date sxrqBj; + private Date sxrqbj; /** 存储条件编辑 */ - private String cctjBj; + private String cctjbj; /** 存储位置编辑 */ - private String ccwzBj; + private String ccwzbj; /** 备注 */ private String remark; /** 签名人id */ - private String qmrId; + private Long qmrId; /** 签名人密码 */ private String qmrmm; - public String getNddwBj() { - return nddwBj; + /** 签名意义 */ + private String qmyy; + + public String getQmyy() { + return qmyy; } - public void setNddwBj(String nddwBj) { - this.nddwBj = nddwBj; + public void setQmyy(String qmyy) { + this.qmyy = qmyy; } - public String getMcBj() { - return mcBj; + public Long getId() { + return id; } - public void setMcBj(String mcBj) { - this.mcBj = mcBj; + public void setId(Long id) { + this.id = id; } - public String getNdBj() { - return ndBj; + public String getMcbj() { + return mcbj; } - public void setNdBj(String ndBj) { - this.ndBj = ndBj; + public void setMcbj(String mcbj) { + this.mcbj = mcbj; } - public Date getSxrqBj() { - return sxrqBj; + public String getNdbj() { + return ndbj; } - public void setSxrqBj(Date sxrqBj) { - this.sxrqBj = sxrqBj; + public void setNdbj(String ndbj) { + this.ndbj = ndbj; } - public String getCctjBj() { - return cctjBj; + public String getNddwbj() { + return nddwbj; } - public void setCctjBj(String cctjBj) { - this.cctjBj = cctjBj; + public void setNddwbj(String nddwbj) { + this.nddwbj = nddwbj; } - public String getCcwzBj() { - return ccwzBj; + public Date getSxrqbj() { + return sxrqbj; } - public void setCcwzBj(String ccwzBj) { - this.ccwzBj = ccwzBj; + public void setSxrqbj(Date sxrqbj) { + this.sxrqbj = sxrqbj; } - public Long getId() { - return id; + public String getCctjbj() { + return cctjbj; } - public void setId(Long id) { - this.id = id; + public void setCctjbj(String cctjbj) { + this.cctjbj = cctjbj; + } + + public String getCcwzbj() { + return ccwzbj; + } + + public void setCcwzbj(String ccwzbj) { + this.ccwzbj = ccwzbj; } public String getRemark() { @@ -104,11 +115,11 @@ public class MjyShbjForm { this.remark = remark; } - public String getQmrId() { + public Long getQmrId() { return qmrId; } - public void setQmrId(String qmrId) { + public void setQmrId(Long qmrId) { this.qmrId = qmrId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java index 04acd30..c30f603 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyShxgkcForm.java @@ -9,7 +9,7 @@ public class MjyShxgkcForm { private Long id; /** 库存编辑 */ - private String kcBj; + private String kcbj; /** 库存 */ private String kc; @@ -18,31 +18,42 @@ public class MjyShxgkcForm { private String kcdw; /** 库存单位编辑 */ - private String kcdwBj; + private String kcdwbj; /** 备注 */ private String remark; /** 签名人id */ - private String qmrId; + private Long qmrId; /** 签名人密码 */ private String qmrmm; - public String getKcdw() { - return kcdw; + /** 签名意义 */ + private String qmyy; + + public String getQmyy() { + return qmyy; } - public void setKcdw(String kcdw) { - this.kcdw = kcdw; + public void setQmyy(String qmyy) { + this.qmyy = qmyy; } - public String getKcdwBj() { - return kcdwBj; + public Long getId() { + return id; } - public void setKcdwBj(String kcdwBj) { - this.kcdwBj = kcdwBj; + public void setId(Long id) { + this.id = id; + } + + public String getKcbj() { + return kcbj; + } + + public void setKcbj(String kcbj) { + this.kcbj = kcbj; } public String getKc() { @@ -53,12 +64,20 @@ public class MjyShxgkcForm { this.kc = kc; } - public Long getId() { - return id; + public String getKcdw() { + return kcdw; } - public void setId(Long id) { - this.id = id; + public void setKcdw(String kcdw) { + this.kcdw = kcdw; + } + + public String getKcdwbj() { + return kcdwbj; + } + + public void setKcdwbj(String kcdwbj) { + this.kcdwbj = kcdwbj; } public String getRemark() { @@ -69,11 +88,11 @@ public class MjyShxgkcForm { this.remark = remark; } - public String getQmrId() { + public Long getQmrId() { return qmrId; } - public void setQmrId(String qmrId) { + public void setQmrId(Long qmrId) { this.qmrId = qmrId; } @@ -84,12 +103,4 @@ public class MjyShxgkcForm { public void setQmrmm(String qmrmm) { this.qmrmm = qmrmm; } - - public String getKcBj() { - return kcBj; - } - - public void setKcBj(String kcBj) { - this.kcBj = kcBj; - } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java index 5512e3d..32b8733 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/MjyXgkcForm.java @@ -9,13 +9,13 @@ public class MjyXgkcForm { private Long id; /** 库存编辑 */ - private String kcBj;; + private String kcbj;; /** 库存单位编辑 */ - private String kcdwBj; + private String kcdwbj; - /** 备注 */ - private String remark; + /** 库存编辑备注 */ + private String kcbjbz; /** 签名人id */ private Long qmrId; @@ -23,20 +23,30 @@ public class MjyXgkcForm { /** 签名人密码 */ private String qmrmm; - public String getKcdwBj() { - return kcdwBj; + + + public String getKcbjbz() { + return kcbjbz; } - public void setKcdwBj(String kcdwBj) { - this.kcdwBj = kcdwBj; + public void setKcbjbz(String kcbjbz) { + this.kcbjbz = kcbjbz; } - public String getKcBj() { - return kcBj; + public String getKcbj() { + return kcbj; } - public void setKcBj(String kcBj) { - this.kcBj = kcBj; + public void setKcbj(String kcbj) { + this.kcbj = kcbj; + } + + public String getKcdwbj() { + return kcdwbj; + } + + public void setKcdwbj(String kcdwbj) { + this.kcdwbj = kcdwbj; } public Long getId() { @@ -47,13 +57,6 @@ public class MjyXgkcForm { this.id = id; } - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } public Long getQmrId() { return qmrId; 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 ecab7f4..beeeb99 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 @@ -141,7 +141,7 @@ public interface IMjyService extends IService * * @param form */ - public void shbj(@RequestBody MjyBjForm form); + public void shbj(@RequestBody MjyShbjForm form); /** * 修改库存 @@ -155,6 +155,6 @@ public interface IMjyService extends IService * * @param form */ - public void shxgkc(@RequestBody MjyXgkcForm form); + public void shxgkc(@RequestBody MjyShxgkcForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index 177d977..4212e15 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -57,8 +57,8 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i gyzjJcgj.setJcmc(jcmc); gyzjJcgj.setJcmcys(jcmcys); gyzjJcgj.setJcnr(jcnr); - gyzjJcgj.setJcrId(jcrId); - gyzjJcgj.setJcrMc(jcrMc); + gyzjJcgj.setQmrId(jcrId); + gyzjJcgj.setQmrMc(jcrMc); this.save(gyzjJcgj); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java index 7c13823..c5bb749 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java @@ -37,9 +37,9 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl if(mjyJcgj.getJcgjlx()!=null&&mjyJcgj.getJcgjlx().intValue()>0){ queryWrapper.eq("jcgjlx",mjyJcgj.getJcgjlx()); } - if (StringUtils.isBlank(mjyJcgj.getJcrMc())) { - queryWrapper.and(p -> p.like("`jcmc`", mjyJcgj.getJcrMc()) - .or().like("`jcnr`", mjyJcgj.getJcrMc())); + if (StringUtils.isBlank(mjyJcgj.getJcmc())) { + queryWrapper.and(p -> p.like("`jcmc`", mjyJcgj.getJcmc()) + .or().like("`jcnr`", mjyJcgj.getJcmc())); } queryWrapper.orderByDesc("id"); return this.list(queryWrapper); @@ -63,8 +63,8 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl mjyJcgj.setJcmc(jcmc); mjyJcgj.setJcmcys(jcmcys); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(jcrId); - mjyJcgj.setJcrMc(jcrMc); + mjyJcgj.setQmrId(jcrId); + mjyJcgj.setQmrMc(jcrMc); this.save(mjyJcgj); } 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 51e6b50..597ca3e 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 @@ -158,8 +158,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";签名意义：申请归档" + ";签名人：" + qmr.getNickName(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion @@ -235,8 +235,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";签名意义：锁定麻精药" + ";签名人：" + qmr.getNickName(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion @@ -349,24 +349,27 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS .collect(Collectors.toList()); if (mjyPlffItemFilter.size() > 0) { //region 验证 + if (StringUtils.isBlank(mjyPlffItemFilter.get(0).getCzl())) { + throw new SecurityException("处置量不能为空"); + } + BigDecimal czl = BigDecimal.ZERO; try { - if (StringUtils.isBlank(mjyPlffItemFilter.get(0).getCzl())) { - throw new SecurityException("处置量不能为空"); - } - BigDecimal czl = new BigDecimal(mjyPlffItemFilter.get(0).getCzl()); - //验证库存 - BigDecimal kc = new BigDecimal(mjy.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new SecurityException("麻精药【" + mjy.getMc() + "】库存不足，不能处置"); - } - if (kc.compareTo(czl) < 0) { - throw new SecurityException("麻精药【" + mjy.getMc() + "】处置量大于库存量"); - } - //更新库存 - mjy.setKc(kc.subtract(czl).toString()); + czl = new BigDecimal(mjyPlffItemFilter.get(0).getCzl()); } catch (Exception ex) { - throw new SecurityException("麻精药【" + mjy.getMc() + "】处置量不正确，请填写正确的数字"); + throw new SecurityException("处置量填写不正确"); + } + //验证库存 + BigDecimal kc = new BigDecimal(mjy.getKc()); + if (kc.compareTo(BigDecimal.ZERO) <= 0) { + throw new SecurityException("麻精药【" + mjy.getMc() + "】库存不足，不能处置"); + } + if (kc.compareTo(czl) < 0) { + throw new SecurityException("麻精药【" + mjy.getMc() + "】处置量大于库存量"); } + //更新库存 + mjy.setKc(kc.subtract(czl).toString()); + + //endregion //region 稽查轨迹 @@ -382,8 +385,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";复核人：" + fhr.getNickName() + ";监督人：" + jdr.getNickName(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion @@ -441,24 +444,26 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能处置药剂"); } + if (StringUtils.isBlank(form.getCzl())) { + throw new SecurityException("处置量不能为空"); + } + BigDecimal czl = BigDecimal.ZERO; try { - if (StringUtils.isBlank(form.getCzl())) { - throw new SecurityException("处置量不能为空"); - } - BigDecimal czl = new BigDecimal(form.getCzl()); - //验证库存 - BigDecimal kc = new BigDecimal(mjyOld.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new SecurityException("麻精药【" + mjyOld.getMc() + "】库存不足，不能处置"); - } - if (kc.compareTo(czl) < 0) { - throw new SecurityException("麻精药【" + mjyOld.getMc() + "】处置量大于库存量"); - } - //更新库存 - mjyOld.setKc(kc.subtract(czl).toString()); + czl = new BigDecimal(form.getCzl()); } catch (Exception ex) { - throw new SecurityException("处置量不正确，请填写正确的数字"); + throw new SecurityException("处置量填写不正确"); } + //验证库存 + BigDecimal kc = new BigDecimal(mjyOld.getKc()); + if (kc.compareTo(BigDecimal.ZERO) <= 0) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】库存不足，不能处置"); + } + if (kc.compareTo(czl) < 0) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】处置量大于库存量"); + } + //更新库存 + mjyOld.setKc(kc.subtract(czl).toString()); + //region 稽查轨迹 String jcnr = "处置方式：" + form.getCzfs() @@ -473,7 +478,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //region 台账 mjyTzService.saveTz(mjyOld.getId(), "", "", "", "", clr.getUserId(), clr.getNickName(), - "处置药剂", form.getCzl(), mjyOld.getKcdw(), form.getCzyy()); + "处置药剂", form.getCzl(), mjyOld.getKcdw(), form.getCzyy()); //endregion this.updateById(mjyOld); @@ -507,12 +512,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); + queryWrapper.eq("rqzt", RqztEnum.wcz.getValue()); List mjyList = this.list(queryWrapper); List mjyJcgjList = new ArrayList<>(); List mjyTzList = new ArrayList<>(); if (mjyList.size() <= 0) { - throw new SecurityException("麻精药不是入库状态，不能处置容器"); + throw new SecurityException("麻精药已经处置过容器了，不能重复操作"); } for (Mjy mjy : mjyList) { List mjyPlffItemFilter = form.getList().stream() @@ -532,8 +538,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";复核人：" + fhr.getNickName() + ";监督人：" + jdr.getNickName(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion @@ -546,10 +552,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy()); mjyTzList.add(mjyTz); //endregion + + mjy.setRqzt(RqztEnum.ycz.getValue()); } else { throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } } + + this.saveOrUpdateBatch(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); mjyTzService.saveBatch(mjyTzList); } @@ -585,7 +595,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能处置容器"); } - + if (!mjyOld.getRqzt().equals(RqztEnum.wcz.getValue())) { + throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经处置过容器了，不能重复操作"); + } //region 稽查轨迹 String jcnr = "处置方式：" + form.getCzfs() + ";处置原因：" + form.getCzyy() @@ -600,6 +612,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS "", "", clr.getUserId(), clr.getNickName(), "处置容器", "", "", form.getCzyy()); //endregion + mjyOld.setRqzt(RqztEnum.ycz.getValue()); + this.updateById(mjyOld); } @@ -665,8 +679,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";钥匙2领取人：" + lqr2.getNickName() + ";发放人：" + ffr1.getNickName(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion } @@ -718,6 +732,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } //验证领取人1、领取人2、发放人1、发放人2密码 todo + Date now = new Date(); + //region 发放记录 MjyFfjl mjyFfjl = new MjyFfjl(); @@ -729,7 +745,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setCctj(mjyOld.getCctj()); mjyFfjl.setCcwz(mjyOld.getCcwz()); mjyFfjl.setSxrq(mjyOld.getSxrq()); - mjyFfjl.setCctj(mjyOld.getCctj()); mjyFfjl.setCkl(mjyOld.getKc()); mjyFfjl.setCkldw(mjyOld.getKcdw()); @@ -745,7 +760,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setFfr1Mc(ffr1.getNickName()); mjyFfjl.setFfr2Mc(ffr2.getNickName()); - mjyFfjl.setLqrq(new Date()); + mjyFfjl.setFfrq(now); mjyFfjl.setFfbz(form.getRemark()); mjyFfjlService.save(mjyFfjl); @@ -768,9 +783,29 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); //endregion - //更新状态为已发放，修改库存为0 是否关联最后一次发放记录？ todo - mjyOld.setZjzt(ZjztEnum.yff.getValue()); + + //region 更新发放信息 + mjyOld.setCkl(mjyOld.getKc()); + mjyOld.setCkldw(mjyOld.getKcdw()); + mjyOld.setFfzytj(form.getZytj()); + mjyOld.setCkmz(form.getCkmz()); + mjyOld.setCkmzdw(form.getCkmzdw()); + mjyOld.setLqr1Id(lqr1.getUserId()); + mjyOld.setLqr2Id(lqr2.getUserId()); + mjyOld.setFfr1Id(ffr1.getUserId()); + mjyOld.setFfr2Id(ffr2.getUserId()); + mjyOld.setLqr1Mc(lqr1.getNickName()); + mjyOld.setLqr2Mc(lqr2.getNickName()); + mjyOld.setFfr1Mc(ffr1.getNickName()); + mjyOld.setFfr2Mc(ffr2.getNickName()); + mjyOld.setFfr2Mc(ffr2.getNickName()); mjyOld.setKc("0"); + mjyOld.setFfrq(now); + mjyOld.setFfbz(form.getRemark()); + mjyOld.setFfxmId(form.getXmId()); + mjyOld.setZjzt(ZjztEnum.yff.getValue()); + //endregion + this.updateById(mjyOld); } @@ -817,6 +852,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyList.size() <= 0) { throw new SecurityException("麻精药不是入库状态，不能发放"); } + Date now=new Date(); for (Mjy mjy : mjyList) { //验证库存 BigDecimal kc = new BigDecimal(mjy.getKc()); @@ -854,7 +890,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyFfjl.setFfr1Mc(ffr1.getNickName()); mjyFfjl.setFfr2Mc(ffr2.getNickName()); - mjyFfjl.setLqrq(new Date()); + mjyFfjl.setFfrq(now); mjyFfjl.setFfbz(mjyPlffItemFilter.get(0).getRemark()); mjyFfjlList.add(mjyFfjl); @@ -872,8 +908,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS + ";目的：" + mjyPlffItemFilter.get(0).getXmId() + ";备注：" + mjyPlffItemFilter.get(0).getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(SecurityUtils.getUserId()); - mjyJcgj.setJcrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); mjyJcgjList.add(mjyJcgj); //endregion @@ -889,9 +925,28 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTzList.add(mjyTz); //endregion - //发放 是否关联最后一次发放记录？ todo - mjy.setZjzt(ZjztEnum.yff.getValue()); + //region 更新发放信息 + mjy.setCkl(mjy.getKc()); + mjy.setCkldw(mjy.getKcdw()); + mjy.setFfzytj(mjyPlffItemFilter.get(0).getZytj()); + mjy.setCkmz(mjyPlffItemFilter.get(0).getCkmz()); + mjy.setCkmzdw(mjyPlffItemFilter.get(0).getCkmzdw()); + mjy.setLqr1Id(lqr1.getUserId()); + mjy.setLqr2Id(lqr2.getUserId()); + mjy.setFfr1Id(ffr1.getUserId()); + mjy.setFfr2Id(ffr2.getUserId()); + mjy.setLqr1Mc(lqr1.getNickName()); + mjy.setLqr2Mc(lqr2.getNickName()); + mjy.setFfr1Mc(ffr1.getNickName()); + mjy.setFfr2Mc(ffr2.getNickName()); + mjy.setFfr2Mc(ffr2.getNickName()); mjy.setKc("0"); + mjy.setFfrq(now); + mjy.setFfbz(mjyPlffItemFilter.get(0).getRemark()); + mjy.setFfxmId(mjyPlffItemFilter.get(0).getXmId()); + mjy.setZjzt(ZjztEnum.yff.getValue()); + //endregion + } else { throw new SecurityException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } @@ -909,7 +964,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void bj(@RequestBody MjyBjForm form){ + public void bj(@RequestBody MjyBjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -922,137 +977,144 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getBjzt().equals(BjEnum.wbj.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经提交编辑申请，请等待审核"); } - if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能编辑"); } List mjyJcgjList = new ArrayList<>(); //region 名称 - if(!mjyOld.getMc().equals(form.getMcBj())){ + mjyOld.setMcbj(form.getMcbj()); + + if (!mjyOld.getMc().equals(form.getMcbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：名称" + ";原值：" + mjyOld.getMc() - + ";新值：" + form.getMcBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getMcbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - - mjyOld.setMcBj(form.getMcBj()); } //endregion //region 浓度 - if(!mjyOld.getNd().equals(form.getNdBj())){ + mjyOld.setNdbj(form.getNdbj()); + + if (!mjyOld.getNd().equals(form.getNdbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：浓度" + ";原值：" + mjyOld.getNd() - + ";新值：" + form.getNdBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getNdbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNdBj(form.getNdBj()); } //endregion //region 浓度单位 - if(!mjyOld.getNddw().equals(form.getNddwBj())){ + mjyOld.setNddwbj(form.getNddwbj()); + + if (!mjyOld.getNddw().equals(form.getNddwbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：浓度单位" + ";原值：" + mjyOld.getNddw() - + ";新值：" + form.getNddwBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getNddwbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNddwBj(form.getNddwBj()); } //endregion //region 失效日期 - if(!mjyOld.getSxrq().equals(form.getSxrqBj())){ + mjyOld.setSxrqbj(form.getSxrqbj()); + + if (!mjyOld.getSxrq().equals(form.getSxrqbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：失效日期" + ";原值：" + mjyOld.getSxrq() - + ";新值：" + form.getSxrqBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getSxrqbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setSxrqBj(form.getSxrqBj()); } //endregion //region 存储条件 - if(!mjyOld.getCctj().equals(form.getCctjBj())){ + mjyOld.setCctjbj(form.getCctjbj()); + + if (!mjyOld.getCctj().equals(form.getCctjbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：存储条件" + ";原值：" + mjyOld.getCctj() - + ";新值：" + form.getCctjBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getCctjbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setCctjBj(form.getCctjBj()); } //endregion //region 存储位置 - if(!mjyOld.getCcwz().equals(form.getCcwzBj())){ + mjyOld.setCcwzbj(form.getCcwzbj()); + + if (!mjyOld.getCcwz().equals(form.getCcwzbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("编辑"); + mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：存储位置" + ";原值：" + mjyOld.getCcwz() - + ";新值：" + form.getCcwzBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getCcwzbj() + + ";备注：" + form.getBjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNdBj(form.getNdBj()); + mjyOld.setNdbj(form.getNdbj()); - mjyOld.setCcwzBj(form.getCcwzBj()); } //endregion - - if(mjyJcgjList.size()>0){ + if (mjyJcgjList.size() > 0) { + mjyOld.setBjbz(form.getBjbz()); + mjyOld.setBjrId(qmr.getUserId()); + mjyOld.setBjrMc(qmr.getNickName()); mjyOld.setBjzt(BjEnum.shz.getValue()); this.updateById(mjyOld); mjyJcgjService.saveBatch(mjyJcgjList); - }else{ + } else { throw new SecurityException("你没有修改任何内容"); } } @@ -1064,7 +1126,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shbj(@RequestBody MjyBjForm form){ + public void shbj(@RequestBody MjyShbjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1077,141 +1139,151 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getBjzt().equals(BjEnum.shz.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】没有提交编辑申请，不能审核编辑"); } - if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); } List mjyJcgjList = new ArrayList<>(); //region 名称 - if(!mjyOld.getMc().equals(form.getMcBj())){ + if (!mjyOld.getMc().equals(form.getMcbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：名称" + ";原值：" + mjyOld.getMc() - + ";新值：" + form.getMcBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getMcbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setMc(form.getMcBj()); } //endregion //region 浓度 - if(!mjyOld.getNd().equals(form.getNdBj())){ + if (!mjyOld.getNd().equals(form.getNdbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：浓度" + ";原值：" + mjyOld.getNd() - + ";新值：" + form.getNdBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getNdbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNd(form.getNdBj()); } //endregion //region 浓度单位 - if(!mjyOld.getNddw().equals(form.getNddwBj())){ + if (!mjyOld.getNddw().equals(form.getNddwbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：浓度单位" + ";原值：" + mjyOld.getNddw() - + ";新值：" + form.getNddwBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getNddwbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNddw(form.getNddwBj()); } //endregion //region 失效日期 - if(!mjyOld.getSxrq().equals(form.getSxrqBj())){ + if (!mjyOld.getSxrq().equals(form.getSxrqbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：失效日期" + ";原值：" + mjyOld.getSxrq() - + ";新值：" + form.getSxrqBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getSxrqbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setSxrq(form.getSxrqBj()); } //endregion //region 存储条件 - if(!mjyOld.getCctj().equals(form.getCctjBj())){ + if (!mjyOld.getCctj().equals(form.getCctjbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：存储条件" + ";原值：" + mjyOld.getCctj() - + ";新值：" + form.getCctjBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getCctjbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setCctj(form.getCctjBj()); } //endregion //region 存储位置 - if(!mjyOld.getCcwz().equals(form.getCcwzBj())){ + if (!mjyOld.getCcwz().equals(form.getCcwzbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核编辑"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：存储位置" + ";原值：" + mjyOld.getCcwz() - + ";新值：" + form.getCcwzBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getCcwzbj() + + ";修改备注：" + mjyOld.getBjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setNdBj(form.getNdBj()); + mjyOld.setNdbj(form.getNdbj()); - mjyOld.setCcwz(form.getCcwzBj()); } //endregion - - mjyOld.setMcBj(null); - mjyOld.setNddwBj(null); - mjyOld.setNdBj(null); - mjyOld.setSxrqBj(null); - mjyOld.setCctjBj(null); - mjyOld.setCcwzBj(null); + if (form.getQmyy().equals("同意编辑")) { + mjyOld.setCcwz(form.getCcwzbj()); + mjyOld.setCctj(form.getCctjbj()); + mjyOld.setSxrq(form.getSxrqbj()); + mjyOld.setNddw(form.getNddwbj()); + mjyOld.setNd(form.getNdbj()); + mjyOld.setMc(form.getMcbj()); + } + mjyOld.setMcbj(null); + mjyOld.setNddwbj(null); + mjyOld.setNdbj(null); + mjyOld.setSxrqbj(null); + mjyOld.setCctjbj(null); + mjyOld.setCcwzbj(null); + mjyOld.setBjbz(null); + mjyOld.setBjrId(null); + mjyOld.setBjrMc(null); mjyOld.setBjzt(BjEnum.wbj.getValue()); this.updateById(mjyOld); - if(mjyJcgjList.size()>0){ + if (mjyJcgjList.size() > 0) { mjyJcgjService.saveBatch(mjyJcgjList); } } @@ -1224,7 +1296,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void xgkc(@RequestBody MjyXgkcForm form){ + public void xgkc(@RequestBody MjyXgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1234,59 +1306,63 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new SecurityException("麻精药不存在或已删除"); } - if (!mjyOld.getKczt().equals(KcEnum.wbj.getValue())) { + if (!mjyOld.getKcbjzt().equals(KcbjEnum.wbj.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经提交修改库存申请，请等待审核"); } - if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能修改库存"); } List mjyJcgjList = new ArrayList<>(); //region 库存 - if(!mjyOld.getKc().equals(form.getKcBj())){ + mjyOld.setKcbj(form.getKcbj()); + if (!mjyOld.getKc().equals(form.getKcbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("修改库存"); + mjyJcgj.setJcmc("修改库存申请"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：库存" + ";原值：" + mjyOld.getKc() - + ";新值：" + form.getKcBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getKcbj() + + ";修改备注：" + form.getKcbjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setKcBj(form.getKcBj()); } //endregion //region 库存单位 - if(!mjyOld.getKcdw().equals(form.getKcdwBj())){ + mjyOld.setKcdwbj(form.getKcdwbj()); + + if (!mjyOld.getKcdw().equals(form.getKcdwbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("修改库存"); + mjyJcgj.setJcmc("修改库存申请"); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：库存单位" + ";原值：" + mjyOld.getKcdw() - + ";新值：" + form.getKcdwBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getKcdwbj() + + ";备注：" + form.getKcbjbz(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setKcdw(form.getKcdwBj()); } //endregion - if(mjyJcgjList.size()>0){ - mjyOld.setKczt(KcEnum.shz.getValue()); + if (mjyJcgjList.size() > 0) { + mjyOld.setKcbjrId(qmr.getUserId()); + mjyOld.setKcbjrMc(qmr.getNickName()); + mjyOld.setKcbjzt(KcbjEnum.shz.getValue()); + mjyOld.setKcbjbz(form.getKcbjbz()); this.updateById(mjyOld); mjyJcgjService.saveBatch(mjyJcgjList); - }else{ + } else { throw new SecurityException("你没有修改任何内容"); } } @@ -1299,7 +1375,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shxgkc(@RequestBody MjyXgkcForm form){ + public void shxgkc(@RequestBody MjyShxgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { @@ -1309,66 +1385,71 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new SecurityException("麻精药不存在或已删除"); } - if (!mjyOld.getKczt().equals(KcEnum.shz.getValue())) { + if (!mjyOld.getKcbjzt().equals(KcbjEnum.shz.getValue())) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】没有提交修改库存申请，不能审核修改库存"); } - if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())||mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { + if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); } List mjyJcgjList = new ArrayList<>(); //region 库存 - if(!mjyOld.getKc().equals(form.getKcBj())){ + if (!mjyOld.getKc().equals(form.getKcbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核修改库存"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：库存" + ";原值：" + mjyOld.getKc() - + ";新值：" + form.getKcBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getKcbj() + + ";申请备注：" + mjyOld.getKcbjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setKc(form.getKcBj()); + mjyOld.setKc(form.getKcbj()); } //endregion //region 库存单位 - if(!mjyOld.getKcdw().equals(form.getKcdwBj())){ + if (!mjyOld.getKcdw().equals(form.getKcdwbj())) { MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("审核修改库存"); + mjyJcgj.setJcmc(form.getQmyy()); mjyJcgj.setJcmcys(JcmcysEnum.gd.getValue()); String jcnr = "字段名：库存单位" + ";原值：" + mjyOld.getKcdw() - + ";新值：" + form.getKcdwBj() - + ";备注：" + form.getRemark(); + + ";新值：" + form.getKcdwbj() + + ";申请备注：" + mjyOld.getKcbjbz() + + ";审核备注：" + form.getRemark(); mjyJcgj.setJcnr(jcnr); - mjyJcgj.setJcrId(qmr.getUserId()); - mjyJcgj.setJcrMc(qmr.getNickName()); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjList.add(mjyJcgj); - mjyOld.setKcdw(form.getKcdwBj()); + mjyOld.setKcdw(form.getKcdwbj()); } //endregion - mjyOld.setKcBj(null); - mjyOld.setKcdwBj(null); - mjyOld.setKczt(KcEnum.wbj.getValue()); + mjyOld.setKcbj(null); + mjyOld.setKcdwbj(null); + mjyOld.setKcbjbz(null); + mjyOld.setKcbjzt(KcbjEnum.wbj.getValue()); this.updateById(mjyOld); //region 台账 - mjyTzService.saveTz(mjyOld.getId(), "", "", - "", "", qmr.getUserId(), qmr.getNickName(), - "修改库存", form.getKcBj(), form.getKcdwBj(), form.getRemark()); + if (form.getQmyy().equals("同意修改库存")) { + mjyTzService.saveTz(mjyOld.getId(), "", "", + "", "", qmr.getUserId(), qmr.getNickName(), + "修改库存", form.getKcbj(), form.getKcdwbj(), mjyOld.getKcbjbz()); + } //endregion - if(mjyJcgjList.size()>0){ + if (mjyJcgjList.size() > 0) { mjyJcgjService.saveBatch(mjyJcgjList); } } 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 9df941c..3d903ed 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 @@