diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 27943233..5c6b8949 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1469,11 +1469,17 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(map, null, null); if(orderProcessInfos.size()!=1){ return R.error("根据报账单号未查到到结算单或查询到多条结算单,请检查!"); - }else if(orderProcessInfos.size() == 1 && new BigDecimal(orderProcessInfos.get(0).getKphjje()).compareTo(BigDecimal.ZERO) == -1 ){ + }else if(orderProcessInfos.size() == 1 && new BigDecimal(orderProcessInfos.get(0).getKphjje()).compareTo(BigDecimal.ZERO) == 1 ){ return R.error("报账单号对应的结算单不是负数结算单,请检查!"); }else { op = orderProcessInfos.get(0); } + if(!commonOrderInfo.getOrderInfo().getXhfNsrsbh().equals(op.getXhfNsrsbh())){ + return R.error("报账单号对应的结算单销方税号与当前结算单不一致,请检查!"); + } + if(!commonOrderInfo.getOrderInfo().getGhfNsrsbh().equals(op.getGhfNsrsbh())){ + return R.error("报账单号对应的结算单购方税号与当前结算单不一致,请检查!"); + } } String sld = commonOrderInfo.getOrderInfo().getSld(); String sldMc = commonOrderInfo.getOrderInfo().getSldMc(); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 29ae79e7..e87e8424 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -1213,13 +1213,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt orderInfo.setSldMc(""); //红字发票添加备注 - String resultBz = CommonUtils.getBz(orderInfo.getBz(), orderInfo.getKplx(), orderInfo.getFpzlDm(), + /*String resultBz = CommonUtils.getBz(orderInfo.getBz(), orderInfo.getKplx(), orderInfo.getFpzlDm(), terminalCode, orderInfo.getYfpDm(), orderInfo.getYfpHm(), kce, orderInfo.getHzxxbbh()); orderInfo.setBz(resultBz); if (StringUtils.isEmpty(orderInfo.getHzxxbbh())) { String resultHzxxbbh = CommonUtils.getHzxxbbh(resultBz, terminalCode); orderInfo.setHzxxbbh(resultHzxxbbh); - } + }*/ } /**