FI845 FI889增加文件名称

release
王琦 2 years ago
parent 719ddbe4d7
commit ee266a7ea5
  1. 2
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  2. 6
      dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java
  3. 5
      dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java
  4. 3
      dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SdnyTDxSaleRecordInvoice.java
  5. 11
      dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/ZData.java
  6. 4
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java

@ -1306,6 +1306,8 @@ public class SDNYMainProcessController extends AbstractController {
info.setZDJZH(snInvoice.getCertificateNo()); info.setZDJZH(snInvoice.getCertificateNo());
info.setZGFMC(snInvoice.getPurchaserName()); info.setZGFMC(snInvoice.getPurchaserName());
info.setSORT(snInvoice.getSort()); info.setSORT(snInvoice.getSort());
// 文件名
info.setZWJMC(snInvoice.getFileName());
//机打代码 //机打代码
info.setZJDDM(snInvoice.getMachineCode()); info.setZJDDM(snInvoice.getMachineCode());
if (snInvoice.getTotalAmount() != null) { if (snInvoice.getTotalAmount() != null) {

@ -545,4 +545,10 @@ public class SAPInvoiceInfo {
@JSONField(name = "ZTID") @JSONField(name = "ZTID")
private String ZTID = ""; private String ZTID = "";
/**
* 文件名称
*/
@JSONField(name = "ZWJMC")
private String ZWJMC = "";
} }

@ -334,6 +334,11 @@ public class SNInvoice {
*/ */
private String isDeductible; private String isDeductible;
/**
* 文件名
*/
private String fileName;
/** /**
* 明细列表 * 明细列表
*/ */

@ -858,4 +858,7 @@ public class SdnyTDxSaleRecordInvoice implements Serializable {
private String sort; private String sort;
@TableField(exist = false) @TableField(exist = false)
private String fileId; private String fileId;
@TableField(exist = false)
private String fileName;
} }

@ -340,6 +340,11 @@ public class ZData {
* 国税局商品编码 发票信息空则不传 * 国税局商品编码 发票信息空则不传
*/ */
private String ZGSJBM=""; private String ZGSJBM="";
/**
* 文件名称
*/
private String ZWJMC = "";
@JSONField(name = "ZBHSJE_Y") @JSONField(name = "ZBHSJE_Y")
public String getZBHSJE_Y() { public String getZBHSJE_Y() {
return ZBHSJE_Y; return ZBHSJE_Y;
@ -729,6 +734,8 @@ public class ZData {
return RESERVE5; return RESERVE5;
} }
@JSONField(name = "ZWJMC")
public String getZWJMC() {
return ZWJMC;
}
} }

@ -160,6 +160,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
saleRecordInvoice.setDetailList(salesDetailList); saleRecordInvoice.setDetailList(salesDetailList);
saleRecordInvoice.setSort(paramsInvoiceMap.get(invoice.getUuid()).getSort()); saleRecordInvoice.setSort(paramsInvoiceMap.get(invoice.getUuid()).getSort());
saleRecordInvoice.setFileId(paramsInvoiceMap.get(invoice.getUuid()).getFileId()); saleRecordInvoice.setFileId(paramsInvoiceMap.get(invoice.getUuid()).getFileId());
saleRecordInvoice.setFileName(paramsInvoiceMap.get(invoice.getUuid()).getFileName());
salesInvoiceList.add(saleRecordInvoice); salesInvoiceList.add(saleRecordInvoice);
}); });
@ -255,6 +256,9 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
zdata.setFPYXBH(item.getFileId()); zdata.setFPYXBH(item.getFileId());
zdata.setIMG_ID(params.getImageId()); zdata.setIMG_ID(params.getImageId());
zdata.setSORT(String.valueOf(item.getSort())); zdata.setSORT(String.valueOf(item.getSort()));
// 增加文件名
zdata.setZWJMC(item.getFileName());
// 处理明细行 // 处理明细行
List<ZData> zDatas=new ArrayList<>(); List<ZData> zDatas=new ArrayList<>();
for (SdnyTDxRecordInvoiceDetailSales detail : item.getDetailList()) { for (SdnyTDxRecordInvoiceDetailSales detail : item.getDetailList()) {

Loading…
Cancel
Save