diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java index 43676ad1..83c2006c 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java @@ -406,4 +406,9 @@ public class OrderInfo implements Serializable { */ private String bzdh; + /** + * 公司代码 + */ + private String gsdm; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/PageOrderInfo.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/PageOrderInfo.java index 25f4ab24..3a33bde0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/PageOrderInfo.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/PageOrderInfo.java @@ -242,4 +242,10 @@ public class PageOrderInfo { @ApiModelProperty private String bzdh; + /** + * 公司代码 + */ + @ApiModelProperty + private String gsdm; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index b5421f0e..ccaf067b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -190,14 +190,17 @@ public class InvoiceServiceImpl implements InvoiceService { if(ruleSplitEntityList.size() != 0){ djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce(); } - BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs(); - if (abs.compareTo(new BigDecimal(djce)) > 0) { - Map map = new HashMap(); - map.put("ddh", commonOrderInfo.getOrderInfo().getDdh()); - map.put("ghfMc", commonOrderInfo.getOrderInfo().getGhfMc()); - map.put("xhfMc", commonOrderInfo.getOrderInfo().getXhfMc()); - map.put("jshj", commonOrderInfo.getOrderInfo().getKphjje()); - djOverflowList.add(map); + if(ObjectUtil.isNotNull(collect.get(0).getXmdj()) && StrUtil.isNotBlank(collect.get(0).getXmdj()) && + ObjectUtil.isNotNull(splitItem.getXmdj()) && StrUtil.isNotBlank(splitItem.getXmdj())){ + BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs(); + if (abs.compareTo(new BigDecimal(djce)) > 0) { + Map map = new HashMap(); + map.put("ddh", commonOrderInfo.getOrderInfo().getDdh()); + map.put("ghfMc", commonOrderInfo.getOrderInfo().getGhfMc()); + map.put("xhfMc", commonOrderInfo.getOrderInfo().getXhfMc()); + map.put("jshj", commonOrderInfo.getOrderInfo().getKphjje()); + djOverflowList.add(map); + } } } else { log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/BeanTransServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/BeanTransServiceImpl.java index 1bc35f91..f3e4b6bf 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/BeanTransServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/BeanTransServiceImpl.java @@ -142,6 +142,7 @@ public class BeanTransServiceImpl implements BeanTransService { orderInfo.setEntId(pageOrderInfo.getEntId()); } orderInfo.setBzdh(pageOrderInfo.getBzdh()); + orderInfo.setGsdm(pageOrderInfo.getGsdm()); //判断小数点后位数,默认为8位,如果为全电,为15位 int afterPointLength = ConfigureConstant.INT_8; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index d3b88075..9198d425 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -709,7 +709,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt()); orderProcessInfo.setBzdh(commonOrderInfo.getOrderInfo().getBzdh()); orderProcessInfo.setXtly("FPPAGE"); - orderProcessInfo.setGsdm(""); + orderProcessInfo.setGsdm(commonOrderInfo.getOrderInfo().getGsdm()); orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); if(OrderInfoEnum.INVOICE_BILLING_CZLX_1.getKey().equals(commonOrderInfo.getCzlx())){ orderProcessInfo.setYzfp(ConfigureConstant.STRING_0);