From 0b1c42e89f0b7ac6a45c9f6e7102b1352e90b389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Tue, 14 Nov 2023 10:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=8F=91=E7=A5=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 23 ++++++++++++++++++- .../erp/service/SNPushCheckRecordService.java | 8 +++---- .../service/impl/ImageSubmitServiceImpl.java | 4 ++-- 3 files changed, 28 insertions(+), 7 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 f5bf6160..03faa832 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 @@ -630,9 +630,30 @@ public class SDNYMainProcessController extends AbstractController { QueryWrapper saleDetailWrapper = new QueryWrapper<>(); saleDetailWrapper.eq("invoice_no", invoiceNo); List recordInvoiceSaleDetailModel = snPushCheckRecordService.selectSaleListByWrapper(saleDetailWrapper); + List baseTDxRecordInvoiceDetail = null; + if(recordInvoiceSaleDetailModel == null || recordInvoiceSaleDetailModel.size() == 0){ + log.info("明细行为空，查验补充信息"); + checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap, null); + + if (!checkInvoiceResult.containsKey("code")) { + if (!checkInvoiceResult.containsKey("cyjg")) { + snPushCheckRecordService.updateInvoice(dbName, checkInvoiceResult, recordWrapper); + QueryWrapper detailWrapper = new QueryWrapper<>(); + detailWrapper.eq("uuid", uuid); + baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); + } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { + data = errorInfo(checkInvoiceResult, data); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } + } + checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); + } JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel); + if(baseTDxRecordInvoiceDetail!= null && baseTDxRecordInvoiceDetail.size() > 0){ + saleDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail); + } convertToResult(checkInvoice, saleDetail); data.put("data", checkInvoice); @@ -1400,7 +1421,7 @@ public class SDNYMainProcessController extends AbstractController { * @param params * @return */ - //@PostMapping("/imageSubmitSalesInvoice") + @PostMapping("/imageSubmitSalesInvoice") @ResponseBody @SysLog("影像系统提交销项发票") public ResponseEntity imageSubmitSalesInvoice(@RequestBody SNRequestObject params) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 069753c9..d6ec0dc0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -1243,10 +1243,10 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { public void updateInvoice(String dbName, JSONObject checkInvoiceResult, QueryWrapper recordWrapper) throws Exception { //先删除原有主数据,再查验更新主数据和明细数据 int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper); - if (delete > 0) { - checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); - signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); - } + + checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); + signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); + } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java index df4da04d..c7cc9f62 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java @@ -98,9 +98,9 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { detailQueryWrapper.in("uuid", uuidList); List detailList = detailDao.selectList(detailQueryWrapper); if (detailList == null || detailList.size() == 0) { - QueryWrapper salesQueryWrapper = new QueryWrapper<>(); + QueryWrapper salesQueryWrapper = new QueryWrapper<>(); salesQueryWrapper.in("uuid", uuidList); - List salesDetailList = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper); + List salesDetailList = detailSalesDao.selectList(salesQueryWrapper); if (salesDetailList == null || salesDetailList.size() == 0) { return R.error(500,"未查询到发票明细信息，请重新查验"); }