From 4a9363b9120e68929027562ad91fe722e4a4008f Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 21 Jan 2026 09:14:49 +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?=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95=E4=BD=BF=E7=94=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java | 4 ++-- .../src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) 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 6a7dae4..d230216 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 @@ -379,7 +379,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setRkldw(gyzj.getKcdw()); gyzjFfjl.setRkmz(form.getRkmz()); gyzjFfjl.setRkmzdw(gyzj.getKcdw()); - gyzjFfjl.setSyl(form.getSyl()); + gyzjFfjl.setSyl(new BigDecimal(gyzjFfjl.getCkl()).subtract(new BigDecimal(gyzjFfjl.getRkl())).toString()); gyzjFfjl.setSyldw(gyzj.getKcdw()); gyzjFfjl.setGhr1Id(ghr1.getUserId()); gyzjFfjl.setGhr1Mc(ghr1.getNickName()); @@ -404,7 +404,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("转移条件", form.getGhzytj()); formData.put("入库净重", form.getRkl() + gyzj.getKcdw()); formData.put("入库毛重", form.getRkmz() + gyzj.getKcdw()); - formData.put("使用量", form.getSyl() + gyzj.getKcdw()); +// formData.put("使用量", gyzjFfjl.getSyl() + gyzj.getKcdw()); formData.put("归还人1", ghr1.getNickName()); formData.put("归还人2", ghr2.getNickName()); formData.put("库管员1", jsr1.getNickName()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index a4e26ce..e126c73 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 @@ -1054,7 +1054,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!gyzjOld.getGhzt().equals(GhztEnum.sqgh.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是申请归还状态，不能归还"); } - BigDecimal syl = new BigDecimal(gyzjOld.getKc()).subtract(new BigDecimal(form.getRkl())); gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2); // 台账 gyzjTzService.saveTz(gyzjOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkl(), gyzjOld.getKcdw(),form.getRemark()); @@ -1066,7 +1065,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("转移条件", form.getGhzytj()); formData.put("入库净重", form.getRkl() + gyzjOld.getKcdw()); formData.put("入库毛重", form.getRkmz() + gyzjOld.getKcdw()); - formData.put("使用量", syl + gyzjOld.getKcdw()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName());