From f76c55cb81ad48b326fab43c24c7e0802fec1c69 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 17 Apr 2026 19:31:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java | 4 ++-- .../main/java/com/hxhq/business/service/impl/MjyServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 d812561..ab25b42 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 @@ -846,7 +846,7 @@ 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.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 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()); 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 075820a..18dc6fc 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.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 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());