From a80d8d725ffbd6ec8074f8f985603ad5c64129bb Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 26 Dec 2025 18:21:57 +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][=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82]?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/GyzjController.java | 1 + .../business/controller/GyzjFfjlController.java | 2 +- .../java/com/hxhq/business/form/gyzj/BjForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/CzrqForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/CzyjForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/FfForm.java | 2 +- .../com/hxhq/business/form/gyzj/FfjlJqForm.java | 4 + .../java/com/hxhq/business/form/gyzj/GdForm.java | 4 +- .../java/com/hxhq/business/form/gyzj/GhForm.java | 21 +- .../java/com/hxhq/business/form/gyzj/JdForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/JsForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/JyForm.java | 2 +- .../com/hxhq/business/form/gyzj/PlczrqForm.java | 4 +- .../com/hxhq/business/form/gyzj/PlczrqItem.java | 2 +- .../com/hxhq/business/form/gyzj/PlczyjForm.java | 4 +- .../com/hxhq/business/form/gyzj/PlczyjItem.java | 2 +- .../java/com/hxhq/business/form/gyzj/PlffForm.java | 4 +- .../java/com/hxhq/business/form/gyzj/PlffItem.java | 2 +- .../java/com/hxhq/business/form/gyzj/SdForm.java | 4 +- .../com/hxhq/business/form/gyzj/SearchForm.java | 4 + .../java/com/hxhq/business/form/gyzj/ShbjForm.java | 12 +- .../com/hxhq/business/form/gyzj/ShxgkcForm.java | 8 +- .../java/com/hxhq/business/form/gyzj/XgkcForm.java | 2 +- .../java/com/hxhq/business/form/gyzj/YsffForm.java | 4 +- .../java/com/hxhq/business/form/mjy/ShbjForm.java | 6 +- .../com/hxhq/business/form/mjy/ShxgkcForm.java | 6 +- .../hxhq/business/service/IGyzjFfjlService.java | 28 +- .../business/service/impl/GyzjFfjlServiceImpl.java | 113 ++++++- .../business/service/impl/GyzjServiceImpl.java | 334 ++++----------------- .../hxhq/business/service/impl/MjyServiceImpl.java | 10 +- 30 files changed, 256 insertions(+), 339 deletions(-) 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 f3549a1..737699c 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 @@ -302,6 +302,7 @@ public class GyzjController extends BaseController public AjaxResult gh(@RequestBody GhForm form) { form.setQmrId(SecurityUtils.getUserId()); + form.setJsr1Id(SecurityUtils.getUserId()); gyzjService.gh(form); return AjaxResult.success("操作成功"); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java index a10e4f9..67cb031 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java @@ -17,7 +17,7 @@ import java.util.List; /** - * 麻精药发放记录Controller + * 给药制剂发放记录Controller * * @author hxhq * @date 2025-12-15 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java index 33b6df6..47818ff 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java @@ -10,7 +10,7 @@ import java.util.Date; */ public class BjForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 名称编辑 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java index 0f4ebec..64941d6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzrqForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class CzrqForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 处置原因 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java index ac9a8ee..486283e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CzyjForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class CzyjForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 处置原因 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java index 34b7ef6..6e0226a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class FfForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java index 8c3a022..45b8063 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlJqForm.java @@ -1,5 +1,9 @@ package com.hxhq.business.form.gyzj; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + /** * @author 15881 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java index 0c1335d..8a8a00a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GdForm.java @@ -5,10 +5,10 @@ package com.hxhq.business.form.gyzj; */ public class GdForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 备注 */ 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 0e2b2ec..d89c99f 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 @@ -23,6 +23,7 @@ public class GhForm { /** 入库毛重单位 */ private String rkmzdw; + /** 入库量 */ private String rkl; @@ -68,16 +69,12 @@ public class GhForm { /** 备注 */ private String remark; - /** 签名人id */ private Long qmrId; /** 签名人密码 */ private String qmrmm; - /** 签名人意义 */ - private String qmyy; - public String getRkmz() { return rkmz; } @@ -94,12 +91,12 @@ public class GhForm { this.rkmzdw = rkmzdw; } - public String getQmyy() { - return qmyy; + public String getQmrmm() { + return qmrmm; } - public void setQmyy(String qmyy) { - this.qmyy = qmyy; + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; } public Long getQmrId() { @@ -110,14 +107,6 @@ public class GhForm { this.qmrId = qmrId; } - public String getQmrmm() { - return qmrmm; - } - - public void setQmrmm(String qmrmm) { - this.qmrmm = qmrmm; - } - public Long getId() { return id; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java index 4929773..2a0fd80 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JdForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class JdForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java index 0f47cfb..d538c3a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JsForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class JsForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java index bf6966d..c8798d1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/JyForm.java @@ -9,7 +9,7 @@ import java.util.Date; */ public class JyForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java index 4515aaf..d354d60 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqForm.java @@ -7,10 +7,10 @@ import java.util.List; */ public class PlczrqForm { - /** 麻精药列表 */ + /** 给药制剂列表 */ private List list; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 处置人id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java index f39e98b..038d927 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczrqItem.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class PlczrqItem { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 处置原因 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java index 47f4ce2..d6852bf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjForm.java @@ -7,10 +7,10 @@ import java.util.List; */ public class PlczyjForm { - /** 麻精药列表 */ + /** 给药制剂列表 */ private List list; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 处置人id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java index 28058fb..f8109fa 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlczyjItem.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class PlczyjItem { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 处置原因 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java index f64b493..ee91ff6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffForm.java @@ -7,10 +7,10 @@ import java.util.List; */ public class PlffForm { - /** 麻精药列表 */ + /** 给药制剂列表 */ private List list; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 领取人1Id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java index 9b0da50..d167a35 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class PlffItem { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java index 7f48f96..b89eab6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SdForm.java @@ -5,10 +5,10 @@ package com.hxhq.business.form.gyzj; */ public class SdForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 备注 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java index e09015b..f799f8b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java @@ -1,5 +1,9 @@ package com.hxhq.business.form.gyzj; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + /** * @author 15881 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java index 0a705c0..3414bd5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShbjForm.java @@ -1,11 +1,15 @@ package com.hxhq.business.form.gyzj; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + /** * @author 15881 */ public class ShbjForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 备注 */ @@ -18,7 +22,7 @@ public class ShbjForm { private String qmrmm; /** 签名意义 */ - private String qmyy; + private Integer qmyy; public Long getId() { return id; @@ -52,11 +56,11 @@ public class ShbjForm { this.qmrmm = qmrmm; } - public String getQmyy() { + public Integer getQmyy() { return qmyy; } - public void setQmyy(String qmyy) { + public void setQmyy(Integer qmyy) { this.qmyy = qmyy; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java index 7115194..8b7e811 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/ShxgkcForm.java @@ -5,7 +5,7 @@ package com.hxhq.business.form.gyzj; */ public class ShxgkcForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 库存编辑 */ @@ -24,13 +24,13 @@ public class ShxgkcForm { private String qmrmm; /** 签名意义 */ - private String qmyy; + private Integer qmyy; - public String getQmyy() { + public Integer getQmyy() { return qmyy; } - public void setQmyy(String qmyy) { + public void setQmyy(Integer qmyy) { this.qmyy = qmyy; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java index 7464a00..c47fdfa 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/XgkcForm.java @@ -7,7 +7,7 @@ import com.hxhq.common.core.annotation.Excel; */ public class XgkcForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; /** 库存 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java index 026ac0d..e60e0e3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/YsffForm.java @@ -5,10 +5,10 @@ package com.hxhq.business.form.gyzj; */ public class YsffForm { - /** 麻精药id */ + /** 给药制剂id */ private Long id; - /** 麻精药ids */ + /** 给药制剂ids */ private Long[] ids; /** 暂存柜id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java index cf25a17..d172100 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShbjForm.java @@ -22,7 +22,7 @@ public class ShbjForm { private String qmrmm; /** 签名意义 */ - private String qmyy; + private Integer qmyy; public Long getId() { return id; @@ -56,11 +56,11 @@ public class ShbjForm { this.qmrmm = qmrmm; } - public String getQmyy() { + public Integer getQmyy() { return qmyy; } - public void setQmyy(String qmyy) { + public void setQmyy(Integer qmyy) { this.qmyy = qmyy; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java index 847ce21..2dbeb1e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ShxgkcForm.java @@ -24,13 +24,13 @@ public class ShxgkcForm { private String qmrmm; /** 签名意义 */ - private String qmyy; + private Integer qmyy; - public String getQmyy() { + public Integer getQmyy() { return qmyy; } - public void setQmyy(String qmyy) { + public void setQmyy(Integer qmyy) { this.qmyy = qmyy; } 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 781eaec..f9bde1c 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 @@ -1,15 +1,19 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; + +import com.hxhq.business.domain.Gyzj; import com.hxhq.business.domain.GyzjFfjl; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.gyzj.FfjlDetailDto; import com.hxhq.business.dto.gyzj.FfjlListDto; import com.hxhq.business.form.gyzj.*; +import com.hxhq.system.api.domain.SysUser; import org.springframework.web.bind.annotation.RequestBody; /** - * 麻精药-发放记录Service接口 + * 给药制剂-发放记录Service接口 * * @author hxhq * @date 2025-12-21 @@ -19,14 +23,15 @@ public interface IGyzjFfjlService extends IService /** * 详情 * - * @param mjyId + * @param gyzjId * @return */ - public GyzjFfjl queryLastInfoByGyzjId(Long mjyId); + public GyzjFfjl queryLastInfoByGyzjId(Long gyzjId); + /** * 列表 * - * @param form 麻精药-发放记录 + * @param form 给药制剂-发放记录 * @return */ public List queryList(FfjlSearchForm form); @@ -97,4 +102,19 @@ public interface IGyzjFfjlService extends IService * @param form */ public void jq(@RequestBody FfjlJqForm form); + + + /** + * 归还 + * + * @param form + */ + public void gh(@RequestBody GhForm form, Gyzj gyzj, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2); + + /** + * 发放 + * + */ + public void ff(String ckmz,String ckmzdw,String zytj,String remark,String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time); + } 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 e31d30f..52571cc 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 @@ -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.Gyzj; import com.hxhq.business.domain.GyzjFfjlJcgj; import com.hxhq.business.dto.gyzj.FfjlDetailDto; import com.hxhq.business.dto.gyzj.FfjlListDto; @@ -43,17 +41,16 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i @Autowired private IGyzjFfjlJcgjService gyzjFfjlJcgjService; - /** * 详情 * - * @param mjyId + * @param gyzjId * @return */ @Override - public GyzjFfjl queryLastInfoByGyzjId(Long mjyId){ + public GyzjFfjl queryLastInfoByGyzjId(Long gyzjId){ QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("dyzj_id",mjyId); + queryWrapper.eq("gyzj_id",gyzjId); queryWrapper.orderByDesc("id"); return this.getOne(queryWrapper,false); } @@ -406,4 +403,104 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i } + /** + * 归还 + * + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void gh(@RequestBody GhForm form, Gyzj gyzj,SysUser ghr1,SysUser ghr2,SysUser jsr1,SysUser jsr2){ + GyzjFfjl gyzjFfjl=this.queryLastInfoByGyzjId(gyzj.getId()); + if (gyzjFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + gyzjFfjl.setFfzytj(form.getGhzytj()); + gyzjFfjl.setRkwz(form.getRkwz()); + gyzjFfjl.setRktj(form.getRktj()); + gyzjFfjl.setGhzytj(form.getGhzytj()); + gyzjFfjl.setRkmz(form.getRkmz()); + gyzjFfjl.setRkmzdw(gyzj.getKcdw()); + + gyzjFfjl.setJsl(form.getJsl()); + gyzjFfjl.setJsldw(gyzj.getKcdw()); + gyzjFfjl.setSyl(form.getSyl()); + gyzjFfjl.setSyldw(gyzj.getKcdw()); + gyzjFfjl.setGhr1Id(ghr1.getUserId()); + gyzjFfjl.setGhr1Mc(ghr1.getNickName()); + gyzjFfjl.setGhrq(new Date()); + gyzjFfjl.setGhr2Id(ghr2.getUserId()); + gyzjFfjl.setGhr2Mc(ghr2.getNickName()); + gyzjFfjl.setJsr1Id(jsr1.getUserId()); + gyzjFfjl.setJsr1Mc(jsr1.getNickName()); + gyzjFfjl.setJsr2Id(jsr2.getUserId()); + gyzjFfjl.setJsr2Mc(jsr2.getNickName()); + gyzjFfjl.setGhbz(form.getRemark()); + this.updateById(gyzjFfjl); + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("入库位置", form.getRkwz()); + formData.put("入库条件", form.getRktj()); + formData.put("转移条件", form.getGhzytj()); + formData.put("入库毛重", form.getRkmz()+gyzj.getKcdw()); + formData.put("减少量", form.getJsl()+gyzj.getKcdw()); + formData.put("使用量", form.getSyl()+gyzj.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("签名意义", "归还"); + gyzjFfjlJcgjService.saveJcgj(gyzj.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, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time){ + + GyzjFfjl gyzjFfjl = new GyzjFfjl(); + gyzjFfjl.setGyzjId(gyzj.getId()); + gyzjFfjl.setMc(gyzj.getMc()); + gyzjFfjl.setBh(gyzj.getBh()); + gyzjFfjl.setNd(gyzj.getNd()); + gyzjFfjl.setNddw(gyzj.getNddw()); + gyzjFfjl.setCctj(gyzj.getCctj()); + gyzjFfjl.setCcwz(gyzj.getCcwz()); + gyzjFfjl.setSxrq(gyzj.getSxrq()); + gyzjFfjl.setCctj(gyzj.getCctj()); + gyzjFfjl.setCkl(gyzj.getKc()); + gyzjFfjl.setCkldw(gyzj.getKcdw()); + gyzjFfjl.setCkmz(ckmz); + gyzjFfjl.setCkmzdw(ckmzdw); + gyzjFfjl.setLqr1Id(lqr1.getUserId()); + gyzjFfjl.setLqr2Id(lqr2.getUserId()); + gyzjFfjl.setFfr1Id(ffr1.getUserId()); + gyzjFfjl.setFfr2Id(ffr2.getUserId()); + gyzjFfjl.setLqr1Mc(lqr1.getNickName()); + gyzjFfjl.setLqr2Mc(lqr2.getNickName()); + gyzjFfjl.setFfr1Mc(ffr1.getNickName()); + gyzjFfjl.setFfr2Mc(ffr2.getNickName()); + gyzjFfjl.setFfzytj(zytj); + gyzjFfjl.setFfrq(time); + gyzjFfjl.setFfbz(remark); + gyzjFfjl.setMdIds(mdIds); + this.save(gyzjFfjl); + + //region 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("出库量", gyzj.getKc()+ gyzj.getKcdw()); + formData.put("转移条件", zytj); + formData.put("出库毛重", ckmz + gyzj.getKcdw()); + formData.put("目的", mdIds); + formData.put("备注", remark); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.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/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index bf8724e..b985417 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 @@ -14,6 +14,7 @@ import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.common.core.text.Convert; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -123,7 +124,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请解档"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -161,7 +162,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请借阅"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -240,7 +241,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -279,7 +280,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定给药制剂"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); @@ -319,7 +320,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "锁定给药制剂"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -351,7 +352,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("签名意义", "解锁给药制剂"); - formData.put("签名人", qmr.getNickName()); + formData.put("签名人", qmr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); } @@ -364,24 +365,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @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不正确"); - } +// SysUser fhr = sysUserService.selectUserById(form.getFhrId()); +// SysUser jdr = sysUserService.selectUserById(form.getJdrId()); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -391,7 +376,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } List gyzjJcgjList = new ArrayList<>(); List gyzjTzList = new ArrayList<>(); - for (Gyzj gyzj : gyzjList) { List gyzjPlffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(gyzj.getId())) @@ -415,12 +399,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (kc.compareTo(czl) < 0) { throw new SecurityException("给药制剂【" + gyzj.getMc() + "】处置量大于库存量"); } - //更新库存 gyzj.setKc(kc.subtract(czl).toString()); - - - //endregion - //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzj.getId()); @@ -430,17 +409,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); - formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); + formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw()); + formData.put("处置人", clr.getNickName()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); //endregion - //region 台账 GyzjTz gyzjTz = new GyzjTz(); gyzjTz.setGyzjId(gyzj.getId()); @@ -452,7 +428,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjTz.setRemark(gyzjPlffItemFilter.get(0).getCzyy()); gyzjTzList.add(gyzjTz); //endregion - } else { throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } @@ -475,17 +450,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new SecurityException("参数id不正确"); } 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 Gyzj gyzjOld = this.getById(form.getId()); @@ -521,10 +485,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); - formData.put("处置量", form.getCzl() + gyzjOld.getKcdw()); - formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); + formData.put("处置量", form.getCzl() + gyzjOld.getKcdw()); + formData.put("处置人", clr.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion @@ -590,9 +552,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", gyzjPlffItemFilter.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()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); @@ -659,9 +621,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion @@ -685,24 +647,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @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,8 +683,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); @@ -777,79 +724,27 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new SecurityException("给药制剂【" + gyzjOld.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 发放记录 - - GyzjFfjl gyzjFfjl = new GyzjFfjl(); - gyzjFfjl.setGyzjId(gyzjOld.getId()); - gyzjFfjl.setMc(gyzjOld.getMc()); - gyzjFfjl.setBh(gyzjOld.getBh()); - gyzjFfjl.setNd(gyzjOld.getNd()); - gyzjFfjl.setNddw(gyzjOld.getNddw()); - gyzjFfjl.setCctj(gyzjOld.getCctj()); - gyzjFfjl.setCcwz(gyzjOld.getCcwz()); - gyzjFfjl.setSxrq(gyzjOld.getSxrq()); - gyzjFfjl.setCctj(gyzjOld.getCctj()); - gyzjFfjl.setCkl(gyzjOld.getKc()); - - gyzjFfjl.setCkldw(gyzjOld.getKcdw()); - gyzjFfjl.setCkmz(form.getCkmz()); - gyzjFfjl.setCkmzdw(form.getCkmzdw()); - gyzjFfjl.setLqr1Id(lqr1.getUserId()); - gyzjFfjl.setLqr2Id(lqr2.getUserId()); - gyzjFfjl.setFfr1Id(ffr1.getUserId()); - gyzjFfjl.setFfr2Id(ffr2.getUserId()); - gyzjFfjl.setLqr1Mc(lqr1.getNickName()); - gyzjFfjl.setLqr2Mc(lqr2.getNickName()); - gyzjFfjl.setFfr1Mc(ffr1.getNickName()); - gyzjFfjl.setFfr2Mc(ffr2.getNickName()); - gyzjFfjl.setFfzytj(form.getZytj()); - gyzjFfjl.setFfrq(now); - gyzjFfjl.setFfbz(form.getRemark()); - gyzjFfjl.setMdIds(form.getMdIds()); - - - gyzjFfjlService.save(gyzjFfjl); - - //endregion - + gyzjFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),gyzjOld,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 Map formData = new LinkedHashMap<>(); - formData.put("出库量", gyzjOld.getKc()); + formData.put("出库量", gyzjOld.getKc()+ gyzjOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw()); - formData.put("目的", form.getMdIds()); - formData.put("备注", form.getRemark()); - + formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw()); + formData.put("目的", form.getMdIds()); + formData.put("备注", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //endregion - //region 台账 gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); //endregion - - //region 更新发放信息 gyzjOld.setCkl(gyzjOld.getKc()); gyzjOld.setCkldw(gyzjOld.getKcdw()); @@ -870,9 +765,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setMdIds(form.getMdIds()); gyzjOld.setZjzt(ZjztEnum.yff.getValue()); //endregion - this.updateById(gyzjOld); - } @@ -885,34 +778,15 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @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 gyzjList = this.list(queryWrapper); List gyzjJcgjList = new ArrayList<>(); - List gyzjFfjlList = new ArrayList<>(); List gyzjTzList = new ArrayList<>(); if (gyzjList.size() <= 0) { throw new SecurityException("给药制剂不是入库状态，不能发放"); @@ -928,59 +802,24 @@ public class GyzjServiceImpl extends ServiceImpl implements IG .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { - - //region 发放记录 - GyzjFfjl gyzjFfjl = new GyzjFfjl(); - gyzjFfjl.setGyzjId(gyzj.getId()); - gyzjFfjl.setMc(gyzj.getMc()); - gyzjFfjl.setBh(gyzj.getBh()); - gyzjFfjl.setNd(gyzj.getNd()); - gyzjFfjl.setNddw(gyzj.getNddw()); - gyzjFfjl.setCctj(gyzj.getCctj()); - gyzjFfjl.setCcwz(gyzj.getCcwz()); - gyzjFfjl.setSxrq(gyzj.getSxrq()); - gyzjFfjl.setCctj(gyzj.getCctj()); - gyzjFfjl.setCkl(gyzj.getKc()); - - gyzjFfjl.setCkldw(gyzj.getKcdw()); - gyzjFfjl.setCkmz(plffItemFilter.get(0).getCkmz()); - gyzjFfjl.setCkmzdw(plffItemFilter.get(0).getCkmzdw()); - gyzjFfjl.setLqr1Id(lqr1.getUserId()); - gyzjFfjl.setLqr2Id(lqr2.getUserId()); - gyzjFfjl.setFfr1Id(ffr1.getUserId()); - gyzjFfjl.setFfr2Id(ffr2.getUserId()); - gyzjFfjl.setLqr1Mc(lqr1.getNickName()); - gyzjFfjl.setLqr2Mc(lqr2.getNickName()); - gyzjFfjl.setFfr1Mc(ffr1.getNickName()); - gyzjFfjl.setFfr2Mc(ffr2.getNickName()); - gyzjFfjl.setFfzytj(plffItemFilter.get(0).getZytj()); - gyzjFfjl.setFfrq(now); - gyzjFfjl.setFfbz(plffItemFilter.get(0).getRemark()); - gyzjFfjl.setMdIds(plffItemFilter.get(0).getMdIds()); - - gyzjFfjlList.add(gyzjFfjl); - //endregion - + gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(),plffItemFilter.get(0).getCkmzdw(),plffItemFilter.get(0).getZytj(),plffItemFilter.get(0).getRemark(),plffItemFilter.get(0).getMdIds(),gyzj,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzj.getId()); gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gyzjJcgj.setJcmc("领取发放"); gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("出库量", gyzj.getKc()); + formData.put("出库量", gyzj.getKc()+ gyzj.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); - formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw()); - formData.put("目的", plffItemFilter.get(0).getMdIds()); - formData.put("备注", plffItemFilter.get(0).getRemark()); - + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw()); + formData.put("目的", plffItemFilter.get(0).getMdIds()); + formData.put("备注", plffItemFilter.get(0).getRemark()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(SecurityUtils.getUserId()); gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName()); gyzjJcgjList.add(gyzjJcgj); //endregion - //region 台账 GyzjTz gyzjTz = new GyzjTz(); gyzjTz.setGyzjId(gyzj.getId()); @@ -992,7 +831,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjTz.setRemark(plffItemFilter.get(0).getRemark()); gyzjTzList.add(gyzjTz); //endregion - //region 更新发放信息 gyzj.setCkl(gyzj.getKc()); gyzj.setCkldw(gyzj.getKcdw()); @@ -1013,13 +851,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setMdIds(plffItemFilter.get(0).getMdIds()); gyzj.setZjzt(ZjztEnum.yff.getValue()); //endregion - } else { throw new SecurityException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } gyzjJcgjService.saveBatch(gyzjJcgjList); - gyzjFfjlService.saveBatch(gyzjFfjlList); gyzjTzService.saveBatch(gyzjTzList); this.saveOrUpdateBatch(gyzjList); } @@ -1106,13 +942,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzjOld.getId()); gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc(form.getQmyy()); + gyzjJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText()); if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); } else { gyzjJcgj.setJcmcys(JcmcysEnum.red.getValue()); } - gyzjJcgj.setJcnr("申请备注：" + gyzjOld.getBjbz() + "；审核备注：" + form.getRemark()); + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", gyzjOld.getBjbz()); + formData.put("审核备注", form.getRemark()); + gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); gyzjJcgj.setQmrId(qmr.getUserId()); gyzjJcgj.setQmrMc(qmr.getNickName()); gyzjJcgjService.save(gyzjJcgj); @@ -1225,7 +1064,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzjOld.getId()); gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc(form.getQmyy()); + gyzjJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); } else { @@ -1274,8 +1113,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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不正确"); } @@ -1286,83 +1125,38 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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 - } - + gyzjFfjlService.gh(form,gyzjOld,ghr1,ghr2,jsr1,jsr2); + //region 台账 + gyzjTzService.saveTz(gyzjOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(), + "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null, + "归还", form.getRkmz(), gyzjOld.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()+gyzjOld.getKcdw()); + formData.put("减少量", form.getJsl()+gyzjOld.getKcdw()); + 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 + gyzjOld.setKc(leftKc.toString()); + gyzjOld.setZjzt(ZjztEnum.rk.getValue()); + this.updateById(gyzjOld); } + } 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 ff81ee8..ba6cf97 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 @@ -14,6 +14,7 @@ import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.common.core.text.Convert; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -957,13 +958,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc(form.getQmyy()); + mjyJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText()); if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); } else { mjyJcgj.setJcmcys(JcmcysEnum.red.getValue()); } - mjyJcgj.setJcnr("申请备注：" + mjyOld.getBjbz() + "；审核备注：" + form.getRemark()); + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", mjyOld.getBjbz()); + formData.put("审核备注", form.getRemark()); + mjyJcgj.setJcnr(JctUtil.formatStr(formData)); mjyJcgj.setQmrId(qmr.getUserId()); mjyJcgj.setQmrMc(qmr.getNickName()); mjyJcgjService.save(mjyJcgj); @@ -1076,7 +1080,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyOld.getId()); mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc(form.getQmyy()); + mjyJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); } else {