|
|
|
@ -1,15 +1,12 @@ |
|
|
|
|
package com.dxhy.erp.controller; |
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.dxhy.common.aspect.SysLog; |
|
|
|
|
import com.dxhy.common.constant.CommonConstants; |
|
|
|
|
import com.dxhy.common.constant.ConfigureConstant; |
|
|
|
|
import com.dxhy.common.constant.DbConstant; |
|
|
|
|
import com.dxhy.common.controller.AbstractController; |
|
|
|
|
import com.dxhy.common.datasource.config.DynamicContextHolder; |
|
|
|
|
import com.dxhy.common.enums.SNFplxEnum; |
|
|
|
|
import com.dxhy.common.exception.BaseException; |
|
|
|
|
import com.dxhy.common.util.InvoiceUtil; |
|
|
|
@ -58,9 +55,6 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
@Value("${sdny.isPresure}") |
|
|
|
|
private String isPresure; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private GsClientMapper gsClientMapper; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private InvoiceQueryService invoiceQueryService; |
|
|
|
|
|
|
|
|
@ -76,30 +70,6 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
@Resource |
|
|
|
|
private TDxInvoiceReimburseService tDxInvoiceReimburseService; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
TdxSaleRecordInvoiceDao tdxSaleRecordInvoiceDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private CustomsRecordDao customsRecordDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private BaseTDxRecordInvoiceDetailDao baseTDxRecordInvoiceDetailDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private InvoiceDownDetaiSaleInsertDao invoiceDownDetaiSaleInsertDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private RecordInvoiceDao recordInvoiceDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private MixedSignatureDao mixedSignatureDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private SysDeptDao sysDeptDao; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private TdxPlatformCheckLogService platfromCheckLogService; |
|
|
|
|
|
|
|
|
@ -252,7 +222,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
//查询底账库是否有对应发票,有则直接返回
|
|
|
|
|
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>(); |
|
|
|
|
recordWrapper.eq("uuid", uuid); |
|
|
|
|
BaseTDxRecordInvoice checkInvoiceByUuid = baseTDxRecordInvoiceDao.selectOne(recordWrapper); |
|
|
|
|
BaseTDxRecordInvoice checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); |
|
|
|
|
if (checkInvoiceByUuid != null) { |
|
|
|
|
log.info("进项票池已存在发票.直接返回票池信息"); |
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
@ -265,7 +235,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
vehicleList = snPushCheckRecordService.vihicleList(uuid); |
|
|
|
|
} else { |
|
|
|
|
baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); |
|
|
|
|
baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ((baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0) && (vehicleList == null || vehicleList.size() == 0)) { |
|
|
|
@ -281,14 +251,14 @@ 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); |
|
|
|
|
if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
vehicleList = snPushCheckRecordService.vihicleList(uuid); |
|
|
|
|
} else { |
|
|
|
|
baseTDxRecordInvoiceDetail = baseTDxRecordInvoiceDetailDao.selectList(detailWrapper); |
|
|
|
|
baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
@ -335,7 +305,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} else { |
|
|
|
|
TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid); |
|
|
|
|
TdxSaleRecordInvoice tdxSaleRecordInvoice = snPushCheckRecordService.selectSaleByUuid(uuid); |
|
|
|
|
log.info("tdxSaleRecordInvoice={}", tdxSaleRecordInvoice); |
|
|
|
|
if (tdxSaleRecordInvoice != null) { |
|
|
|
|
log.info("销项票池已存在发票.直接返回票池信息"); |
|
|
|
@ -344,7 +314,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
String invoiceNo = tdxSaleRecordInvoice.getInvoiceNo(); |
|
|
|
|
QueryWrapper<RecordInvoiceSaleDetailModel> saleDetailWrapper = new QueryWrapper<>(); |
|
|
|
|
saleDetailWrapper.eq("invoice_no", invoiceNo); |
|
|
|
|
List<RecordInvoiceSaleDetailModel> recordInvoiceSaleDetailModel = invoiceDownDetaiSaleInsertDao.selectList(saleDetailWrapper); |
|
|
|
|
List<RecordInvoiceSaleDetailModel> recordInvoiceSaleDetailModel = snPushCheckRecordService.selectSaleListByWrapper(saleDetailWrapper); |
|
|
|
|
|
|
|
|
|
JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); |
|
|
|
|
JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel); |
|
|
|
@ -472,6 +442,215 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 查验发票 |
|
|
|
|
*/ |
|
|
|
|
@PostMapping("/singleInvoiceCheck2") |
|
|
|
|
@ResponseBody |
|
|
|
|
@SysLog("发票查验") |
|
|
|
|
public ResponseEntity<String> singleInvoiceCheck2(@RequestBody Map<String, String> pramsMap) throws Exception { |
|
|
|
|
log.info("传入的参数为:{}", pramsMap); |
|
|
|
|
String dbName = "business"; |
|
|
|
|
JSONObject checkInvoiceResult = null; |
|
|
|
|
|
|
|
|
|
InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode")); |
|
|
|
|
String fplxdm = iu.getFplxdm(); |
|
|
|
|
if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType")) || pramsMap.get("invoiceCode").startsWith("50000")) { |
|
|
|
|
//查验类发票,执行查验操作后入库
|
|
|
|
|
log.info("查验类发票,执行查验操作后入库"); |
|
|
|
|
//权限校验
|
|
|
|
|
if (StringUtils.isBlank(pramsMap.get("invoiceNumber"))) { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("发票号码不能为空!"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
pramsMap.put("invoiceNo", pramsMap.get("invoiceNumber")); |
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(pramsMap.get("billingDate"))) { |
|
|
|
|
String billingDate = pramsMap.get("billingDate").replaceAll("-", ""); |
|
|
|
|
iu.setKprq(pramsMap.get("billingDate")); |
|
|
|
|
pramsMap.put("invoiceDate", billingDate); |
|
|
|
|
pramsMap.put("billingDate", billingDate); |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("开票日期不能为空!"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(pramsMap.get("invoiceType"))) { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("发票类型不能为空!"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (SNFplxEnum.ZP.getSnFplxDm().equals(pramsMap.get("invoiceType")) |
|
|
|
|
|| SNFplxEnum.JDC.getSnFplxDm().equals(pramsMap.get("invoiceType")) |
|
|
|
|
|| SNFplxEnum.DZZP.getSnFplxDm().equals(pramsMap.get("invoiceType")) |
|
|
|
|
|| SNFplxEnum.ESC.getSnFplxDm().equals(pramsMap.get("invoiceType")) |
|
|
|
|
|| SNFplxEnum.QDZP.getSnFplxDm().equals(pramsMap.get("invoiceType")) |
|
|
|
|
|| SNFplxEnum.QDPP.getSnFplxDm().equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
if (StringUtils.isBlank(pramsMap.get("totalAmount"))) { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("金额不能为空!"))); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if (StringUtils.isBlank(pramsMap.get("checkCode"))) { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("校验码不能为空!"))); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ("10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
pramsMap.put("invoiceType", "21"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
log.info("发票类型为:{}", pramsMap.get("invoiceType")); |
|
|
|
|
|
|
|
|
|
String uuid = (StringUtils.isBlank(pramsMap.get("invoiceCode")) ? "" : pramsMap.get("invoiceCode")) + pramsMap.get("invoiceNo"); |
|
|
|
|
log.info("uuid={}", uuid); |
|
|
|
|
String notes = invoiceQueryService.checkingInvoiceInfo("business", uuid, getUserInfo()); |
|
|
|
|
if (notes != null) { |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error(notes))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//非通行费类发票 先判断底账库中是否已存在
|
|
|
|
|
if (!"32000".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
//查询底账库是否有对应发票,有则直接返回
|
|
|
|
|
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>(); |
|
|
|
|
recordWrapper.eq("uuid", uuid); |
|
|
|
|
BaseTDxRecordInvoice checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); |
|
|
|
|
if (checkInvoiceByUuid != null) { |
|
|
|
|
log.info("进项票池已存在发票.直接返回票池信息"); |
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
String invoiceNo = checkInvoiceByUuid.getInvoiceNo(); |
|
|
|
|
QueryWrapper<BaseTDxRecordInvoiceDetail> detailWrapper = new QueryWrapper<>(); |
|
|
|
|
detailWrapper.eq("uuid", uuid); |
|
|
|
|
|
|
|
|
|
List<BaseTDxRecordInvoiceDetail> baseTDxRecordInvoiceDetail = null; |
|
|
|
|
List<TDxVehicleSaleInvoice> vehicleList = null; |
|
|
|
|
if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
vehicleList = snPushCheckRecordService.vihicleList(uuid); |
|
|
|
|
} else { |
|
|
|
|
baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ((baseTDxRecordInvoiceDetail == null || baseTDxRecordInvoiceDetail.size() == 0) && (vehicleList == null || vehicleList.size() == 0)) { |
|
|
|
|
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); |
|
|
|
|
if ("10104".equals(pramsMap.get("invoiceType")) || "10105".equals(pramsMap.get("invoiceType"))) { |
|
|
|
|
vehicleList = snPushCheckRecordService.vihicleList(uuid); |
|
|
|
|
} else { |
|
|
|
|
baseTDxRecordInvoiceDetail = snPushCheckRecordService.selectRecordDetailListByWrapper(detailWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { |
|
|
|
|
data = errorInfo(checkInvoiceResult, data); |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); |
|
|
|
|
JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail); |
|
|
|
|
JSONObject vehicleDetail = new JSONObject(); |
|
|
|
|
if(vehicleList != null && vehicleList.size() > 0) { |
|
|
|
|
vehicleDetail = (JSONObject) JSONObject.toJSON(vehicleList.get(0)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
convertToResult(checkInvoice, checkInvoiceDetail, vehicleDetail); |
|
|
|
|
|
|
|
|
|
data.put("data", checkInvoice); |
|
|
|
|
//查验结果保存
|
|
|
|
|
//saveCheckLog(pramsMap, checkInvoice);
|
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} else { |
|
|
|
|
TdxSaleRecordInvoice tdxSaleRecordInvoice = snPushCheckRecordService.selectSaleByUuid(uuid); |
|
|
|
|
log.info("tdxSaleRecordInvoice={}", tdxSaleRecordInvoice); |
|
|
|
|
if (tdxSaleRecordInvoice != null) { |
|
|
|
|
log.info("销项票池已存在发票.直接返回票池信息"); |
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
|
|
|
|
|
String invoiceNo = tdxSaleRecordInvoice.getInvoiceNo(); |
|
|
|
|
QueryWrapper<RecordInvoiceSaleDetailModel> saleDetailWrapper = new QueryWrapper<>(); |
|
|
|
|
saleDetailWrapper.eq("invoice_no", invoiceNo); |
|
|
|
|
List<RecordInvoiceSaleDetailModel> recordInvoiceSaleDetailModel = snPushCheckRecordService.selectSaleListByWrapper(saleDetailWrapper); |
|
|
|
|
|
|
|
|
|
JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); |
|
|
|
|
JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel); |
|
|
|
|
convertToResult(checkInvoice, saleDetail); |
|
|
|
|
|
|
|
|
|
data.put("data", checkInvoice); |
|
|
|
|
//查验结果保存
|
|
|
|
|
// saveCheckLog(pramsMap,checkInvoice);
|
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap, "1"); |
|
|
|
|
log.info("查验结果为:{}", checkInvoiceResult); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
log.error("查验失败,errormsg:{}", e.getMessage()); |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败," + e.getMessage()))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!checkInvoiceResult.containsKey("code")) { |
|
|
|
|
|
|
|
|
|
if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { |
|
|
|
|
R data = new R(); |
|
|
|
|
data = errorInfo(checkInvoiceResult, data); |
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
data.put("message", "success"); |
|
|
|
|
|
|
|
|
|
if (!checkInvoiceResult.containsKey("cyjg")) { |
|
|
|
|
checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); |
|
|
|
|
log.info("返回给影像系统的结果为:{}", checkInvoiceResult); |
|
|
|
|
signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", dbName); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Object o = checkInvoiceResult.get("invoiceLineList"); |
|
|
|
|
JSONArray jsonArray = JSONObject.parseArray(JSONObject.toJSONString(o)); |
|
|
|
|
for (Object object : jsonArray) { |
|
|
|
|
Map map = JSONObject.parseObject(JSONObject.toJSONString(object), Map.class); |
|
|
|
|
String taxRate = (String) map.get("taxRate"); |
|
|
|
|
if ("0".equals(taxRate) || "*".equals(taxRate) || "**".equals(taxRate) || "***".equals(taxRate) || "不征税".equals(taxRate) || "免税".equals(taxRate)) { |
|
|
|
|
map.put("taxRate", "0.00"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
data.put("data", checkInvoiceResult); |
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
//其他类发票,直接入库
|
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
if (!checkInvoiceResult.isEmpty()) { |
|
|
|
|
log.info("其他类发票,不做查验,直接入库"); |
|
|
|
|
data.put("message", "success"); |
|
|
|
|
|
|
|
|
|
checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); |
|
|
|
|
checkInvoiceResult.put("message", "入库成功"); |
|
|
|
|
log.info("返回给影像系统的结果为:{}", checkInvoiceResult); |
|
|
|
|
|
|
|
|
|
data.put("data", checkInvoiceResult); |
|
|
|
|
} else { |
|
|
|
|
data.put("message", "error 其他类发票不支持查验"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(data)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Async |
|
|
|
|
void saveCheckLog(Map<String, String> pramsMap, JSONObject checkInvoice) { |
|
|
|
|
TdxPlatformCheckLog checkLog = new TdxPlatformCheckLog(); |
|
|
|
@ -947,7 +1126,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
String dbName = "business"; |
|
|
|
|
// 入参统一在入口处理
|
|
|
|
|
String orgCode = snRequestObject.getCompCode(); |
|
|
|
|
SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(orgCode); |
|
|
|
|
SysDeptEntity orgByCompCode = snPushCheckRecordService.getOrgByCompCode(orgCode); |
|
|
|
|
log.info("查询的组织信息为:{}", JSONObject.toJSONString(orgByCompCode)); |
|
|
|
|
String company = ""; |
|
|
|
|
String taxno = ""; |
|
|
|
@ -983,7 +1162,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
object.setZFILED3(""); |
|
|
|
|
object.setZFILED4(""); |
|
|
|
|
|
|
|
|
|
List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode); |
|
|
|
|
List<GsClient> gsClients = snPushCheckRecordService.selectByGsdm(orgCode); |
|
|
|
|
if (gsClients != null && gsClients.size() > 0) { |
|
|
|
|
object.setZFILED5(gsClients.get(0).getClient()); |
|
|
|
|
} else { |
|
|
|
@ -1076,15 +1255,14 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
//删除对应的影像号
|
|
|
|
|
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>(); |
|
|
|
|
recordWrapper.eq("image_id", imageId); |
|
|
|
|
// BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
|
|
|
|
|
List<BaseTDxRecordInvoice> baseTDxRecordInvoices = baseTDxRecordInvoiceDao.selectList(recordWrapper); |
|
|
|
|
List<BaseTDxRecordInvoice> baseTDxRecordInvoices = snPushCheckRecordService.selectRecordListByWrapper(recordWrapper); |
|
|
|
|
// if(baseTDxRecordInvoice != null){
|
|
|
|
|
if (baseTDxRecordInvoices != null && baseTDxRecordInvoices.size() > 0) { |
|
|
|
|
log.info("TDxRecordInvoice表中匹配到数据"); |
|
|
|
|
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); |
|
|
|
|
recordInvoice.setImageId(""); |
|
|
|
|
recordInvoice.setCompCode(""); |
|
|
|
|
baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); |
|
|
|
|
snPushCheckRecordService.updateRecordByWrapper(recordInvoice, recordWrapper); |
|
|
|
|
|
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
data.put("data", ""); |
|
|
|
@ -1101,14 +1279,13 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
QueryWrapper<TDxInvoiceReimburse> reimburseWrapper = new QueryWrapper<>(); |
|
|
|
|
reimburseWrapper.eq("image_id", imageId); |
|
|
|
|
|
|
|
|
|
// TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper);
|
|
|
|
|
List<TDxInvoiceReimburse> tDxInvoiceReimburses = mixedSignatureDao.selectList(reimburseWrapper); |
|
|
|
|
List<TDxInvoiceReimburse> tDxInvoiceReimburses = snPushCheckRecordService.selectReimburseListByWrapper(reimburseWrapper); |
|
|
|
|
if (tDxInvoiceReimburses != null && tDxInvoiceReimburses.size() > 0) { |
|
|
|
|
log.info("TDxInvoiceReimburse表中匹配到数据"); |
|
|
|
|
TDxInvoiceReimburse tDxInvoiceReimburse = new TDxInvoiceReimburse(); |
|
|
|
|
tDxInvoiceReimburse.setImageId(""); |
|
|
|
|
tDxInvoiceReimburse.setCompCode(""); |
|
|
|
|
mixedSignatureDao.update(tDxInvoiceReimburse, reimburseWrapper); |
|
|
|
|
snPushCheckRecordService.updateReimburseByWrapper(tDxInvoiceReimburse, reimburseWrapper); |
|
|
|
|
} |
|
|
|
|
R data = new R(1000, "default success"); |
|
|
|
|
data.put("data", ""); |
|
|
|
@ -1713,7 +1890,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
//其他票种
|
|
|
|
|
QueryWrapper<RecordInvoice> wrapper = new QueryWrapper(); |
|
|
|
|
wrapper.eq("uuid", uuid); |
|
|
|
|
RecordInvoice recordInvoice = recordInvoiceDao.selectOne(wrapper); |
|
|
|
|
RecordInvoice recordInvoice = snPushCheckRecordService.selectByWrapper(wrapper); |
|
|
|
|
if (recordInvoice != null) { |
|
|
|
|
ZCYJG = recordInvoice.getRzhYesorno(); |
|
|
|
|
} |
|
|
|
@ -1722,7 +1899,7 @@ public class SDNYMainProcessController extends AbstractController { |
|
|
|
|
//海关缴款书
|
|
|
|
|
QueryWrapper<TdxCustomsRecord> wrapper = new QueryWrapper(); |
|
|
|
|
wrapper.eq("uuid", uuid); |
|
|
|
|
TdxCustomsRecord tdxCustomsRecord = customsRecordDao.selectOne(wrapper); |
|
|
|
|
TdxCustomsRecord tdxCustomsRecord = snPushCheckRecordService.selectCustomRecordByWrapper(wrapper); |
|
|
|
|
if (tdxCustomsRecord != null) { |
|
|
|
|
ZCYJG = tdxCustomsRecord.getRzhYesorno(); |
|
|
|
|
} |
|
|
|
|