fix：[资源库管理][麻精药翻译]

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

@@ -988,7 +988,7 @@ 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);
         //region 台账
-        mjyTzService.getTz(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(),mjyOld.getKcdw(),form.getRemark());
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());

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

@@ -60,21 +60,21 @@ public class MjyTzServiceImpl extends ServiceImpl implements
         MjyTz mjyTz = new MjyTz();
         mjyTz.setMjyId(mjyId);
         if (lqr1 != null && lqr2 != null) {
-            mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName());
-            mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName());
+            mjyTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
+            mjyTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
         }
 
         if (ghr1 != null && ghr2 != null) {
-            mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName());
-            mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName());
+            mjyTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
+            mjyTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
         }
         if (ffr1 != null && ffr2 != null) {
-            mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName());
-            mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName());
+            mjyTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
+            mjyTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
-            mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName());
-            mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName());
+            mjyTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
+            mjyTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
         }
         if (qmr != null && qmr != null) {
             mjyTz.setQmrId(qmr.getUserId());
@@ -110,21 +110,21 @@ public class MjyTzServiceImpl extends ServiceImpl implements
         MjyTz mjyTz = new MjyTz();
         mjyTz.setMjyId(mjyId);
         if (lqr1 != null && lqr2 != null) {
-            mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName());
-            mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName());
+            mjyTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
+            mjyTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
         }
 
         if (ghr1 != null && ghr2 != null) {
-            mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName());
-            mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName());
+            mjyTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
+            mjyTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
         }
         if (ffr1 != null && ffr2 != null) {
-            mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName());
-            mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName());
+            mjyTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
+            mjyTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
-            mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName());
-            mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName());
+            mjyTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
+            mjyTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
         }
         if (qmr != null && qmr != null) {
             mjyTz.setQmrId(qmr.getUserId());