fix:[资源库管理][供试品管理]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java

@@ -238,7 +238,7 @@ public class BacteriaServiceImpl extends ServiceImpl i
             String kc = UnitTools.subTj(bacteria.getTj(), bacteria.getTjdw(), syl, studyFormFillResource.getSyldw());
             baseMapper.updateKc(bacteria.getId(), kc);
 
-            // 使用稽查轨迹
+            // 使用稽查轨迹s
             Map<String, String> jcnrMap = new LinkedHashMap<>();
             jcnrMap.put("使用量", syl + studyFormFillResource.getSyldw());
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java

@@ -119,8 +119,10 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         gspFfjl.setCctj(gsp.getCctj());
         gspFfjl.setJsrq(gsp.getJsrq());
         gspFfjl.setFfzytj(zytj);
+        // 出库量
         gspFfjl.setCkl(ckl);
         gspFfjl.setCkldw(ckdw);
+        // 转换后的出库量
         BigDecimal basicCkl = UnitTools.convert2Basic(ckl, ckdw);
         gspFfjl.setBasicCkl(basicCkl);
         gspFfjl.setJyzt(JyztEnum.wjy.getValue());
@@ -199,8 +201,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         // 入库量
         gspFfjl.setRkl(form.getRkl());
         gspFfjl.setRkldw(form.getRkldw());
+        // 转换为基础单位的 入库量
         BigDecimal basicRkl = UnitTools.convert2Basic(form.getRkl(), form.getRkldw());
-
         gspFfjl.setBasicRkl(basicRkl);
         gspFfjl.setGhr1Id(ghr1.getUserId());
         gspFfjl.setGhr1Mc(ghr1.getNickName());
@@ -941,14 +943,12 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             result.put("rkl", rklTotal.toString() + rkldw);
         }
 
-
         if(StringUtils.isNotEmpty(ckldw)) {
             Double ckl = map.get("ckl");
             BigDecimal cklTotal = UnitTools.convert(new BigDecimal(ckl), ckldw);
             result.put("ckl", cklTotal.toString() + ckldw);
         }
 
-
         if(StringUtils.isNotEmpty(syldw)) {
             Double syl = map.get("syl");
             BigDecimal sylTotal = UnitTools.convert(new BigDecimal(syl), syldw);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java

@@ -486,13 +486,19 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = sysUserService.selectUserById(form.getFfrId());
-        if(StringUtils.isEmpty(form.getLqr1mm()) || !SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getLqr1mm())) {
+            throw new ServiceException("请输入钥匙领取人1密码");
+        } else if(lqr1 == null || !SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) {
             throw new ServiceException("钥匙领取人1密码错误");
         }
-        if(StringUtils.isEmpty(form.getLqr2mm()) || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) {
+        if(StringUtils.isEmpty(form.getLqr2mm())) {
+            throw new ServiceException("请输入钥匙领取人2密码");
+        } else if(lqr2 == null || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) {
             throw new ServiceException("钥匙领取人2密码错误");
         }
-        if(StringUtils.isEmpty(form.getFfrmm()) || !SecurityUtils.matchesPassword(form.getFfrmm(),ffr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getFfrmm())) {
+            throw new ServiceException("请输入发放人密码");
+        } else if(ffr1 == null ||!SecurityUtils.matchesPassword(form.getFfrmm(),ffr1.getPassword())) {
             throw new ServiceException("发放人密码错误");
         }
 
@@ -575,24 +581,32 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
     public void ff(FfGspForm form) {
         //验证领取人1、领取人2、发放人1、发放人2密码
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
-        if(StringUtils.isEmpty(form.getLqr1mm()) || !SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getLqr1mm()) ) {
+            throw new ServiceException("请输入领取人1密码");
+        } else if(lqr1 == null ||!SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) {
             throw new ServiceException("领取人1密码错误");
         }
         SysUser lqr2 = null;
         if(form.getLqr2Id() != null) {
             lqr2 = sysUserService.selectUserById(form.getLqr2Id());
-            if(StringUtils.isEmpty(form.getLqr2mm()) || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) {
+            if(StringUtils.isEmpty(form.getLqr2mm())) {
+                throw new ServiceException("请输入领取人2密码");
+            } else if(lqr2 == null || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) {
                 throw new ServiceException("领取人2密码错误");
             }
         }
         SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id());
-        if(StringUtils.isEmpty(form.getFfr1mm()) || !SecurityUtils.matchesPassword(form.getFfr1mm(),ffr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getFfr1mm())) {
+            throw new ServiceException("请输入发放人1密码");
+        } else if(ffr1 == null || !SecurityUtils.matchesPassword(form.getFfr1mm(),ffr1.getPassword())) {
             throw new ServiceException("发放人1密码错误");
         }
         SysUser ffr2 = null;
         if(form.getFfr2Id() != null) {
             ffr2 = sysUserService.selectUserById(form.getFfr2Id());
-            if(StringUtils.isEmpty(form.getFfr2mm()) || !SecurityUtils.matchesPassword(form.getFfr2mm(),ffr2.getPassword())) {
+            if(StringUtils.isEmpty(form.getFfr2mm())) {
+                throw new ServiceException("请输入发放人2密码");
+            } else if(ffr2 == null || !SecurityUtils.matchesPassword(form.getFfr2mm(),ffr2.getPassword())) {
                 throw new ServiceException("发放人2密码错误");
             }
         }
@@ -646,7 +660,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         }
         gspOld.setFfrq(now);
         gspOld.setFfbz(form.getRemark());
-        gspOld.setMdIds(form.getMdMcs());
+        gspOld.setMdIds(form.getMdIds());
         gspOld.setMdOther(form.getMdOther());
         gspOld.setZjzt(ZjztEnum.yff.getValue());
         //endregion
@@ -1027,12 +1041,12 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         gspJcgj.setJcmcEn("Dispose");
         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
         jcnrMap.put("处置方式", form.getCzfs());
-        jcnrMap.put("处置量", form.getCzl());
+        jcnrMap.put("处置量", form.getCzl() + gspOld.getKcdw());
         jcnrMap.put("原因", form.getRemark());
         gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap));
         LinkedHashMap<String, String> jcnrMapEn = new LinkedHashMap<>();
         jcnrMapEn.put("Dispose Method", form.getCzfs());
