From 4892651c4ddef9754d296a694e790d5aec787193 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 14 Jan 2026 14:09:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E5=85=A5?= =?UTF-8?q?=E5=BA=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/MjyController.java | 11 ++ .../com/hxhq/business/enums/zykgl/ZjztEnum.java | 6 +- .../java/com/hxhq/business/form/mjy/RkForm.java | 174 +++++++++++++++++++++ .../com/hxhq/business/service/IMjyService.java | 7 + .../business/service/impl/GyzjFfjlServiceImpl.java | 2 + .../business/service/impl/GyzjJcgjServiceImpl.java | 24 +-- .../business/service/impl/GyzjServiceImpl.java | 2 +- .../business/service/impl/MjyJcgjServiceImpl.java | 24 +-- .../hxhq/business/service/impl/MjyServiceImpl.java | 54 ++++++- .../java/com/hxhq/business/utils/GyzjJcnrUtil.java | 3 +- .../java/com/hxhq/business/utils/MjyJcnrUtil.java | 3 + 11 files changed, 288 insertions(+), 22 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/RkForm.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 dc51b5a..75c7cda 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 @@ -319,6 +319,17 @@ public class MjyController extends BaseController } /** + * 入库 + */ + @PostMapping("rk") + @RequiresPermissions({"business:resource:mjy:rk"}) + public AjaxResult rk(@RequestBody RkForm form) + { + mjyService.rk(form); + return AjaxResult.success("操作成功"); + } + + /** * 借阅 */ @PostMapping("/jy") diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ZjztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ZjztEnum.java index 90f4762..107ba77 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ZjztEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ZjztEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.zykgl; /** - * 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 + * 制剂状态：1：入库；2：未入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 * @author tanfei */ public enum ZjztEnum { @@ -10,6 +10,10 @@ public enum ZjztEnum { * 入库 */ rk(1, "入库"), + /** + * 未入库 + */ + wrk(2, "未入库"), /** * 已发放 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/RkForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/RkForm.java new file mode 100644 index 0000000..b816738 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/RkForm.java @@ -0,0 +1,174 @@ +package com.hxhq.business.form.mjy; + +/** + * @author 15881 + */ +public class RkForm { + + /** 麻精药id */ + private Long id; + + /** 入库位置 */ + private String rkwz; + + /** 入库条件 */ + private String rktj; + + /** 转移条件 */ + private String zytj; + + /** 入库量 */ + private String rkl; + + /** 入库单位 */ + private String rkldw; + + /** 签名人1id */ + private Long qmr1Id; + + /** 签名人1密码 */ + private String qmr1mm; + + /** 签名人2id */ + private Long qmr2Id; + + /** 签名人2密码 */ + private String qmr2mm; + + /** 接收人1id */ + private Long jsr1Id; + + /** 接收人1密码 */ + private String jsr1mm; + + /** 接收人2id */ + private Long jsr2Id; + + /** 接收人2密码 */ + private String jsr2mm; + + /** 备注 */ + private String remark; + + public String getZytj() { + return zytj; + } + + public void setZytj(String zytj) { + this.zytj = zytj; + } + + 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 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 Long getQmr1Id() { + return qmr1Id; + } + + public void setQmr1Id(Long qmr1Id) { + this.qmr1Id = qmr1Id; + } + + public String getQmr1mm() { + return qmr1mm; + } + + public void setQmr1mm(String qmr1mm) { + this.qmr1mm = qmr1mm; + } + + public Long getQmr2Id() { + return qmr2Id; + } + + public void setQmr2Id(Long qmr2Id) { + this.qmr2Id = qmr2Id; + } + + public String getQmr2mm() { + return qmr2mm; + } + + public void setQmr2mm(String qmr2mm) { + this.qmr2mm = qmr2mm; + } + + 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/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index 5aef2e5..80ce9d1 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 @@ -178,4 +178,11 @@ public interface IMjyService extends IService { * @param form */ public void gh(GhForm form); + + /** + * 入库 + * + * @param form + */ + public void rk(RkForm 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 d7170ea..ddf0af2 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 @@ -368,6 +368,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setGhzytj(form.getGhzytj()); gyzjFfjl.setRkl(form.getRkl()); gyzjFfjl.setRkldw(gyzj.getKcdw()); + gyzjFfjl.setRkmz(form.getRkmz()); + gyzjFfjl.setRkmzdw(gyzj.getKcdw()); gyzjFfjl.setSyl(form.getSyl()); gyzjFfjl.setSyldw(gyzj.getKcdw()); gyzjFfjl.setGhr1Id(ghr1.getUserId()); 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 6bb755d..6d952ca 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 @@ -74,9 +74,11 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i gyzjJcgj.setJcnr(JctUtil.formatStr(jcnr)); gyzjJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); } - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); - gyzjJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null) { + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + } gyzjJcgj.setRemark(remark); this.save(gyzjJcgj); } @@ -103,9 +105,11 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i gyzjJcgj.setJcnr(JctUtil.formatStr(jcnr)); gyzjJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); } - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); - gyzjJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null) { + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + } gyzjJcgj.setRemark(remark); return gyzjJcgj; } @@ -131,9 +135,11 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i gyzjJcgj.setJcmcys(jcmcys); gyzjJcgj.setJcnr(jcnr); gyzjJcgj.setJcnrEn(jcnrEn); - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); - gyzjJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null) { + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + } gyzjJcgj.setRemark(remark); return gyzjJcgj; } 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 83656b7..632b6fb 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 @@ -312,7 +312,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } 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 cf9a283..9e9df6a 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 @@ -72,9 +72,11 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl mjyJcgj.setJcnr(JctUtil.formatStr(jcnr)); mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr)); } - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); - mjyJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null){ + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + } mjyJcgj.setRemark(remark); this.save(mjyJcgj); } @@ -101,9 +103,11 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl mjyJcgj.setJcnr(JctUtil.formatStr(jcnr)); mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr)); } - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); - mjyJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null) { + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + } mjyJcgj.setRemark(remark); return mjyJcgj; } @@ -129,9 +133,11 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl mjyJcgj.setJcmcys(jcmcys); mjyJcgj.setJcnr(jcnr); mjyJcgj.setJcnrEn(jcnrEn); - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); - mjyJcgj.setQmrMcEn(qmr.getUserName()); + if(qmr!=null) { + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + } mjyJcgj.setRemark(remark); return 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 687fdc1..01980cf 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 @@ -1006,7 +1006,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("归还人2", ghr2.getNickName()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null,null); // 更新 mjyOld.setKc(leftKc.toString()); mjyOld.setZjzt(ZjztEnum.rk.getValue()); @@ -1014,6 +1014,58 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } + + /** + * 入库 ok + * + * @param form + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void rk(RkForm form) { + SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id()); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); + SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); + SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); + //验证签名人1密码 + checkPassword(qmr1, form.getQmr1mm()); + //验证签名人2密码 + checkPassword(qmr2, form.getQmr2mm()); + //验证接收人1密码 + checkPassword(jsr1, form.getJsr1mm()); + //验证接收人2密码 + checkPassword(jsr2, form.getJsr2mm()); + + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("麻精药不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.wrk.getValue())) { + throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是未入库状态，不能入库"); + } + // 台账 + mjyTzService.saveTz(mjyOld.getId(),null,null,qmr1,qmr2,null,null,jsr1,jsr2,null,"麻精药入库",form.getRkl(),mjyOld.getKcdw(),form.getRemark()); + // 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("入库位置", form.getRkwz()); + formData.put("入库条件", form.getRktj()); + formData.put("转移条件", form.getZytj()); + formData.put("入库毛重", form.getRkl() + mjyOld.getKcdw()); + formData.put("签名人1", qmr1.getNickName()); + formData.put("签名人2", qmr2.getNickName()); + formData.put("库管员1", jsr1.getNickName()); + formData.put("库管员2", jsr2.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "麻精药入库", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); + // 更新 + mjyOld.setKc(form.getRkl()); + mjyOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(mjyOld); + } + + /** * 验证密码 * diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java index 502093f..3ec861c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java @@ -43,7 +43,7 @@ public class GyzjJcnrUtil { mapJcnr.put("归还人2","todo归还人2"); mapJcnr.put("库管员1","todo库管员1"); mapJcnr.put("库管员2","todo库管员2"); - + mapJcnr.put("入库净重","todo入库净重"); //endregion //region 稽查名称 @@ -63,6 +63,7 @@ public class GyzjJcnrUtil { mapQmyy.put("同意修改库存","todo同意修改库存"); mapQmyy.put("拒绝修改库存","todo拒绝修改库存"); mapQmyy.put("归还","todo归还"); + mapQmyy.put("确认归还","todo确认归还"); mapQmyy.put("锁定发放记录","todo锁定发放记录"); mapQmyy.put("解锁发放记录","todo解锁发放记录"); mapQmyy.put("领取发放","todo领取发放"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java index e6fa8a1..73869e8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java @@ -44,6 +44,8 @@ public class MjyJcnrUtil { mapJcnr.put("归还人2","todo归还人2"); mapJcnr.put("库管员1","todo库管员1"); mapJcnr.put("库管员2","todo库管员2"); + mapJcnr.put("签名人1","todo签名人1"); + mapJcnr.put("签名人2","todo签名人2"); //endregion @@ -67,6 +69,7 @@ public class MjyJcnrUtil { mapQmyy.put("锁定发放记录","todo锁定发放记录"); mapQmyy.put("解锁发放记录","todo解锁发放记录"); mapQmyy.put("领取发放","todo领取发放"); + mapQmyy.put("麻精药入库","todo麻精药入库");