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 01cdb51..1827268 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 @@ -428,12 +428,16 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setGhr1Id(ghr1.getUserId()); gyzjFfjl.setGhr1Mc(ghr1.getNickName()); gyzjFfjl.setGhrq(new Date()); - gyzjFfjl.setGhr2Id(ghr2.getUserId()); - gyzjFfjl.setGhr2Mc(ghr2.getNickName()); + if(ghr2!=null){ + gyzjFfjl.setGhr2Id(ghr2.getUserId()); + gyzjFfjl.setGhr2Mc(ghr2.getNickName()); + } + if(jsr2!=null){ + gyzjFfjl.setJsr2Id(jsr2.getUserId()); + gyzjFfjl.setJsr2Mc(jsr2.getNickName()); + } gyzjFfjl.setJsr1Id(jsr1.getUserId()); gyzjFfjl.setJsr1Mc(jsr1.getNickName()); - gyzjFfjl.setJsr2Id(jsr2.getUserId()); - gyzjFfjl.setJsr2Mc(jsr2.getNickName()); gyzjFfjl.setGhbz(form.getRemark()); this.updateById(gyzjFfjl); @@ -481,13 +485,17 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setBasicCkl(basicCkl); gyzjFfjl.setLqr1Id(lqr1.getUserId()); - gyzjFfjl.setLqr2Id(lqr2.getUserId()); + if(lqr2!=null){ + gyzjFfjl.setLqr2Id(lqr2.getUserId()); + gyzjFfjl.setLqr2Mc(lqr2.getNickName()); + } + if(ffr2!=null){ + gyzjFfjl.setFfr2Id(ffr2.getUserId()); + gyzjFfjl.setFfr2Mc(ffr2.getNickName()); + } 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(time); gyzjFfjl.setFfbz(form.getRemark()); 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 ab25b42..0e71134 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 @@ -815,17 +815,21 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) public void ff(FfForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser lqr2 = form.getLqr2Id()!=null? sysUserService.selectUserById(form.getLqr2Id()):null; SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + SysUser ffr2 = form.getFfr2Id()!=null?sysUserService.selectUserById(form.getFfr2Id()):null; //验证领取人1密码 checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); + if(lqr2!=null){ + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); + } //验证发放人1密码 checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); + if(ffr2!=null){ + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); + } if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -846,12 +850,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库毛重", form.getCkmz() + gyzjOld.getCkmzdw()); + formData.put("出库毛重", form.getCkmz() + form.getCkmzdw()); formData.put("目的", form.getMdMcs()); formData.put("领取人", lqr1.getNickName()); - formData.put("领取人2", lqr2.getNickName()); + if(lqr2!=null){ + formData.put("领取人2", lqr2.getNickName()); + } formData.put("发放人", ffr1.getNickName()); - formData.put("发放人2", ffr2.getNickName()); + if(ffr2!=null){ + formData.put("发放人2", ffr2.getNickName()); + } gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark()); //台账 gyzjTzService.saveTz(gyzjOld.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); @@ -879,17 +887,22 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) public void plff(PlffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser lqr2 = form.getLqr2Id()!=null? sysUserService.selectUserById(form.getLqr2Id()):null; SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + SysUser ffr2 = form.getFfr2Id()!=null?sysUserService.selectUserById(form.getFfr2Id()):null; //验证领取人1密码 checkPassword(lqr1, form.getLqr1mm(), true,"领取人1"); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); + if(lqr2!=null){ + checkPassword(lqr2, form.getLqr2mm(), true,"领取人2"); + } //验证发放人1密码 checkPassword(ffr1, form.getFfr1mm(), true,"发放人1"); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); + if(ffr2!=null){ + checkPassword(ffr2, form.getFfr2mm(), true,"发放人2"); + } + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -916,12 +929,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); - formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getCkmzdw()); + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + plffItemFilter.get(0).getCkmzdw()); formData.put("目的", plffItemFilter.get(0).getMdMcs()); formData.put("领取人", lqr1.getNickName()); - formData.put("领取人2", lqr2.getNickName()); + if(lqr2!=null){ + formData.put("领取人2", lqr2.getNickName()); + } formData.put("发放人", ffr1.getNickName()); - formData.put("发放人2", ffr2.getNickName()); + if(ffr2!=null){ + formData.put("发放人2", ffr2.getNickName()); + } gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark())); //台账 gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzj.getKc(), gyzj.getKcdw(), plffItemFilter.get(0).getRemark())); @@ -1159,11 +1176,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) public void sqgh(GhForm form) { SysUser ghr1 = SecurityUtils.getLoginUser().getSysUser(); - SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + SysUser ghr2 = form.getGhr2Id()!=null?sysUserService.selectUserById(form.getGhr2Id()):null; //验证归还人1密码 checkPassword(ghr1, form.getGhr1mm(), true,"归还人1"); //验证归还人2密码 - checkPassword(ghr2, form.getGhr2mm(), true,"归还人2"); + if(ghr2!=null){ + checkPassword(ghr2, form.getGhr2mm(), true,"归还人2"); + } if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1187,7 +1206,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); formData.put("归还人1", SecurityUtils.getNickName()); - formData.put("归还人2", ghr2.getNickName()); + if(ghr2!=null){ + formData.put("归还人2", ghr2.getNickName()); + } gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, ghr1, form.getRemark()); //endregion @@ -1249,7 +1270,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); formData.put("入库净重", form.getRkl() + gyzjOld.getKcdw()); - formData.put("入库毛重", form.getRkmz() + gyzjOld.getKcdw()); + formData.put("入库毛重", form.getRkmz() + form.getRkmzdw()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName()); 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 18dc6fc..93ce9ef 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 @@ -718,7 +718,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("出库量", mjyOld.getKc() + mjyOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("出库毛重", form.getCkmz() + mjyOld.getCkmzdw()); + formData.put("出库毛重", form.getCkmz() + form.getCkmzdw()); formData.put("目的", form.getMdMcs()); formData.put("领取人", lqr1.getNickName()); formData.put("领取人2", lqr2.getNickName()); @@ -797,7 +797,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("出库量", mjy.getKc() + mjy.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); - formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getCkmzdw()); + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + plffItemFilter.get(0).getCkmzdw()); formData.put("目的", plffItemFilter.get(0).getMdMcs()); formData.put("领取人", lqr1.getNickName()); formData.put("领取人2", lqr2.getNickName()); @@ -1073,13 +1073,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2); // 台账 - mjyTzService.saveTz(mjyOld.getId(), null, null, ghr1, ghr2, null, null, jsr1, jsr2, null, "归还", form.getRkmz(), mjyOld.getKcdw(), form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), null, null, ghr1, ghr2, null, null, jsr1, jsr2, null, "归还", form.getRkmz(), form.getRkmzdw(), form.getRemark()); // 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); - formData.put("入库毛重", form.getRkmz() + mjyOld.getKcdw()); + formData.put("入库毛重", form.getRkmz() + form.getRkmzdw()); formData.put("减少量", form.getJsl() + mjyOld.getKcdw()); formData.put("使用量", form.getSyl() + mjyOld.getKcdw()); formData.put("归还人1", ghr1.getNickName()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java index c7b45f4..e8d001c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java @@ -45,6 +45,7 @@ public class GyzjJcnrUtil { mapLang.put("出库量","Out Amount"); mapLang.put("转移条件","Transfer Condition"); mapLang.put("出库毛重","Check-out Gross Weight"); + mapLang.put("出库净重","Check-out Net Weight"); mapLang.put("入库毛重","Check-in Gross Weight"); mapLang.put("使用量","Usage Amount"); mapLang.put("归还人1","Returner 1"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java index 04ed832..9771daf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java @@ -24,6 +24,7 @@ public class MjyJcnrUtil { mapLang.put("已锁定","Locked"); mapLang.put("待归档","Pending Archiving"); mapLang.put("归档","Archived"); + mapLang.put("出库净重","Check-out Net Weight"); mapLang.put("待解档","Pending De-archiving"); mapLang.put("借阅开始时间","Checkout Start Date"); mapLang.put("借阅结束时间","Checkout End Date");