ariesy 合并代码

release
yefei 2 years ago
parent 1f108f2608
commit 41656f807f
  1. 6
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@ -242,7 +242,7 @@ public class SDNYMainProcessController extends AbstractController {
if (!checkInvoiceResult.containsKey("code")) {
if (!checkInvoiceResult.containsKey("cyjg")) {
//先删除原有主数据,再查验更新主数据和明细数据
int delete = baseTDxRecordInvoiceDao.delete(recordWrapper);
int delete = snPushCheckRecordService.deleteRecordByWrapper(recordWrapper);
if (delete > 0) {
checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber"));
signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName);
@ -251,7 +251,6 @@ public class SDNYMainProcessController extends AbstractController {
data = errorInfo(checkInvoiceResult, data);
try {
DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0, JSONObject.toJSONString(data),
(String) checkInvoiceResult.get("cyjgxx"));
} catch (Exception e) {
@ -263,8 +262,7 @@ public class SDNYMainProcessController extends AbstractController {
}
}
DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ);
checkInvoiceByUuid = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper);
}
String invoiceNo = checkInvoiceByUuid.getInvoiceNo();

Loading…
Cancel
Save