fix:[模板管理]优化

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

@@ -846,7 +846,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
         formData.put("转移条件", form.getZytj());
-        formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw());
+        formData.put("出库毛重", form.getCkmz() + gyzjOld.getCkmzdw());
         formData.put("目的", form.getMdMcs());
         formData.put("领取人", lqr1.getNickName());
         formData.put("领取人2", lqr2.getNickName());
@@ -916,7 +916,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 Map<String, String> formData = new LinkedHashMap<>();
                 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).getCkmz() + gyzj.getCkmzdw());
                 formData.put("目的", plffItemFilter.get(0).getMdMcs());
                 formData.put("领取人", lqr1.getNickName());
                 formData.put("领取人2", lqr2.getNickName());

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<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", mjyOld.getKc() + mjyOld.getKcdw());
         formData.put("转移条件", form.getZytj());
-        formData.put("出库毛重", form.getCkmz() + mjyOld.getKcdw());
+        formData.put("出库毛重", form.getCkmz() + mjyOld.getCkmzdw());
         formData.put("目的", form.getMdMcs());
         formData.put("领取人", lqr1.getNickName());
         formData.put("领取人2", lqr2.getNickName());
@@ -791,13 +791,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());
             if (plffItemFilter.size() > 0) {
-                //发放 todo
+                //发放
                 mjyFfjlService.ff(plffItemFilter.get(0), mjy, lqr1, lqr2, ffr1, ffr2, now);
                 //稽查轨迹
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("出库量", mjy.getKc() + mjy.getKcdw());
                 formData.put("转移条件", plffItemFilter.get(0).getZytj());
-                formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getKcdw());
+                formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getCkmzdw());
                 formData.put("目的", plffItemFilter.get(0).getMdMcs());
                 formData.put("领取人", lqr1.getNickName());
                 formData.put("领取人2", lqr2.getNickName());