From 2a8d96a14afc2321d65ac3ada4f0a338bc2da6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 2 Apr 2026 14:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A6=82=E6=9E=9C=E6=98=AF=E9=BD=90=E5=A5=97=E7=89=A9?= =?UTF-8?q?=E6=96=99=EF=BC=8C=E5=AD=90=E9=A1=B9=E7=9A=84=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=AF=94=E4=BE=8B=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InProduceOrderController.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index fb29282b..613af772 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -22,9 +22,13 @@ import com.nflg.wms.common.pojo.vo.InProduceOrderItemVO; import com.nflg.wms.common.pojo.vo.InProduceOrderMaterialVO; import com.nflg.wms.common.pojo.vo.InProduceOrderVO; import com.nflg.wms.common.util.DateTimeUtil; +import com.nflg.wms.common.util.NumberUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.*; +import com.nflg.wms.repository.entity.WmsBom; +import com.nflg.wms.repository.entity.WmsInProduceOrder; +import com.nflg.wms.repository.entity.WmsInProduceOrderItem; +import com.nflg.wms.repository.entity.WmsQrCodeMaster; import com.nflg.wms.repository.service.*; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -167,7 +171,7 @@ public class InProduceOrderController extends BaseController { .setId(IdUtil.getSnowflakeNextId()) .setOrderId(order.getId()) .setParentId(parent.getId()) - .setNum(request.getNum().multiply(it.getNum())) + .setNum(it.getNum()) .setMaterialNo(it.getNo()) .setMaterialDesc(it.getDescribe()) .setUnit(request.getMeins()) @@ -187,7 +191,7 @@ public class InProduceOrderController extends BaseController { .setMaterialCode(it.getMaterialNo()) .setMaterialDescription(it.getMaterialDesc()) .setPackagingType((short) 0) - .setQuantity(it.getNum()) + .setQuantity(NumberUtil.multiply(it.getNum(), parent.getNum())) .setUnit(it.getUnit()) .setBatchNo(it.getBatchNo()) .setSerialNo(it.getSernr()) @@ -424,19 +428,21 @@ public class InProduceOrderController extends BaseController { List datas; if (order.getList()) { datas = new ArrayList<>(); - list.stream().filter(it -> Objects.equals(it.getParentId(), 0L)).forEach(it -> { - List children = list.stream() - .filter(child -> Objects.equals(child.getParentId(), it.getId())) - .toList(); - Integer type = bomService.getScanType(it.getMaterialNo()); - children.forEach(child -> { - child.setQiTao(false); - if (Objects.equals(type, 0)) { - child.setMustScan(false); - } - }); - datas.addAll(children); - }); + list.stream().filter(it -> Objects.equals(it.getParentId(), 0L)) + .forEach(it -> { + List children = list.stream() + .filter(child -> Objects.equals(child.getParentId(), it.getId())) + .toList(); + Integer type = bomService.getScanType(it.getMaterialNo()); + children.forEach(child -> { + child.setNum(NumberUtil.multiply(child.getNum(), it.getNum())); + child.setQiTao(false); + if (Objects.equals(type, 0)) { + child.setMustScan(false); + } + }); + datas.addAll(children); + }); } else { datas = list; }