From 131b9c3cd9c37c5b4ef32f6d8c33234584468a88 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sun, 18 Jan 2026 15:32:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E7=89=A9=E8=B5=84=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=EF=BC=8C=E9=BA=BB=E7=B2=BE?= =?UTF-8?q?=E8=8D=AF=EF=BC=8C=E5=AD=98=E5=82=A8=EF=BC=8C=E5=8F=96=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/dto/gyzj/ListDto.java | 22 ++++++++++++++++++++++ .../java/com/hxhq/business/dto/mjy/ListDto.java | 22 ++++++++++++++++++++++ .../business/service/impl/GyzjServiceImpl.java | 8 +++++++- .../hxhq/business/service/impl/MjyServiceImpl.java | 9 +++++++-- .../main/resources/mapper/business/GyzjMapper.xml | 2 +- .../main/resources/mapper/business/MjyMapper.xml | 2 +- 6 files changed, 60 insertions(+), 5 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java index b52ed9f..ca7e002 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java @@ -11,6 +11,9 @@ public class ListDto { /** id */ private Long id; + /** resourceId */ + private Long resourceId; + /** 名称 */ private String mc; @@ -54,6 +57,9 @@ public class ListDto { /** 入库申请状态：1：未申请；3：申请入库*/ private Integer rksqzt; + /** 存储状态：1：取出；3：存储*/ + private Integer cczt; + /** 暂存柜 */ private String zcgMc; @@ -95,6 +101,22 @@ public class ListDto { /** 发放目的其他 */ private String mdOther; + public Long getResourceId() { + return resourceId; + } + + public void setResourceId(Long resourceId) { + this.resourceId = resourceId; + } + + public Integer getCczt() { + return cczt; + } + + public void setCczt(Integer cczt) { + this.cczt = cczt; + } + public Integer getRksqzt() { return rksqzt; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java index 8b541d7..f81f22d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/ListDto.java @@ -11,6 +11,9 @@ public class ListDto { /** id */ private Long id; + /** resourceId */ + private Long resourceId; + /** 名称 */ private String mc; @@ -51,6 +54,9 @@ public class ListDto { /** 归还状态：1：未申请；3：申请归还 */ private Integer ghzt; + /** 存储状态：1：取出；3：存储*/ + private Integer cczt; + /** 暂存柜 */ private String zcgMc; @@ -100,6 +106,22 @@ public class ListDto { /** 试验归还状态：1：未归还；10：已归还*/ private Integer syghzt; + public Integer getCczt() { + return cczt; + } + + public void setCczt(Integer cczt) { + this.cczt = cczt; + } + + public Long getResourceId() { + return resourceId; + } + + public void setResourceId(Long resourceId) { + this.resourceId = resourceId; + } + public Integer getSyghzt() { return syghzt; } 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 5c24eed..bbbba0f 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 @@ -1206,10 +1206,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁"); } + gyzjOld.setCcwz(form.getCcwz()); + gyzjOld.setCctj(form.getCctj()); + gyzjOld.setCczt(CcztEnum.Cc.getValue()); gyzjOld.setCczt(CcztEnum.Cc.getValue()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + Map formData = new LinkedHashMap<>(); + formData.put("存储位置", form.getCcwz()); + formData.put("存储条件", form.getCctj()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); } 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 b8b5448..e9a65aa 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 @@ -1100,9 +1100,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能解锁"); } mjyOld.setCczt(CcztEnum.Cc.getValue()); + mjyOld.setCcwz(form.getCcwz()); + mjyOld.setCctj(form.getCctj()); this.updateById(mjyOld); - //稽查轨迹 - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + // 稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("存储位置", form.getCcwz()); + formData.put("存储条件", form.getCctj()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml index 4c35f53..12e0d88 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml @@ -28,7 +28,7 @@