货物运输

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -9,7 +9,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianshui.common.annotation.Excel;
 import com.jianshui.common.core.domain.BaseEntity;
-import com.jianshui.invoice.domain.dto.api.elephant.Fjys;
+import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys;
+import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Hwys;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -376,7 +377,22 @@ public class BillInfo extends BaseEntity
     @TableField(exist=false)
     private String ysxwfsd; // 应税行为发生地
     @TableField(exist=false)
-    private List<FjysDTO> fjyslist; // 附加要素列表
+    private List<Fjys> fjysList; // 附加要素列表
+
+    // @TableField(exist=false)
+    private List<Hwys> hwysList; // 货物运输
+
+
+
+
+
+
+
+
+
+
+
+
 
 
     public String getTdys() {
@@ -475,12 +491,12 @@ public class BillInfo extends BaseEntity
         this.ysxwfsd = ysxwfsd;
     }
 
-    public List<FjysDTO> getFjyslist() {
+    public List<Fjys> getFjyslist() {
-        return fjyslist;
+        return fjysList;
     }
 
-    public void setFjyslist(List<FjysDTO> fjyslist) {
+    public void setFjyslist(List<Fjys> fjyslist) {
-        this.fjyslist = fjyslist;
+        this.fjysList = fjyslist;
     }
 
     public String getKPRZJLX() {

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/FjysDTO.java

@@ -1,19 +0,0 @@
-package com.jianshui.invoice.domain;
-
-import lombok.Data;
-
-/**
-* @Author: kk
-* @Description: 全电附加要素信息
-*/
-@Data
-public class FjysDTO {
-
-    private String fjysmc; // 附加要素名称
-
-    private String fjyslx; // 附加要素类型
-
-    private String fjysz; // 附加要素值
-
-
-}

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java

@@ -1,6 +1,7 @@
 package com.jianshui.invoice.domain.dto.api.elephant;
 
 
+import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys;
 import lombok.Data;
 
 import java.util.List;

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Fjys.java

@@ -1,4 +1,4 @@
-package com.jianshui.invoice.domain.dto.api.elephant;
+package com.jianshui.invoice.domain.dto.api.elephant.addInvoice;
 
 import lombok.Data;
 

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Hwys.java

@@ -0,0 +1,22 @@
+package com.jianshui.invoice.domain.dto.api.elephant.addInvoice;
+
+import lombok.Data;
+
+/**
+* @Author: kk
+* @Description: 全电-货物运输
+*/
+@Data
+public class Hwys {
+
+    private String XMXH; // 明细序号
+
+    private String QYD; // 起运地
+
+    private String DDD; // 到达地
+    private String YSGJZL; // 运输工具种类
+    private String YSGJPH; // 运输工具牌号
+    private String YSHWMC; // 运输货物名称
+
+
+}

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java

@@ -2,16 +2,12 @@ package com.jianshui.invoice.service.impl.api;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dxhy.order.protocol.invoke.DxhyInterfaceResponse;
 import com.google.gson.Gson;
-import com.jianshui.common.config.JianshuiConfig;
 import com.jianshui.common.constant.Constants;
 import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.domain.entity.Companyservice;
@@ -26,11 +22,11 @@ import com.jianshui.framework.manager.AsyncManager;
 import com.jianshui.invoice.constant.elephant.ElephantConstants;
 import com.jianshui.invoice.domain.*;
 import com.jianshui.invoice.domain.dto.*;
-import com.jianshui.invoice.domain.dto.adapter.request.nuonuo2.QueryInvoiceDTO;
 import com.jianshui.invoice.domain.dto.adapter.response.RedInfoDTO;
 import com.jianshui.invoice.domain.dto.adapter.response.RedInfoDetailDTO;
 import com.jianshui.invoice.domain.dto.api.*;
 import com.jianshui.invoice.domain.dto.api.elephant.*;
+import com.jianshui.invoice.domain.dto.api.elephant.addInvoice.Fjys;
 import com.jianshui.invoice.domain.ele.EleNewMessage;
 import com.jianshui.invoice.domain.ele.EleOuterMessage;
 import com.jianshui.invoice.domain.ele.HZSQDMessage;
@@ -58,7 +54,6 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
@@ -159,11 +154,13 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
         // }
 
         //kk TODO : 2023/9/15 V6数电新增
+        // 标准开具
         Qdtxx qdtxx = BeanUtil.copyProperties(billInfo,Qdtxx.class);
-        if(billInfo.getFjyslist() != null && billInfo.getFjyslist().size()>0){
+       /* if(billInfo.getFjyslist() != null && billInfo.getFjyslist().size()>0){
             List<Fjys> fjysList = BeanUtil.copyToList(billInfo.getFjyslist(),Fjys.class);
             qdtxx.setFjyslist(fjysList);
-        }
+        }*/
+        qdtxx.setQydm(billInfo.getDqbm());
 
 
         // 开始处理详情