-        jcnrMapEn.put("Amount", form.getCzl());
+        jcnrMapEn.put("Amount", form.getCzl() + gspOld.getKcdw());
         jcnrMapEn.put("Reason", form.getRemark());
         gspJcgj.setJcnrEn(JctUtil.formatStr(jcnrMapEn));
         gspJcgj.setJcmcys(JcmcysEnum.green.getValue());
@@ -1092,12 +1106,12 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
             gspJcgj.setJcmcEn("Dispose");
             LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
             jcnrMap.put("处置方式", itemForm.getCzfs());
-            jcnrMap.put("处置量", itemForm.getCzl());
+            jcnrMap.put("处置量", itemForm.getCzl() + gsp.getKcdw());
             jcnrMap.put("原因", itemForm.getRemark());
             gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap));
             LinkedHashMap<String, String> jcnrMapEn = new LinkedHashMap<>();
             jcnrMapEn.put("Dispose Method", itemForm.getCzfs());
-            jcnrMapEn.put("Amount", itemForm.getCzl());
+            jcnrMapEn.put("Amount", itemForm.getCzl() + gsp.getKcdw());
             jcnrMapEn.put("Reason", itemForm.getRemark());
             gspJcgj.setJcnrEn(JctUtil.formatStr(jcnrMapEn));
             gspJcgj.setJcmcys(JcmcysEnum.green.getValue());
@@ -1279,24 +1293,33 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
     @Transactional(rollbackFor = Exception.class)
     public void gh(GspGhForm form) {
         SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
-        if(StringUtils.isEmpty(form.getGhr1mm()) || !SecurityUtils.matchesPassword(form.getGhr1mm(),ghr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getGhr1mm())) {
+            throw new ServiceException("请输入归还人1密码");
+        } else if(ghr1 == null || !SecurityUtils.matchesPassword(form.getGhr1mm(),ghr1.getPassword())) {
             throw new ServiceException("归还人1密码错误");
         }
         SysUser ghr2 = null;
         if(form.getGhr2Id() != null) {
             ghr2 = sysUserService.selectUserById(form.getGhr2Id());
-            if(StringUtils.isEmpty(form.getGhr2mm()) || !SecurityUtils.matchesPassword(form.getGhr2mm(),ghr2.getPassword())) {
+
+            if(StringUtils.isEmpty(form.getGhr2mm())) {
+                throw new ServiceException("请输入归还人2密码");
+            } else if(ghr2 == null || !SecurityUtils.matchesPassword(form.getGhr2mm(),ghr2.getPassword())) {
                 throw new ServiceException("归还人2密码错误");
             }
         }
         SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id());
-        if(StringUtils.isEmpty(form.getJsr1mm()) || !SecurityUtils.matchesPassword(form.getJsr1mm(),jsr1.getPassword())) {
+        if(StringUtils.isEmpty(form.getJsr1mm())) {
+            throw new ServiceException("请输入库管员1密码");
+        } else if(jsr1 == null || !SecurityUtils.matchesPassword(form.getJsr1mm(),jsr1.getPassword())) {
             throw new ServiceException("库管员1密码错误");
         }
         SysUser jsr2 = null;
         if(form.getJsr2Id() != null) {
             jsr2 = sysUserService.selectUserById(form.getJsr2Id());
-            if(StringUtils.isEmpty(form.getJsr2mm()) || !SecurityUtils.matchesPassword(form.getJsr2mm(),jsr2.getPassword())) {
+            if(StringUtils.isEmpty(form.getJsr2mm())) {
+                throw new ServiceException("请输入库管员2密码");
+            } else if(jsr2 == null || !SecurityUtils.matchesPassword(form.getJsr2mm(),jsr2.getPassword())) {
                 throw new ServiceException("库管员2密码错误");
             }
         }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java

@@ -225,12 +225,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
         jcnrMap.put("处置方式", form.getCzfs());
-        jcnrMap.put("处置量", form.getCzl());
+        jcnrMap.put("处置量", form.getCzl() + sjOld.getKcdw());
         jcnrMap.put("原因", form.getRemark());
 
         LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
         jcnrEnMap.put("Dispose Method", form.getCzfs());
-        jcnrEnMap.put("Amount", form.getCzl());
+        jcnrEnMap.put("Amount", form.getCzl() + sjOld.getKcdw());
         jcnrEnMap.put("Reason", form.getRemark());
         SjJcgj sjJcgj = new SjJcgj();
         sjJcgj.setSjId(sjOld.getId());
@@ -291,11 +291,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
             LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
             jcnrMap.put("处置方式", itemForm.getCzfs());
-            jcnrMap.put("处置量", itemForm.getCzl());
+            jcnrMap.put("处置量", itemForm.getCzl() + sj.getKcdw());
             jcnrMap.put("原因", itemForm.getRemark());
             LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
             jcnrEnMap.put("Dispose Method", itemForm.getCzfs());
-            jcnrEnMap.put("Amount", itemForm.getCzl());
+            jcnrEnMap.put("Amount", itemForm.getCzl() + sj.getKcdw());
             jcnrEnMap.put("Reason", itemForm.getRemark());
             SjJcgj sjJcgj = new SjJcgj();
             sjJcgj.setSjId(itemForm.getId());