From 33fa3cf7d2ccc0919be1bd44fdaae0cd519cdab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 30 Jan 2026 16:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E7=BB=91?= =?UTF-8?q?=E5=AE=9AFeign=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/api/OrderApiImpl.java | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 265370a7..5a2ce821 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -5,6 +5,7 @@ import com.zt.plat.framework.common.exception.ErrorCode; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.contractorder.api.dto.order.*; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO; @@ -145,7 +146,7 @@ public class OrderApiImpl implements OrderApi { BigDecimal lstQty = Optional.ofNullable(salesOrderDetailDO.getTrfQty()) .orElse(BigDecimal.ZERO); if (lstQty.equals(BigDecimal.ZERO)) { - throw exception(new ErrorCode(1_008_00_609,"积累量不能等于0")); + throw exception(new ErrorCode(1_008_00_609, "积累量不能等于0")); } SalesOrderDetailDO updateDO = new SalesOrderDetailDO(); updateDO.setId(f.getOrderDetailId()); // 给更新对象设 ID @@ -158,7 +159,7 @@ public class OrderApiImpl implements OrderApi { BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty()) .orElse(BigDecimal.ZERO); if (lstQty.equals(BigDecimal.ZERO)) { - throw exception(new ErrorCode(1_008_00_609,"积累量不能等于0")); + throw exception(new ErrorCode(1_008_00_609, "积累量不能等于0")); } PrchOrdDtlDO updateDO = new PrchOrdDtlDO(); updateDO.setId(f.getOrderDetailId()); @@ -174,13 +175,21 @@ public class OrderApiImpl implements OrderApi { @Override public CommonResult> getSalesOrderDetailsByOrderIds(List ids) { - List salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, '1'); + List salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList( + new LambdaQueryWrapperX() + .in(SalesOrderDetailDO::getOrderId, ids) + .eq(SalesOrderDetailDO::getIsEnable, '1') + ); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); } @Override public CommonResult getSalesOrderDetailsByOrderId(Long id) { - SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getOrderId, id, SalesOrderDetailDO::getIsEnable, '1'); + SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne( + new LambdaQueryWrapperX() + .eq(SalesOrderDetailDO::getOrderId, id) + .eq(SalesOrderDetailDO::getIsEnable, '1') + ); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); } @@ -192,7 +201,7 @@ public class OrderApiImpl implements OrderApi { } private List getOrderByIds(List ids) { - return SpringUtil.getBean(SalesOrderMapper.class).selectList(SalesOrderDO::getId,ids); // 采购订单与销售订单的 + return SpringUtil.getBean(SalesOrderMapper.class).selectList(SalesOrderDO::getId, ids); // 采购订单与销售订单的 } private List getPoOrdByIds(List ids) { @@ -203,7 +212,11 @@ public class OrderApiImpl implements OrderApi { } PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, '1'); + List prchOrdDtlDOS = prchOrdDtlMapper.selectList( + new LambdaQueryWrapperX() + .in(PrchOrdDtlDO::getOrdId, orderIds) + .eq(PrchOrdDtlDO::getIsEnb, '1') + ); orderDTOS.forEach(o -> { List ordDtlDTOS = new ArrayList<>(); prchOrdDtlDOS.forEach(p -> { @@ -226,7 +239,11 @@ public class OrderApiImpl implements OrderApi { } SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, '1'); + List salesOrderDetailDOS = salesOrderDetailMapper.selectList( + new LambdaQueryWrapperX() + .in(SalesOrderDetailDO::getOrderId, orderIds) + .eq(SalesOrderDetailDO::getIsEnable, '1') + ); orderDTOS.forEach(o -> { List salesOrdDtlDTOS = new ArrayList<>(); salesOrderDetailDOS.forEach(s -> { @@ -273,7 +290,7 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setTrfWrhNum(p.getTrfWrhNum()); ordDtlDTO.setRmk(p.getRmk()); ordDtlDTO.setLstQty(p.getLstQty()); - if("PO04".equals(orderDTO.getType())){ + if ("PO04".equals(orderDTO.getType())) { ordDtlDTO.setMtrlName(orderDTO.getMaterialName()); ordDtlDTO.setMtrlNum(orderDTO.getMaterialNumber()); // 没单位了 }