From f953a05c08159e68b9934b54f4189b7e3ac61d70 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 8 Oct 2023 15:04:31 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=B4=AD=E6=96=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=20=E9=87=8D=E6=96=B0=E6=9F=A5=E9=AA=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index b5c4b218..cafe21a3 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -520,6 +520,31 @@ public class SDNYMainProcessController extends AbstractController { if (checkInvoiceByUuid != null) { log.info("进项票池已存在发票.直接返回票池信息"); R data = new R(1000, "default success"); + + //如果购方名称为空，则查验之后补充购销方相关信息 + String gfName = checkInvoiceByUuid.getGfName(); + String gfAddressAndPhone = checkInvoiceByUuid.getGfAddressAndPhone(); + if(StringUtils.isEmpty(gfName) || StringUtils.isEmpty(gfAddressAndPhone)){ + log.info("购方名称为空，查验补充信息"); + checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap, null); + + if (!checkInvoiceResult.containsKey("code")) { + if (!checkInvoiceResult.containsKey("cyjg")) { + //先删除原有主数据,再查验更新主数据和明细数据 + int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper); + if (delete > 0) { + checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); + signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); + } + } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { + data = errorInfo(checkInvoiceResult, data); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + + } + } + checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); + } + String invoiceNo = checkInvoiceByUuid.getInvoiceNo(); QueryWrapper detailWrapper = new QueryWrapper<>(); detailWrapper.eq("uuid", uuid); @@ -532,10 +557,7 @@ public class SDNYMainProcessController extends AbstractController { baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); } - String gfName = checkInvoiceByUuid.getGfName(); - String gfAddressAndPhone = checkInvoiceByUuid.getGfAddressAndPhone(); - - if ((baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0) && (vehicleList == null || vehicleList.size() == 0) || StringUtils.isEmpty(gfName) || StringUtils.isEmpty(gfAddressAndPhone)) { + if ((baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0) && (vehicleList == null || vehicleList.size() == 0)) { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap, null); if (!checkInvoiceResult.containsKey("code")) {