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 1aca9d2c..b91a6b55 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 @@ -669,6 +669,7 @@ public class SDNYMainProcessController extends AbstractController { //认证相关 String zrzjg = getZRZJG(snInvoice.getInvoiceCode(),snInvoice.getInvoiceNumber(),info.getZFPLX()); + info.setZRZJG(zrzjg); info.setZRZSSQ(""); // info.setZRZMS(""); // info.setZRZRQ(""); @@ -868,7 +869,7 @@ public class SDNYMainProcessController extends AbstractController { private String getZRZJG(String invoiceCode, String invoiceNo,String FPLX){ String ZCYJG = ""; String uuid = invoiceCode+invoiceNo; - DynamicContextHolder.push(DbConstant.BASICS_READ); + DynamicContextHolder.push(DbConstant.BUSINESS_READ); //可价税分离票种 if ("10".equals(FPLX) || "12".equals(FPLX) || "13".equals(FPLX) || "14".equals(FPLX) || "15".equals(FPLX) @@ -876,7 +877,11 @@ public class SDNYMainProcessController extends AbstractController { || "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX) ) { QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = tDxInvoiceReimburseService.getOne(wrapper).getRzhYesorno(); + TDxInvoiceReimburse one = tDxInvoiceReimburseService.getOne(wrapper); + if (one != null){ + ZCYJG = one.getRzhYesorno(); + } + } else { //如果是可查验类型,直接更新数据库 @@ -884,13 +889,19 @@ public class SDNYMainProcessController extends AbstractController { //其他票种 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = recordInvoiceDao.selectOne(wrapper).getRzhYesorno(); + RecordInvoice recordInvoice = recordInvoiceDao.selectOne(wrapper); + if (recordInvoice != null){ + ZCYJG = recordInvoice.getRzhYesorno(); + } + } else { //海关缴款书 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = customsRecordDao.selectOne(wrapper).getRzhYesorno(); - + TdxCustomsRecord tdxCustomsRecord = customsRecordDao.selectOne(wrapper); + if (tdxCustomsRecord != null){ + ZCYJG = tdxCustomsRecord.getRzhYesorno(); + } } }