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; }