Browse Source

fix:[资源库管理]给药制剂,麻精药,发放记录

master
15881625488@163.com 3 months ago
parent
commit
791db18506
3 changed files with 19 additions and 2 deletions
  1. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java
  2. +9
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
  3. +9
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java View File

@ -25,7 +25,7 @@ public class GyzjFfjl extends MpBaseEntity
private Integer jyzt; private Integer jyzt;
/** 给药制剂id */ /** 给药制剂id */
private Long gyzjId;
private Long gyzjId;
/** 名称 */ /** 名称 */
private String mc; private String mc;

+ 9
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java View File

@ -593,6 +593,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
if (gyzjList.size() <= 0) { if (gyzjList.size() <= 0) {
throw new ServiceException("药剂已被发放,请不要重复发放"); throw new ServiceException("药剂已被发放,请不要重复发放");
} }
QueryWrapper<GyzjFfjl> gyzjFfjlQueryWrapper = Wrappers.query();
gyzjFfjlQueryWrapper.in("gyzj_id", form.getIds());
List<GyzjFfjl> gyzjFfjlList = gyzjFfjlService.list(gyzjFfjlQueryWrapper);
for (GyzjFfjl gyzjFfjl : gyzjFfjlList) {
gyzjFfjl.setZcgId(zcg.getId());
}
String glyj = ""; String glyj = "";
for (Gyzj gyzj : gyzjList) { for (Gyzj gyzj : gyzjList) {
//更新暂存柜id //更新暂存柜id
@ -623,7 +629,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
zcgService.updateById(zcg); zcgService.updateById(zcg);
this.updateBatchById(gyzjList); this.updateBatchById(gyzjList);
gyzjJcgjService.saveBatch(gyzjJcgjList); gyzjJcgjService.saveBatch(gyzjJcgjList);
if(gyzjFfjlList.size()>0){
gyzjFfjlService.updateBatchById(gyzjFfjlList);
}
} }

+ 9
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java View File

@ -594,6 +594,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
if (mjyList.size() <= 0) { if (mjyList.size() <= 0) {
throw new ServiceException("药剂已被发放,请不要重复发放"); throw new ServiceException("药剂已被发放,请不要重复发放");
} }
QueryWrapper<MjyFfjl> mjyFfjlQueryWrapper = Wrappers.query();
mjyFfjlQueryWrapper.in("mjy_id", form.getIds());
List<MjyFfjl> mjyFfjlList = mjyFfjlService.list(mjyFfjlQueryWrapper);
for (MjyFfjl mjyFfjl : mjyFfjlList) {
mjyFfjl.setZcgId(zcg.getId());
}
String glyj = ""; String glyj = "";
for (Mjy mjy : mjyList) { for (Mjy mjy : mjyList) {
//更新暂存柜id //更新暂存柜id
@ -624,6 +630,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
zcgService.updateById(zcg); zcgService.updateById(zcg);
this.updateBatchById(mjyList); this.updateBatchById(mjyList);
mjyJcgjService.saveBatch(mjyJcgjList); mjyJcgjService.saveBatch(mjyJcgjList);
if(mjyFfjlList.size()>0){
mjyFfjlService.updateBatchById(mjyFfjlList);
}
} }

Loading…
Cancel
Save