通宇推送nc;
This commit is contained in:
@@ -516,6 +516,14 @@ public interface WlhyServiceFeign {
|
||||
@PostMapping(value = "/feign/outBoundSummary/getOrderListByReconciliation")
|
||||
public R<List<TmsOrder>> getOrderListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
|
||||
|
||||
@ApiOperation(value = "查询对账单对应的发票明细", notes = "查询对账单对应的发票明细")
|
||||
@PostMapping(value = "/feign/outBoundSummary/selectMakeOutInvoiceListByReconciliation")
|
||||
public R<List<TmsMakeOutInvoice>> selectMakeOutInvoiceListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
|
||||
|
||||
@ApiOperation(value = "查询对账单对应的发票明细子项", notes = "查询对账单对应的发票明细子项")
|
||||
@PostMapping(value = "/feign/outBoundSummary/selectMakeOutInvoiceItemList")
|
||||
public R<List<TmsMakeOutInvoiceItem>> selectMakeOutInvoiceItemList(@RequestBody TmsMakeOutInvoice tmsMakeOutInvoice);
|
||||
|
||||
@GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id);
|
||||
|
||||
@@ -529,4 +537,4 @@ public interface WlhyServiceFeign {
|
||||
|
||||
@GetMapping("/feign/order/cancelIssueDocuments")
|
||||
public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -127,4 +127,12 @@ public class TmsMakeOutInvoice implements Serializable {
|
||||
private String actualInvoiceCustomerId;
|
||||
@ApiModelProperty(value = "实际开票客户名称")
|
||||
private String actualInvoiceCustomerName;
|
||||
}
|
||||
@ApiModelProperty(value = "无税费用")
|
||||
private BigDecimal taxFreeFee;
|
||||
@ApiModelProperty(value = "税额")
|
||||
private BigDecimal taxAmount;
|
||||
@ApiModelProperty(value = "税率")
|
||||
private Double taxRate;
|
||||
@ApiModelProperty(value = "费用类别")
|
||||
private String feeType;
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package com.mhd.system.api.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 销项发票表
|
||||
* @Author: lfs
|
||||
* @Date: 2020-02-19 08:50:47
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("tms_make_out_invoice_item")
|
||||
public class TmsMakeOutInvoiceItem implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ID_WORKER_STR)
|
||||
private String id;
|
||||
/**makeId*/
|
||||
@ApiModelProperty(value = "makeId")
|
||||
private String makeId;
|
||||
/**发票金额*/
|
||||
@ApiModelProperty(value = "发票金额")
|
||||
private BigDecimal invoiceValue;
|
||||
/**发票备注*/
|
||||
@ApiModelProperty(value = "发票备注")
|
||||
@Excel(name = "发票备注", width = 15)
|
||||
private String remark;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
/**是否删除(0-否,1-是)*/
|
||||
@ApiModelProperty(value = "是否删除(0-否,1-是)")
|
||||
private Integer isDelete;
|
||||
|
||||
@ApiModelProperty(value = "开票项目")
|
||||
private String invoiceItem;
|
||||
@ApiModelProperty(value = "开票项目名称")
|
||||
private String invoiceItemName;
|
||||
@ApiModelProperty(value = "实际开票客户id")
|
||||
private String actualInvoiceCustomerId;
|
||||
@ApiModelProperty(value = "实际开票客户名称")
|
||||
private String actualInvoiceCustomerName;
|
||||
@ApiModelProperty(value = "无税费用")
|
||||
private BigDecimal taxFreeFee;
|
||||
@ApiModelProperty(value = "税额")
|
||||
private BigDecimal taxAmount;
|
||||
@ApiModelProperty(value = "税率")
|
||||
private Double taxRate;
|
||||
@ApiModelProperty(value = "费用类别")
|
||||
private String feeType;
|
||||
}
|
||||
+17
-1
@@ -519,6 +519,22 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<List<TmsMakeOutInvoice>> selectMakeOutInvoiceListByReconciliation(ReconciliationDTO reconciliationDTO) {
|
||||
R<List<TmsMakeOutInvoice>> res = new R<>();
|
||||
res.setMsg("查询失败"+cause.getMessage());
|
||||
res.setCode(R.FAIL);
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<List<TmsMakeOutInvoiceItem>> selectMakeOutInvoiceItemList(TmsMakeOutInvoice tmsMakeOutInvoice) {
|
||||
R<List<TmsMakeOutInvoiceItem>> res = new R<>();
|
||||
res.setMsg("查询失败"+cause.getMessage());
|
||||
res.setCode(R.FAIL);
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> queryById(String id) {
|
||||
return null;
|
||||
@@ -535,4 +551,4 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user