yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

纸质发票(数电纸质发票) 机动车销售统一发票(修改产地不存在补丁)适配2312_20250510_sdlizheng

This commit is contained in:
李正@用友 2025-05-10 13:42:12 +08:00
parent 6272269970
commit d6a553d71a
4 changed files with 352 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
View File

@ -1,6 +1,5 @@
package nc.impl.imag.taxfactory.apply.einvoice; package nc.impl.imag.taxfactory.apply.einvoice;
import nc.bs.framework.common.NCLocator;
import nc.dto.imag.boot.RequestInfo; import nc.dto.imag.boot.RequestInfo;
import nc.dto.imag.invoice.PInvoice; import nc.dto.imag.invoice.PInvoice;
import nc.dto.imag.invoice.PInvoiceCepz; import nc.dto.imag.invoice.PInvoiceCepz;
@ -12,12 +11,11 @@ import nc.imag.basefactory.router.Sm4Util;
import nc.imag.common.util.IJsonUtil; import nc.imag.common.util.IJsonUtil;
import nc.impl.imag.taxfactory.einvoice.EInvoiceRequest; import nc.impl.imag.taxfactory.einvoice.EInvoiceRequest;
import nc.itf.imag.basefactory.IFactoryRequest; import nc.itf.imag.basefactory.IFactoryRequest;
import nc.itf.uap.cil.ICilService;
import nc.vo.imag.verify.InvoiceTypeEnum;
import nc.vo.pub.BusinessException; import nc.vo.pub.BusinessException;
import nc.vo.pub.BusinessRuntimeException; import nc.vo.pub.BusinessRuntimeException;
import nccloud.commons.collections.MapUtils; import nccloud.commons.collections.MapUtils;
import ssc.mq.util.Logger; import ssc.mq.util.Logger;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -167,18 +165,6 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
a.setJEHJ(getUFDoubleValue(p.getJehj())); a.setJEHJ(getUFDoubleValue(p.getJehj()));
a.setCJH(p.getCjh()); a.setCJH(p.getCjh());
a.setKQYSSSXBGGLBM(p.getKqysssxbgglbm()); a.setKQYSSSXBGGLBM(p.getKqysssxbgglbm());
if(("31".equals(a.getFPLX()) || "32".equals(a.getFPLX())) && a.getTSPZ() != null){
if (!check()){
throw new BusinessRuntimeException("未购买发票统一入口授权!");
}
}
//@特殊票种电子凭证@ end
//机动车专票特殊处理
if(String.valueOf(InvoiceTypeEnum.JDCZYFP.getTypeCode()).equals(p.getFplx())){
a.setFPLX(imagToEInvoice(String.valueOf(InvoiceTypeEnum.ZZSZYFP.getTypeCode())));
a.setTSPZ("12");
}
ApplyInvoiceDetail[] details = new ApplyInvoiceDetail[p.getItems().length]; ApplyInvoiceDetail[] details = new ApplyInvoiceDetail[p.getItems().length];
for (int j = 0; j < details.length; j++) { for (int j = 0; j < details.length; j++) {
@ -210,18 +196,6 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
motor.setCQZSBH(psd.getCqzsbh()); motor.setCQZSBH(psd.getCqzsbh());
motor.setJZFWFSD(psd.getJzfwfsd()); motor.setJZFWFSD(psd.getJzfwfsd());
motor.setJZXMMC(psd.getJzxmmc()); motor.setJZXMMC(psd.getJzxmmc());
// **************************************2024-07-11 新增 （增加数电纸质发票(机动车销售统一发票)）
motor.setCD(psd.getCd());
motor.setCJHM(psd.getCjhm());
motor.setCLLX(psd.getCllx());
motor.setCPXH(psd.getCpxh());
motor.setSCQYMC(psd.getScqymc());
motor.setXCRS(psd.getXcrs());
motor.setHGZH(psd.getHgzh());
motor.setFDJHM(psd.getFdjhm());
motor.setDUWEI(psd.getDunwei());
// ***********************************************************************
ad.setDetailMotor(motor); ad.setDetailMotor(motor);
} }
details[j] = ad; details[j] = ad;
@ -308,16 +282,7 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
throw new BusinessRuntimeException(e.getMessage(),e); throw new BusinessRuntimeException(e.getMessage(),e);
} }
} }
private boolean check(){
String code ="1" + "0" + "5" + "8" + "T" + "Y" + "R" + "K";
ICilService service = NCLocator.getInstance().lookup(ICilService.class);
int licenseauth = service.getLicenseCount(code);
if (licenseauth <= 0 && !service.isNCDEMO()) {
return false;
}
return true;
}
/** /**
* 设置税务云回调信息 * 设置税务云回调信息
* *
@ -537,13 +502,15 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
//车辆识别代码/车架号码 //车辆识别代码/车架号码
private String CJH; private String CJH;
//跨区域涉税事项报验管理编号
private String KQYSSSXBGGLBM;
//货物运输 //货物运输
private ApplyInvoiceTspz[] tspzs; private ApplyInvoiceTspz[] tspzs;
//差额开票 //差额开票
private ApplyInvoiceCepz[] cepzs; private ApplyInvoiceCepz[] cepzs;
//跨区域涉税事项报验管理编号
private String KQYSSSXBGGLBM;
public String getZSFS() { public String getZSFS() {
return ZSFS; return ZSFS;
} }
@ -1037,12 +1004,13 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
public void setCepzs(ApplyInvoiceCepz[] cepzs) { public void setCepzs(ApplyInvoiceCepz[] cepzs) {
this.cepzs = cepzs; this.cepzs = cepzs;
} }
public String getKQYSSSXBGGLBM() { public String getKQYSSSXBGGLBM() {
return KQYSSSXBGGLBM; return KQYSSSXBGGLBM;
} }
public void setKQYSSSXBGGLBM(String kQYSSSXBGGLBM) { public void setKQYSSSXBGGLBM(String KQYSSSXBGGLBM) {
KQYSSSXBGGLBM = kQYSSSXBGGLBM; this.KQYSSSXBGGLBM = KQYSSSXBGGLBM;
} }
} }
@ -1364,109 +1332,6 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
//建筑服务发生地 //建筑服务发生地
private String JZFWFSD; private String JZFWFSD;
// 产地
private String CD;
// 车架号码
private String CJHM;
// 车辆类型
private String CLLX;
// 产牌型号
private String CPXH;
// 生产企业名称
private String SCQYMC;
// 限乘人数
private String XCRS;
//合格证号
private String HGZH;
//发动机号码
private String FDJHM;
//吨位
private String DUWEI;
public String getHGZH() {
return HGZH;
}
public void setHGZH(String HGZH) {
this.HGZH = HGZH;
}
public String getFDJHM() {
return FDJHM;
}
public void setFDJHM(String FDJHM) {
this.FDJHM = FDJHM;
}
public String getDUWEI() {
return DUWEI;
}
public void setDUWEI(String DUWEI) {
this.DUWEI = DUWEI;
}
public String getCD() {
return CD;
}
public void setCD(String CD) {
this.CD = CD;
}
public String getCJHM() {
return CJHM;
}
public void setCJHM(String CJHM) {
this.CJHM = CJHM;
}
public String getCLLX() {
return CLLX;
}
public void setCLLX(String CLLX) {
this.CLLX = CLLX;
}
public String getCPXH() {
return CPXH;
}
public void setCPXH(String CPXH) {
this.CPXH = CPXH;
}
public String getSCQYMC() {
return SCQYMC;
}
public void setSCQYMC(String SCQYMC) {
this.SCQYMC = SCQYMC;
}
public String getXCRS() {
return XCRS;
}
public void setXCRS(String XCRS) {
this.XCRS = XCRS;
}
public String getCQZSBH() { public String getCQZSBH() {
return CQZSBH; return CQZSBH;

2
sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java
View File

@ -1461,8 +1461,6 @@ public class InvoiceTransferUtil {
motor.setJzfwfsd(body.getJzfwfsd()); motor.setJzfwfsd(body.getJzfwfsd());
motor.setJzxmmc(body.getJzxmmc()); motor.setJzxmmc(body.getJzxmmc());
// **************************2024-07-10 新增 对应税务云,开票申请表体增加9个自定义项 // **************************2024-07-10 新增 对应税务云,开票申请表体增加9个自定义项
if(!StringUtils.isEmpty(body.getDef24())) {//CD 产地 if(!StringUtils.isEmpty(body.getDef24())) {//CD 产地
motor.setCd(body.getDef24()); motor.setCd(body.getDef24());
} }

515
sscivm/src/public/nc/vo/sscivm/ivmpub/InvoiceTypeEnum.java
View File

@ -1,213 +1,380 @@
//
// Source code recreated from a .class file by IntelliJ IDEA
// (powered by FernFlower decompiler)
//
package nc.vo.sscivm.ivmpub; package nc.vo.sscivm.ivmpub;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import nc.md.model.IEnumValue; import nc.md.model.IEnumValue;
import nc.md.model.impl.MDEnum; import nc.md.model.impl.MDEnum;
public class InvoiceTypeEnum extends MDEnum { /**
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "1"); * <b> 在此处简要描述此类的功能 </b>
public static final InvoiceTypeEnum INVOICETYPE_DZZYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "2"); * <p>
public static final InvoiceTypeEnum INVOICETYPE_PTFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "3"); * 在此处添加此类的描述信息
public static final InvoiceTypeEnum INVOICETYPE_ZYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "4"); * </p>
public static final InvoiceTypeEnum INVOICETYPE_JDCTYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "5"); * 创建日期:
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_CPY = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "8"); * @author
public static final InvoiceTypeEnum INVOICETYPE_CPYPTFP_JS = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "9"); * @version NCPrj ??
public static final InvoiceTypeEnum INVOICETYPE_CPYPTFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "10"); */
public static final InvoiceTypeEnum INVOICETYPE_CPYZXFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "11"); public class InvoiceTypeEnum extends MDEnum{
public static final InvoiceTypeEnum INVOICETYPE_PTFP_JS = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "12"); public InvoiceTypeEnum(IEnumValue enumvalue){
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_TXF = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "14");
public static final InvoiceTypeEnum INVOICETYPE_JDFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "15");
public static final InvoiceTypeEnum INVOICETYPE_TRAIN = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "16");
public static final InvoiceTypeEnum INVOICETYPE_AIR = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "17");
public static final InvoiceTypeEnum INVOICETYPE_BUS = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "18");
public static final InvoiceTypeEnum INVOICETYPE_TAXI = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "19");
public static final InvoiceTypeEnum INVOICETYPE_ROADTOLL = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "20");
public static final InvoiceTypeEnum INVOICETYPE_TUOTA = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "21");
public static final InvoiceTypeEnum INVOICETYPE_OTHER = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "22");
public static final InvoiceTypeEnum DZFP_ZZSZYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "31");
public static final InvoiceTypeEnum DZFP_PTFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "32");
public static final InvoiceTypeEnum ZZFP_ZZSZYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "33");
public static final InvoiceTypeEnum ZZFP_JDCXSTYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "36");
public static final InvoiceTypeEnum ZZFP_PTFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "34");
public static final InvoiceTypeEnum INVOICETYPE_ZYFP_JDC = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "99");
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_KCL = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "116");
public static final InvoiceTypeEnum INVOICETYPE_DZZYFP_KCL = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "216");
public static final InvoiceTypeEnum INVOICETYPE_PTFP_KCL = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "316");
public static final InvoiceTypeEnum INVOICETYPE_ZYFP_KCL = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "416");
public static final InvoiceTypeEnum INVOICETYPE_ESCTYFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "105");
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_CZFSPJ = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "64");
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YLMZ = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "65");
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YLZY = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "66");
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YBJKS = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "67");
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_NCP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "109");
public static final InvoiceTypeEnum INVOICETYPE_PTFP_NCP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "309");
public InvoiceTypeEnum(IEnumValue enumvalue) {
super(enumvalue); super(enumvalue);
} }
/**
* 增值税电子普通发票
*/
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP= MDEnum.valueOf(InvoiceTypeEnum.class, "1");
public static boolean isDzfp(String value) { /**
return INVOICETYPE_DZPTFP.getEnumValue().getValue().equals(value) || INVOICETYPE_DZZYFP.getEnumValue().getValue().equals(value) || INVOICETYPE_DZPTFP_CPY.getEnumValue().getValue().equals(value) || INVOICETYPE_DZPTFP_TXF.getEnumValue().getValue().equals(value) || DZFP_ZZSZYFP.getEnumValue().getValue().equals(value) || DZFP_PTFP.getEnumValue().getValue().equals(value) || INVOICETYPE_DZPTFP_KCL.getEnumValue().getValue().equals(value) || INVOICETYPE_DZZYFP_KCL.getEnumValue().getValue().equals(value) || INVOICETYPE_DZPTFP_NCP.getEnumValue().getValue().equals(value); * 增值税电子专用发票
*/
public static final InvoiceTypeEnum INVOICETYPE_DZZYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "2");
/**
* 增值税普通发票
*/
public static final InvoiceTypeEnum INVOICETYPE_PTFP= MDEnum.valueOf(InvoiceTypeEnum.class, "3");
/**
* 增值税专用发票
*/
public static final InvoiceTypeEnum INVOICETYPE_ZYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "4");
/**
* 机动车统一发票
*/
public static final InvoiceTypeEnum INVOICETYPE_JDCTYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "5");
/**
* 增值税电子普通发票（成品油）
*/
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_CPY= MDEnum.valueOf(InvoiceTypeEnum.class, "8");
/**
* 成品油普通发票(卷式)
*/
public static final InvoiceTypeEnum INVOICETYPE_CPYPTFP_JS= MDEnum.valueOf(InvoiceTypeEnum.class, "9");
/**
* 成品油普通发票
*/
public static final InvoiceTypeEnum INVOICETYPE_CPYPTFP= MDEnum.valueOf(InvoiceTypeEnum.class, "10");
/**
* 成品油专用发票
*/
public static final InvoiceTypeEnum INVOICETYPE_CPYZXFP= MDEnum.valueOf(InvoiceTypeEnum.class, "11");
/**
* 增值税普通发票(卷式)
*/
public static final InvoiceTypeEnum INVOICETYPE_PTFP_JS= MDEnum.valueOf(InvoiceTypeEnum.class, "12");
/**
* 通行费增值税电子普通发票
*/
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_TXF= MDEnum.valueOf(InvoiceTypeEnum.class, "14");
/**
* 机打发票
*/
public static final InvoiceTypeEnum INVOICETYPE_JDFP= MDEnum.valueOf(InvoiceTypeEnum.class, "15");
/**
* 火车票
*/
public static final InvoiceTypeEnum INVOICETYPE_TRAIN= MDEnum.valueOf(InvoiceTypeEnum.class, "16");
/**
* 航空客票
*/
public static final InvoiceTypeEnum INVOICETYPE_AIR= MDEnum.valueOf(InvoiceTypeEnum.class, "17");
/**
* 客运汽车票
*/
public static final InvoiceTypeEnum INVOICETYPE_BUS= MDEnum.valueOf(InvoiceTypeEnum.class, "18");
/**
* 出租车票
*/
public static final InvoiceTypeEnum INVOICETYPE_TAXI= MDEnum.valueOf(InvoiceTypeEnum.class, "19");
/**
* 过路费票
*/
public static final InvoiceTypeEnum INVOICETYPE_ROADTOLL= MDEnum.valueOf(InvoiceTypeEnum.class, "20");
/**
* 定额发票
*/
public static final InvoiceTypeEnum INVOICETYPE_TUOTA= MDEnum.valueOf(InvoiceTypeEnum.class, "21");
/**
* 其他发票
*/
public static final InvoiceTypeEnum INVOICETYPE_OTHER= MDEnum.valueOf(InvoiceTypeEnum.class, "22");
/**
* 数电票(增值税专用发票)
*/
public static final InvoiceTypeEnum DZFP_ZZSZYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "31");
/**
* 数电票(普通发票)
*/
public static final InvoiceTypeEnum DZFP_PTFP= MDEnum.valueOf(InvoiceTypeEnum.class, "32");
/**
* 数电纸质发票(增值税专用发票)
*/
public static final InvoiceTypeEnum ZZFP_ZZSZYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "33");
public static final InvoiceTypeEnum ZZFP_SDFP = (InvoiceTypeEnum)MDEnum.valueOf(InvoiceTypeEnum.class, "36");
/**
* 数电纸质发票(普通发票)
*/
public static final InvoiceTypeEnum ZZFP_PTFP= MDEnum.valueOf(InvoiceTypeEnum.class, "34");
/**
* 增值税专用发票(机动车)
*/
public static final InvoiceTypeEnum INVOICETYPE_ZYFP_JDC= MDEnum.valueOf(InvoiceTypeEnum.class, "99");
/**
* 增值税电子普通发票(矿产类)
*/
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_KCL= MDEnum.valueOf(InvoiceTypeEnum.class, "116");
/**
* 增值税电子专用发票(矿产类)
*/
public static final InvoiceTypeEnum INVOICETYPE_DZZYFP_KCL= MDEnum.valueOf(InvoiceTypeEnum.class, "216");
/**
* 增值税普通发票(矿产类)
*/
public static final InvoiceTypeEnum INVOICETYPE_PTFP_KCL= MDEnum.valueOf(InvoiceTypeEnum.class, "316");
/**
* 增值税专用发票（矿产类)
*/
public static final InvoiceTypeEnum INVOICETYPE_ZYFP_KCL= MDEnum.valueOf(InvoiceTypeEnum.class, "416");
/**
* 二手车销售统一发票
*/
public static final InvoiceTypeEnum INVOICETYPE_ESCTYFP= MDEnum.valueOf(InvoiceTypeEnum.class, "105");
/**
* 财政非税票据
*/
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_CZFSPJ= MDEnum.valueOf(InvoiceTypeEnum.class, "64");
/**
* 医疗门诊票据
*/
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YLMZ= MDEnum.valueOf(InvoiceTypeEnum.class, "65");
/**
* 医疗住院票据
*/
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YLZY= MDEnum.valueOf(InvoiceTypeEnum.class, "66");
/**
* 非税收入一般缴款书
*/
public static final InvoiceTypeEnum INVOICETYPE_NOTAX_YBJKS= MDEnum.valueOf(InvoiceTypeEnum.class, "67");
/**
* 增值税电子普通发票(农产品)
*/
public static final InvoiceTypeEnum INVOICETYPE_DZPTFP_NCP= MDEnum.valueOf(InvoiceTypeEnum.class, "109");
/**
* 增值税普通发票(农产品)
*/
public static final InvoiceTypeEnum INVOICETYPE_PTFP_NCP= MDEnum.valueOf(InvoiceTypeEnum.class, "309");
/**
* 判断是否是电子发票
* @param value
* @return
*/
public static boolean isDzfp(String value){
if (
InvoiceTypeEnum.INVOICETYPE_DZPTFP.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZZYFP.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZPTFP_CPY.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZPTFP_TXF.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.DZFP_ZZSZYFP.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.DZFP_PTFP.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.getEnumValue().getValue().equals(value)
||InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.getEnumValue().getValue().equals(value)){
return true;
}
return false;
} }
public static Set<Integer> getPaperInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取纸质发票
invoices.add(INVOICETYPE_PTFP.toIntValue()); * @return 纸票集合
invoices.add(INVOICETYPE_ZYFP.toIntValue()); */
invoices.add(INVOICETYPE_JDCTYFP.toIntValue()); public static Set<Integer> getPaperInvoice(){
invoices.add(INVOICETYPE_ESCTYFP.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(INVOICETYPE_CPYPTFP_JS.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP.toIntValue());
invoices.add(INVOICETYPE_CPYPTFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP.toIntValue());
invoices.add(INVOICETYPE_CPYZXFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_JDCTYFP.toIntValue());
invoices.add(INVOICETYPE_PTFP_JS.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ESCTYFP.toIntValue());
invoices.add(INVOICETYPE_JDFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP_JS.toIntValue());
invoices.add(INVOICETYPE_TRAIN.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP.toIntValue());
invoices.add(INVOICETYPE_AIR.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYZXFP.toIntValue());
invoices.add(INVOICETYPE_BUS.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_JS.toIntValue());
invoices.add(INVOICETYPE_TAXI.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_JDFP.toIntValue());
invoices.add(INVOICETYPE_ROADTOLL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TRAIN.toIntValue());
invoices.add(INVOICETYPE_TUOTA.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_AIR.toIntValue());
invoices.add(INVOICETYPE_ZYFP_JDC.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_BUS.toIntValue());
invoices.add(ZZFP_ZZSZYFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TAXI.toIntValue());
invoices.add(ZZFP_JDCXSTYFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ROADTOLL.toIntValue());
invoices.add(ZZFP_PTFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TUOTA.toIntValue());
invoices.add(INVOICETYPE_PTFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toIntValue());
invoices.add(INVOICETYPE_ZYFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.ZZFP_ZZSZYFP.toIntValue());
invoices.add(INVOICETYPE_PTFP_NCP.toIntValue()); invoices.add(InvoiceTypeEnum.ZZFP_PTFP.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toIntValue());
return invoices; return invoices;
} }
public static Set<Integer> getBxTzInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取报销台账税务云发票集合
invoices.add(INVOICETYPE_JDFP.toIntValue()); * @return
invoices.add(INVOICETYPE_TRAIN.toIntValue()); */
invoices.add(INVOICETYPE_AIR.toIntValue()); public static Set<Integer> getBxTzInvoice(){
invoices.add(INVOICETYPE_BUS.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(INVOICETYPE_TAXI.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_JDFP.toIntValue());
invoices.add(INVOICETYPE_ROADTOLL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TRAIN.toIntValue());
invoices.add(INVOICETYPE_TUOTA.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_AIR.toIntValue());
invoices.add(INVOICETYPE_OTHER.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_BUS.toIntValue());
invoices.add(INVOICETYPE_NOTAX_CZFSPJ.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TAXI.toIntValue());
invoices.add(INVOICETYPE_NOTAX_YLZY.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ROADTOLL.toIntValue());
invoices.add(INVOICETYPE_NOTAX_YLMZ.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_TUOTA.toIntValue());
invoices.add(INVOICETYPE_NOTAX_YBJKS.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_OTHER.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_CZFSPJ.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YLZY.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YLMZ.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YBJKS.toIntValue());
return invoices; return invoices;
} }
public static Set<Integer> getCommonInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取普通发票
invoices.add(INVOICETYPE_DZPTFP.toIntValue()); * @return 普通发票
invoices.add(INVOICETYPE_PTFP.toIntValue()); */
invoices.add(INVOICETYPE_DZPTFP_CPY.toIntValue()); public static Set<Integer> getCommonInvoice(){
invoices.add(INVOICETYPE_PTFP_JS.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(INVOICETYPE_CPYPTFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP.toIntValue());
invoices.add(DZFP_PTFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP.toIntValue());
invoices.add(ZZFP_PTFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_CPY.toIntValue());
invoices.add(INVOICETYPE_DZPTFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_JS.toIntValue());
invoices.add(INVOICETYPE_PTFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP.toIntValue());
invoices.add(INVOICETYPE_DZPTFP_NCP.toIntValue()); invoices.add(InvoiceTypeEnum.DZFP_PTFP.toIntValue());
invoices.add(INVOICETYPE_PTFP_NCP.toIntValue()); invoices.add(InvoiceTypeEnum.ZZFP_PTFP.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toIntValue());
return invoices; return invoices;
} }
public static Set<Integer> getSpecialInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取专用发票
invoices.add(INVOICETYPE_DZZYFP.toIntValue()); * @return 专用发票
invoices.add(INVOICETYPE_ZYFP.toIntValue()); */
invoices.add(INVOICETYPE_CPYZXFP.toIntValue()); public static Set<Integer> getSpecialInvoice(){
invoices.add(INVOICETYPE_ZYFP_JDC.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(INVOICETYPE_DZZYFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP.toIntValue());
invoices.add(INVOICETYPE_ZYFP_KCL.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP.toIntValue());
invoices.add(DZFP_ZZSZYFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYZXFP.toIntValue());
invoices.add(ZZFP_ZZSZYFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toIntValue());
invoices.add(ZZFP_JDCXSTYFP.toIntValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.DZFP_ZZSZYFP.toIntValue());
invoices.add(InvoiceTypeEnum.ZZFP_ZZSZYFP.toIntValue());
return invoices; return invoices;
} }
public static Set<Integer> getKCLInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取矿产发票
invoices.add(INVOICETYPE_DZPTFP_KCL.toIntValue()); * @return
invoices.add(INVOICETYPE_DZZYFP_KCL.toIntValue()); */
invoices.add(INVOICETYPE_PTFP_KCL.toIntValue()); public static Set<Integer> getKCLInvoice(){
invoices.add(INVOICETYPE_ZYFP_KCL.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toIntValue());
return invoices; return invoices;
} }
public static Set<Integer> getNoTaxInvoice() { /**
Set<Integer> invoices = new HashSet(); * 获取非税类发票
invoices.add(INVOICETYPE_NOTAX_CZFSPJ.toIntValue()); * @return
invoices.add(INVOICETYPE_NOTAX_YLMZ.toIntValue()); */
invoices.add(INVOICETYPE_NOTAX_YLZY.toIntValue()); public static Set<Integer> getNoTaxInvoice(){
invoices.add(INVOICETYPE_NOTAX_YBJKS.toIntValue()); Set<Integer> invoices = new HashSet<Integer>();
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_CZFSPJ.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YLMZ.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YLZY.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_NOTAX_YBJKS.toIntValue());
return invoices; return invoices;
} }
public static Set<String> getVerifyInvoice() { /**
Set<String> invoices = new HashSet(); * 获取需要查验的发票集合
invoices.add(INVOICETYPE_DZPTFP.toStringValue()); * @return
invoices.add(INVOICETYPE_DZZYFP.toStringValue()); */
invoices.add(INVOICETYPE_PTFP.toStringValue()); public static Set<String> getVerifyInvoice(){
invoices.add(INVOICETYPE_ZYFP.toStringValue()); Set<String> invoices = new HashSet<String>();
invoices.add(INVOICETYPE_JDCTYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP.toStringValue());
invoices.add(INVOICETYPE_ESCTYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP.toStringValue());
invoices.add(INVOICETYPE_CPYPTFP_JS.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP.toStringValue());
invoices.add(INVOICETYPE_CPYPTFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP.toStringValue());
invoices.add(INVOICETYPE_CPYZXFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_JDCTYFP.toStringValue());
invoices.add(INVOICETYPE_PTFP_JS.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ESCTYFP.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_CPY.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP_JS.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_TXF.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP.toStringValue());
invoices.add(DZFP_ZZSZYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYZXFP.toStringValue());
invoices.add(DZFP_PTFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_JS.toStringValue());
invoices.add(ZZFP_ZZSZYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_CPY.toStringValue());
invoices.add(ZZFP_JDCXSTYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_TXF.toStringValue());
invoices.add(ZZFP_PTFP.toStringValue()); invoices.add(InvoiceTypeEnum.DZFP_ZZSZYFP.toStringValue());
invoices.add(INVOICETYPE_ZYFP_JDC.toStringValue()); invoices.add(InvoiceTypeEnum.DZFP_PTFP.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.ZZFP_ZZSZYFP.toStringValue());
invoices.add(INVOICETYPE_DZZYFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.ZZFP_PTFP.toStringValue());
invoices.add(INVOICETYPE_PTFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toStringValue());
invoices.add(INVOICETYPE_ZYFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_NCP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toStringValue());
invoices.add(INVOICETYPE_PTFP_NCP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toStringValue());
return invoices; return invoices;
} }
public static Set<String> getRecInvoice() {
Set<String> invoices = new HashSet(); /**
invoices.add(INVOICETYPE_DZPTFP.toStringValue()); * 获取可以收票的发票集合
invoices.add(INVOICETYPE_DZZYFP.toStringValue()); * @return
invoices.add(INVOICETYPE_PTFP.toStringValue()); */
invoices.add(INVOICETYPE_ZYFP.toStringValue()); public static Set<String> getRecInvoice(){
invoices.add(INVOICETYPE_CPYPTFP_JS.toStringValue()); Set<String> invoices = new HashSet<String>();
invoices.add(INVOICETYPE_CPYPTFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP.toStringValue());
invoices.add(INVOICETYPE_CPYZXFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP.toStringValue());
invoices.add(INVOICETYPE_PTFP_JS.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_CPY.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_TXF.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP_JS.toStringValue());
invoices.add(DZFP_ZZSZYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYPTFP.toStringValue());
invoices.add(DZFP_PTFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_CPYZXFP.toStringValue());
invoices.add(ZZFP_ZZSZYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_JS.toStringValue());
invoices.add(ZZFP_JDCXSTYFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_CPY.toStringValue());
invoices.add(ZZFP_PTFP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_TXF.toStringValue());
invoices.add(INVOICETYPE_ZYFP_JDC.toStringValue()); invoices.add(InvoiceTypeEnum.DZFP_ZZSZYFP.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.DZFP_PTFP.toStringValue());
invoices.add(INVOICETYPE_DZZYFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.ZZFP_ZZSZYFP.toStringValue());
invoices.add(INVOICETYPE_PTFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.ZZFP_PTFP.toStringValue());
invoices.add(INVOICETYPE_ZYFP_KCL.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_JDC.toStringValue());
invoices.add(INVOICETYPE_DZPTFP_NCP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_KCL.toStringValue());
invoices.add(INVOICETYPE_PTFP_NCP.toStringValue()); invoices.add(InvoiceTypeEnum.INVOICETYPE_DZZYFP_KCL.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_KCL.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_ZYFP_KCL.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toStringValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toStringValue());
return invoices; return invoices;
} }
public static Set<Integer> getSGFP() { /**
Set<Integer> invoices = new HashSet(); * 获取收购发票
invoices.add(INVOICETYPE_DZPTFP_NCP.toIntValue()); * @return 收购发票集合
invoices.add(INVOICETYPE_PTFP_NCP.toIntValue()); */
public static Set<Integer> getSGFP(){
Set<Integer> invoices = new HashSet<Integer>();
invoices.add(InvoiceTypeEnum.INVOICETYPE_DZPTFP_NCP.toIntValue());
invoices.add(InvoiceTypeEnum.INVOICETYPE_PTFP_NCP.toIntValue());
return invoices; return invoices;
} }
} }

4
uapbd/src/public/nccloud/api/uapbd/materialmanage/material/MaterialManageMaterial.java
View File

@ -160,7 +160,9 @@ public class MaterialManageMaterial extends AbstractNCCRestResource {
param.put("name", name.toArray(new String[0])); param.put("name", name.toArray(new String[0]));
} }
if (marbaseclass != null && marbaseclass.size() > 0) { if (marbaseclass != null && marbaseclass.size() > 0) {
param.put("marbaseclass", marbaseclass.toArray(new String[0])); // param.put("marbaseclass", marbaseclass.toArray(new String[0]));
//数据库无此字段，修改成
param.put("pk_marbasclass", marbaseclass.toArray(new String[0]));
} }
try { try {
ApiResourceParamUtils ApiResourceParamUtils = new ApiResourceParamUtils(); ApiResourceParamUtils ApiResourceParamUtils = new ApiResourceParamUtils();