diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index 01f05c8..f2ff18b 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -49,6 +49,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service("skOrderServiceImpl") @@ -348,6 +349,7 @@ public class SkOrderServiceImpl implements OrderService { //发票明细信息 List ddmxxxBOList = new ArrayList<>(); int index = ConfigureConstant.INT_0; + boolean isZk = !skOrderItemInfoList.stream().filter(item->item.getXgdjbh().startsWith("XSB")).collect(Collectors.toList()).isEmpty(); for (SkOrderItemInfo orderItemInfo : skOrderItemInfoList) { DdmxxxBO ddmxxxBO = new DdmxxxBO(); ddmxxxBO.setXH(String.valueOf(++index)); @@ -369,6 +371,15 @@ public class SkOrderServiceImpl implements OrderService { taxAmount = DecimalCalculateUtil.bigDecimalAdd(taxAmount, orderItemInfo.getSe(), ConfigureConstant.INT_2); //设置红字回写订单号 ddmxxxBO.setBYZD2(orderItemInfo.getXgdjbh()); + //添加则扣行判断 + if (isZk){ + ddmxxxBO.setXH(ConfigureConstant.STRING_1); + ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_2); + if (orderItemInfo.getXgdjbh().startsWith("XSB")){ + ddmxxxBO.setXH(ConfigureConstant.STRING_2); + ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_1); + } + } ddmxxxBOList.add(ddmxxxBO); } //金额、税额、价税合计