From 4e603a5e861f4840778514b61b905040898a6c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?=
 <sdlizheng@yonyou.com>
Date: Mon, 12 May 2025 19:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E8=B4=A8=E5=8F=91=E7=A5=A8(=E6=95=B0?=
 =?UTF-8?q?=E7=94=B5=E7=BA=B8=E8=B4=A8=E5=8F=91=E7=A5=A8)=20=E6=9C=BA?=
 =?UTF-8?q?=E5=8A=A8=E8=BD=A6=E9=94=80=E5=94=AE=E7=BB=9F=E4=B8=80=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8(=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=9C=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=A1=A5=E4=B8=81)=E9=80=82=E9=85=8D2312=5FV?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apply/einvoice/ApplyRequest.java          | 123 +++++++++++++++++-
 1 file changed, 122 insertions(+), 1 deletion(-)

diff --git a/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java b/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
index 51d8e34..529c37c 100644
--- a/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
+++ b/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
@@ -11,6 +11,7 @@ import nc.imag.basefactory.router.Sm4Util;
 import nc.imag.common.util.IJsonUtil;
 import nc.impl.imag.taxfactory.einvoice.EInvoiceRequest;
 import nc.itf.imag.basefactory.IFactoryRequest;
+import nc.vo.imag.verify.InvoiceTypeEnum;
 import nc.vo.pub.BusinessException;
 import nc.vo.pub.BusinessRuntimeException;
 import nccloud.commons.collections.MapUtils;
@@ -165,7 +166,12 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
             a.setJEHJ(getUFDoubleValue(p.getJehj()));
             a.setCJH(p.getCjh());
             a.setKQYSSSXBGGLBM(p.getKqysssxbgglbm());
-
+            //@特殊票种电子凭证@ 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];
             for (int j = 0; j < details.length; j++) {
                 PInvoiceDetail pd = p.getItems()[j];
@@ -196,6 +202,18 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
                     motor.setCQZSBH(psd.getCqzsbh());
                     motor.setJZFWFSD(psd.getJzfwfsd());
                     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);
                 }
                 details[j] = ad;
@@ -1332,6 +1350,109 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
 
         //建筑服务发生地
         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() {
             return CQZSBH;