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 03d215bf..3c92c5aa 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 @@ -263,26 +263,31 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); if(baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0){ - //先删除原有主数据,再查验更新主数据和明细数据 - int delete = baseTDxRecordInvoiceDao.delete(recordWrapper); - if(delete > 0) { - checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,null); - - singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); - singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); - - if (!checkInvoiceResult.containsKey("code")) { - if (!checkInvoiceResult.containsKey("cyjg")) { + checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,null); + if (!checkInvoiceResult.containsKey("code")) { + if (!checkInvoiceResult.containsKey("cyjg")) { + //先删除原有主数据,再查验更新主数据和明细数据 + int delete = baseTDxRecordInvoiceDao.delete(recordWrapper); + if(delete > 0) { checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); + List activeCallRequest = new ArrayList<>(); + activeCallRequest.add(JSONObject.toJSONString(pramsMap)); + activeCallRequest.add(JSONObject.toJSONString(null)); + singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); + singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); + + DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); + baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); } + }else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { + data = errorInfo(checkInvoiceResult, data); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } - DynamicContextHolder.push("business" + DbConstant.DETAIL_READ); - baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); - DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); } } - JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail);