diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/controller/SpecialInvoiceReversalController.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/controller/SpecialInvoiceReversalController.java index 6f8aef55..59ebf68a 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/controller/SpecialInvoiceReversalController.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/controller/SpecialInvoiceReversalController.java @@ -395,8 +395,8 @@ public class SpecialInvoiceReversalController { specialInvoiceReversalEntity.setSqdscqqlsh(baseService.getGenerateShotKey()); } else { //调用税盘编号生成code -// Map resultMap = specialInvoiceService.querySpecialInvoiceReversalCode("", specialInvoiceReversalEntity.getFpzlDm(), nsrsbh, terminalCode); -// specialInvoiceReversalEntity.setSqdscqqlsh(resultMap.get(OrderManagementConstant.CODE)); + Map resultMap = specialInvoiceService.querySpecialInvoiceReversalCode("", specialInvoiceReversalEntity.getFpzlDm(), nsrsbh, terminalCode); + specialInvoiceReversalEntity.setSqdscqqlsh(resultMap.get(OrderManagementConstant.CODE)); } } @@ -727,12 +727,12 @@ public class SpecialInvoiceReversalController { } -// if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(specialInvoiceReversalEntity.getFpzlDm())) { -// if (StringUtils.isBlank(specialInvoiceReversalEntity.getJqbh()) && StringUtils.isBlank(specialInvoiceReversalEntity.getFjh())) { -// return R.error(ResponseStatusCodes.ACCESS_POINT_ID_IS_BLANK, "分机号不能为空"); -// } -// -// } + if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(specialInvoiceReversalEntity.getFpzlDm())) { + if (StringUtils.isBlank(specialInvoiceReversalEntity.getJqbh()) && StringUtils.isBlank(specialInvoiceReversalEntity.getFjh())) { + return R.error(ResponseStatusCodes.ACCESS_POINT_ID_IS_BLANK, "分机号不能为空"); + } + + } //审核状态 if (StringUtils.isNotBlank(specialInvoiceReversalEntity.getStatusCode()) && ArrayUtils.contains(notAllowedEditSubmitStatus, specialInvoiceReversalEntity.getStatusCode())) { diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java index ad3d478b..e173f9ed 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java @@ -743,9 +743,9 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService { } } -// if (StringUtils.isBlank(resultJqbh)) { -// throw new OrderReceiveException("9999", "获取机器编码异常!"); -// } + if (StringUtils.isBlank(resultJqbh)) { + throw new OrderReceiveException("9999", "获取机器编码异常!"); + } specialInvoiceReversalCode = resultJqbh + DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS).substring(2);