Merge branch 'release' of http://192.168.12.182/invoice/pt into release

release
wangzhikun 2 years ago
commit 37ba92b5a6
  1. 15
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 2
      dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
  3. 2
      dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
  4. 5
      dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
  5. 2
      dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
  6. 2
      dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
  7. 27
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
  8. 32
      dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
  9. 16
      dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
  10. 3
      dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
  11. 8
      dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
  12. 10
      dxhy-core/src/main/resources/bootstrap-std.yaml
  13. 16
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
  14. 3
      dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
  15. 10
      dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
  16. 26
      dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
  17. 1
      dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java
  18. 10
      dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml

@ -130,8 +130,11 @@ public class BaseInvoiceController extends AbstractController {
String inAccountStatus = (String)map.get("inAccountStatus");
int curr = (int)map.get("curr");
int size = (int)map.get("size");
String bzdh = (String) map.get("bzdh");
Map<String, Object> pramsMap = new HashMap<>(25);
pramsMap.put("bzdh", bzdh);
pramsMap.put("inAccountStatus", inAccountStatus);
pramsMap.put("qszt", map.get("qszt"));
pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));
@ -443,8 +446,12 @@ public class BaseInvoiceController extends AbstractController {
String qsr = (String)map.get("qsr");
String company = (String)map.get("company");
String menuId = (String)map.get("menuId");
String bzdh = (String) map.get("bzdh");
String inAccountStatus = (String) map.get("inaccountStatus");
Map<String, Object> pramsMap = new HashMap<>(18);
pramsMap.put("bzdh", bzdh);
pramsMap.put("inAccountStatus", inAccountStatus);
pramsMap.put("company", company);
pramsMap.put("menuId", menuId);
pramsMap.put("business", getUserInfo().getBusiness());
@ -468,7 +475,7 @@ public class BaseInvoiceController extends AbstractController {
log.info("accountPeriod:{}",accountPeriod);
}
// pramsMap.put("accountPeriod", map.get("accountPeriod"));
String inAccountStatus = (String)map.get("inAccountStatus");
// String inAccountStatus = (String)map.get("inAccountStatus");
if (sfkrz != null) {
if (!"99".equals(sfkrz)) {
@ -566,9 +573,9 @@ public class BaseInvoiceController extends AbstractController {
if (!StringUtils.isBlank(qsr)) {
pramsMap.put("qsr", qsr);
}
if (StringUtils.isNotBlank(inAccountStatus)) {
pramsMap.put("inAccountStatus", inAccountStatus);
}
// if (StringUtils.isNotBlank(inAccountStatus)) {
// pramsMap.put("inAccountStatus", inAccountStatus);
// }
try {
return ResponseEntity
.ok(R.ok().put("data", baseInvoiceManualCheckService.selectByManualCheck(pramsMap, curr, size)));

@ -509,4 +509,6 @@ public class BaseTDxRecordInvoice implements Serializable {
private String postingTime;
//影像号
private String imageId;
//报账单号
private String bzdh;
}

@ -203,6 +203,8 @@ public class BaseFpRzRespVO implements Serializable {
//影像号 SN
private String imageNumber;
private String imageId;
//报账单号
private String bzdh;
}

@ -149,4 +149,9 @@ public class BaseSggxCxRespVO {
*/
private String accountPeriod;
/**
* 报账单号
*/
private String bzdh;
}

@ -137,6 +137,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
}
pageList.get(i).setId(pageList.get(i).getId());
pageList.get(i).setInAccountStatus(pageList.get(i).getInAccountStatus());
pageList.get(i).setBzdh(pageList.get(i).getBzdh());
pageList.get(i).setXh(String.valueOf(i + start));
pageList.get(i).setTaxAmount(
AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount())));

@ -185,6 +185,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount().toString())));
vo.setInvoiceStatus(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus()));
vo.setInvoiceType(pageList.get(i).getInvoiceType());
vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
vo.setBzdh(pageList.get(i).getBzdh());
// 签收方式为已经签收时展示签收信息
if ("1".equals(pageList.get(i).getQsStatus())) {
if (pageList.get(i).getQsDate() != null) {

@ -41,7 +41,8 @@
<result column="bdk_status" property="bdkStatus"/>
<result column="bdk_current_period" property="bdkCurrentPeriod"/>
<result column="bdk_date" property="bdkDate"/>
<result column="in_account_status" property="inAccountStatus"/>
<result column="bzdh" property="bzdh"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
@ -84,6 +85,12 @@
<if test="voucherNumber != null and voucherNumber != ''">
and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
and t.bzdh = #{bzdh}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
and t.qs_status = #{qszt}
</if>
@ -182,9 +189,9 @@
</foreach>
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<!-- <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
<!-- and t.in_account_status = #{inAccountStatus}-->
<!-- </if>-->
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
</if>
@ -332,6 +339,12 @@
<if test="voucherNumber != null and voucherNumber != ''">
and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
and t.bzdh = #{bzdh}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' ">
and t.qs_status = #{qszt}
</if>
@ -408,9 +421,9 @@
</foreach>
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<!-- <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
<!-- and t.in_account_status = #{inAccountStatus}-->
<!-- </if>-->
<if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
and t.ele_invoice_no = #{eleInvoiceNo}
</if>

@ -22,11 +22,13 @@
<result column="qs_name" property="qsName"/>
<result column="invoice_status" property="invoiceStatus"/>
<result column="authStatus" property="authStatus"/>
<result column="in_account_status" property="inAccountStatus"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
<result column="ele_invoice_no" property="eleInvoiceNo"/>
<result column="bzdh" property="bzdh"/>
<result column="inaccount_status" property="inAccountStatus"/>
</resultMap>
<resultMap id="hjResultMap"
type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@ -91,6 +93,12 @@
<if test="qszt != null and qszt != '' and qszt != 'null' ">
and t.qs_status = #{qszt}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
and t.bzdh = #{bzdh}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
</if>
@ -151,9 +159,6 @@
</foreach>
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
and t.ele_invoice_no = #{eleInvoiceNo}
</if>
@ -354,8 +359,7 @@
and t.auth_status in('0','5','6')
and t.export_mark = '0'
and t.company = #{company}
<if
test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
<if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
and t.invoice_status in ('0','7')
and t.invoice_amount>0
and t.tax_amount>=0
@ -363,8 +367,7 @@
and d.tj_status in('0','3')
</if>
<if
test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
<if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
date_format(t.invoice_date,'%Y%m%d') &lt;= c.select_start_date or
date_format(t.invoice_date,'%Y%m%d') &gt;=
@ -424,6 +427,12 @@
<if test="invoiceSource!=null and invoiceSource!='99' and invoiceSource!='null' and invoiceSource!=''">
and t.invoice_source =#{invoiceSource}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
and t.bzdh = #{bzdh}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="businessCode==''">
and (t.dept_id is null or t.dept_id='' or t.dept_id='99')
</if>
@ -435,6 +444,7 @@
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<!-- 按签收人查询 -->
<if
test="position != null and position != '' and position != 'null' and position == '1'.toString()">
@ -443,9 +453,9 @@
<if test="settlementNo != null and settlementNo != ''">
and t.settlement_no like concat(#{settlementNo},'%')
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<!-- <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
<!-- and t.inaccount_status = #{inAccountStatus}-->
<!-- </if>-->
<if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
and t.ele_invoice_no = #{eleInvoiceNo}
</if>

@ -130,6 +130,16 @@ public class EmailMaintainController extends AbstractController {
if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
return ResponseEntity.ok(R.error("邮箱地址已存在!"));
}
String userId = emailMaintain.getUserId();
String userName = emailMaintainService.getUserName(userId);
if(StringUtils.isBlank(userName)){
R data = new R(101, "用户编码在系统中查询不到,请核实!");
data.put("data", "");
return ResponseEntity.ok(data);
}
boolean b = emailMaintainService.update(emailMaintain);
if(b){
return ResponseEntity.ok(R.ok());
@ -242,7 +252,11 @@ public class EmailMaintainController extends AbstractController {
if (ObjectUtil.isNotEmpty(errorMsgList)) {
JSONObject json = new JSONObject();
json.put("datalist", errorMsgList);
return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString())));
R data = new R(101, "校验信息有误");
data.put("data", json);
return ResponseEntity.ok(data);
}
int i = emailMaintainService.insertBatch(mailList);
if(i > 0){

@ -2,6 +2,7 @@ package com.dxhy.core.model.mailGather;
import com.dxhy.core.model.CommonDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -12,6 +13,7 @@ import java.util.Date;
public class MailGatherLogVo extends CommonDTO {
private String id;
public String xh;
//主题
private String subject;
private String fromAddress;
@ -24,6 +26,7 @@ public class MailGatherLogVo extends CommonDTO {
private String ocrType;
private String errorMsg;
private String fileName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;

@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSONObject;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
import com.dxhy.common.util.UUIDUtils;
import com.dxhy.common.utils.Base64Encoding;
import com.dxhy.core.dao.mailGather.MailGatherLogDao;
import com.dxhy.core.model.mailGather.EmailMaintainVo;
import com.dxhy.core.model.mailGather.MailGatherLogVo;
import com.dxhy.core.service.mailGather.MailGatherLogService;
import com.github.pagehelper.PageHelper;
@ -53,6 +55,12 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
int size = (int)pramsMap.get("size");
PageHelper.startPage(curr, size);
List<MailGatherLogVo> emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap);
if(emailMaintainVos !=null && emailMaintainVos.size() > 0) {
for (int i = 0; i < emailMaintainVos.size(); i++) {
MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i);
mailGatherLogVo.setXh(i + 1 + "");
}
}
PageInfo<MailGatherLogVo> pageInfo = new PageInfo<>(emailMaintainVos);
// 设置记录总数
json.put("total", pageInfo.getTotal());

@ -4,13 +4,13 @@ spring:
nacos:
config:
# Nacos config 地址
server-addr: 172.31.36.147:33000
server-addr: 172.31.36.143:33000
# Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace)
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
# Nacos config 分组
group: dxhy-core-group
# Nacos config 登录用户名
username: nacos
username: admin
# Nacos config 登录密码
password: Invoice.nacos.!1
# Nacos config 配置文件前缀
@ -21,7 +21,7 @@ spring:
discovery:
server-addr: 172.31.36.147:33000
# Nacos config 登录用户名
username: nacos
username: admin
# Nacos config 登录密码
password: Invoice.nacos.!1
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c

@ -469,17 +469,17 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
snDetailMap.put("specificationModel", detail.getString("ggxh"));
snDetailMap.put("unit", detail.getString("jldw"));
String quantity = detail.getString("spsl");
if (quantity.length() > 3) {
int index = quantity.indexOf(".");
quantity = quantity.substring(0, index + 2);
}
// if (quantity.length() > 3) {
// int index = quantity.indexOf(".");
// quantity = quantity.substring(0, index + 2);
// }
snDetailMap.put("quantity", quantity);
String unitPrice = detail.getString("bhsdj");
if (unitPrice.length() > 3) {
int index = unitPrice.indexOf(".");
unitPrice = unitPrice.substring(0, index + 3);
}
// if (unitPrice.length() > 3) {
// int index = unitPrice.indexOf(".");
// unitPrice = unitPrice.substring(0, index + 3);
// }
snDetailMap.put("unitPrice", unitPrice);

@ -19,7 +19,7 @@ import java.util.List;
@Data
@ColumnWidth(11)
@ColumnWidth(30)
@ContentFontStyle(fontHeightInPoints = 10)
@HeadFontStyle(fontHeightInPoints = 12,fontName = "等线")
@HeadStyle(borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderLeft = BorderStyleEnum.THIN,
@ -32,6 +32,7 @@ public class QsExcelEntity {
/**
* 开票日期
*/
@ExcelProperty("开票日期")
private Date invoiceDate;
/**

@ -275,7 +275,10 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
// 1、基础信息校验
String note = signRulesUtils.validateInvoiceInfo(pramsMap.get("invoiceCode"), pramsMap.get("invoiceNo"));
log.info("note======> {}0",note);
if(pramsMap.get("eleInvoiceNo") != null){
note = null;
}
// uuid = 发票代码+发票号码
String uuid = pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo");
// 2、查询扫描表是否有数据,有(重复扫描)且签收结果为成功则return,下一个
@ -342,7 +345,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
// 接口不通
result[0] = false;
result[1] = queryInvoiceResult.getString("returnMessage");
log.error("发票号码:" + pramsMap.get("invoiceNo") + "签收失败,失败原因:" + result[1]);
log.error("发票号码:" + pramsMap.get("invoiceNo") +"发票代码"+pramsMap.get("invoiceCode")+ "签收失败,失败原因:" + result[1]);
// insertOrUpdate 扫描表
createFailScanInvoice(pramsMap, result[1].toString(), scanInvoice, userInfo, invoiceType, qsType);
return result;
@ -719,6 +722,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
if(StringUtils.isNotBlank(pramsMap.get("eleInvoiceNo"))){
//全电号码
scanInvoicce.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
if (pramsMap.get("eleInvoiceNo") == null){
scanInvoicce.setEleInvoiceNo(pramsMap.get("invoiceNo"));
}
}
//uuid
scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));

@ -774,6 +774,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
tDxInvoice.setDeptName(pramsMap.get("businessName"));
tDxInvoice.setScanId(pramsMap.get("scanId"));
tDxInvoice.setCompany(pramsMap.get("company"));
tDxInvoice.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
try {
tDxInvoice.setInvoiceDate(new SimpleDateFormat("yyyy-MM-dd").parse(pramsMap.get("invoiceDate")));
} catch (Exception e) {
@ -1326,6 +1327,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
notes = "发票号码不正确";
}
}
if (invoiceNo != null && invoiceNo.length()==20){
notes = null;
}
return notes;
}
@ -1491,14 +1495,26 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
for (int i = 0; i < detailArray.size(); i++) {
JSONObject excelFp = detailArray.getJSONObject(i);
// 入参统一在入口处理
String invoiceType = excelFp.getString("invoiceType");
String invoiceCode = excelFp.getString("invoiceCode");
String invoiceNo = excelFp.getString("invoiceNo");
String eleInvoiceNo = excelFp.getString("eleInvoiceNo");
if (invoiceNo != null && invoiceNo.length() == 20){
eleInvoiceNo = invoiceNo;
invoiceCode = invoiceNo.substring(0,12);
invoiceNo = invoiceNo.substring(12,20);
}
pramsMap.put("eleInvoiceNo",eleInvoiceNo);
pramsMap.put("invoiceCode", invoiceCode);
pramsMap.put("invoiceNo", invoiceNo);
pramsMap.put("invoiceType", invoiceType);
pramsMap.put("invoiceDate", excelFp.getString("invoiceDate"));
if (excelFp.getString("invoiceDate") != null){
String invoiceDate = excelFp.getString("invoiceDate").substring(0, 10);
pramsMap.put("invoiceDate",invoiceDate);
}
pramsMap.put("invoiceAmount", excelFp.getString("invoiceAmount"));
pramsMap.put("checkCode", excelFp.getString("checkCode"));
@ -1583,6 +1599,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
invoiceUtil.setJym(checkCode);
if (!invoiceUtil.jymValid()) {
msg = "校验码不正确";
if (invoiceNo !=null && invoiceNo.length() == 20){
msg = null;
}
}
}
} else {
@ -1595,6 +1614,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
invoiceUtil.setJym(checkCode);
if (!invoiceUtil.jymValid()) {
msg = "校验码不正确";
if (invoiceNo !=null && invoiceNo.length() == 20){
msg = null;
}
}
}
}

@ -68,6 +68,7 @@ public class SignRulesUtils {
InvoiceUtil invoiceUtil = new InvoiceUtil(invoiceCode);
if (!invoiceUtil.fpdmValid() || invoiceUtil.getFplxdm() == null) {
notes = "发票代码不正确";
} else {
invoiceUtil.setFphm(invoiceNo);
if (!invoiceUtil.fphmValid()) {

@ -91,11 +91,11 @@
#{item}
</foreach>
</if>
<if test="company !=null and company != ''">
and t.company = #{company}
</if>
and t.qs_status = '0'
and t.source_system='0'
<!-- <if test="company !=null and company != ''">-->
<!-- and t.company = #{company}-->
<!-- </if>-->
<!-- and t.qs_status = '0'-->
<!-- and t.source_system='0'-->
</select>
<select id="selectWqsfp" parameterType="java.util.Map"

Loading…
Cancel
Save