fix：[资源库管理]给药制剂bug

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

@@ -358,7 +358,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plczyj(PlczyjForm form) {
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         //验证处理人密码
         checkPassword(clr,form.getClrmm());
 
@@ -418,7 +418,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void czyj(CzyjForm form) {
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
 
         //验证处理人密码
         checkPassword(clr,form.getClrmm());
@@ -668,7 +668,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
         formData.put("转移条件", form.getZytj());
         formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw());
-        formData.put("目的", form.getMdMcs()+(StringUtils.isNoneBlank(form.getMdOther())?(","+form.getMdOther()):""));
+        formData.put("目的", form.getMdMcs());
         formData.put("领取人", lqr1.getNickName());
         formData.put("领取人2", lqr2.getNickName());
         formData.put("发放人", ffr1.getNickName());
@@ -738,7 +738,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
                 formData.put("转移条件", plffItemFilter.get(0).getZytj());
                 formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw());
-                formData.put("目的", plffItemFilter.get(0).getMdMcs()+(StringUtils.isNoneBlank(plffItemFilter.get(0).getMdOther())?(","+plffItemFilter.get(0).getMdOther()):""));
+                formData.put("目的", plffItemFilter.get(0).getMdMcs());
                 formData.put("领取人", lqr1.getNickName());
                 formData.put("领取人2", lqr2.getNickName());
                 formData.put("发放人", ffr1.getNickName());
@@ -1049,7 +1049,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         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());
+        gyzjTzService.saveTz(gyzjOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkl(), gyzjOld.getKcdw(),form.getRemark());
 
         // 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java

@@ -43,6 +43,7 @@ public class GyzjJcnrUtil {
         mapJcnr.put("入库净重","Check-in Net Weight");
         mapJcnr.put("入库量","Total Amount");
         mapJcnr.put("申请备注","Apply Comment");
+        mapJcnr.put("审核备注","Approve Comment");
         mapJcnr.put("领取人","Recipient");
         mapJcnr.put("领取人2","Recipient 2");
         mapJcnr.put("发放人","Issuer");